Browse Source

More 8-extruder fixups

Scott Lahteine 4 years ago
parent
commit
22556a7bbf

+ 6
- 0
Marlin/src/HAL/HAL_ESP32/HAL.cpp View File

@@ -172,6 +172,12 @@ void HAL_adc_init() {
172 172
   #if HAS_TEMP_ADC_5
173 173
     adc1_set_attenuation(get_channel(TEMP_5_PIN), ADC_ATTEN_11db);
174 174
   #endif
175
+  #if HAS_TEMP_ADC_6
176
+    adc2_set_attenuation(get_channel(TEMP_6_PIN), ADC_ATTEN_11db);
177
+  #endif
178
+  #if HAS_TEMP_ADC_7
179
+    adc3_set_attenuation(get_channel(TEMP_7_PIN), ADC_ATTEN_11db);
180
+  #endif
175 181
   #if HAS_HEATED_BED
176 182
     adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db);
177 183
   #endif

+ 3
- 0
Marlin/src/MarlinCore.cpp View File

@@ -547,6 +547,9 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
547 547
             case 2: case 3: oldstatus = E1_ENABLE_READ(); ENABLE_AXIS_E1(); break;
548 548
             #if E_STEPPERS > 2
549 549
               case 4: case 5: oldstatus = E2_ENABLE_READ(); ENABLE_AXIS_E2(); break;
550
+              #if E_STEPPERS > 3
551
+                case 6: case 7: oldstatus = E3_ENABLE_READ(); ENABLE_AXIS_E3(); break;
552
+              #endif // E_STEPPERS > 3
550 553
             #endif // E_STEPPERS > 2
551 554
           #endif // E_STEPPERS > 1
552 555
         }

+ 3
- 2
Marlin/src/gcode/config/M200-M205.cpp View File

@@ -41,8 +41,9 @@
41 41
       // setting any extruder filament size disables volumetric on the assumption that
42 42
       // slicers either generate in extruder values as cubic mm or as as filament feeds
43 43
       // for all extruders
44
-      if ( (parser.volumetric_enabled = (parser.value_linear_units() != 0)) )
45
-        planner.set_filament_size(target_extruder, parser.value_linear_units());
44
+      const float dval = parser.value_linear_units();
45
+      if ( (parser.volumetric_enabled = (dval != 0)) )
46
+        planner.set_filament_size(target_extruder, dval);
46 47
     }
47 48
     planner.calculate_volumetric_multipliers();
48 49
   }

+ 10
- 10
Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp View File

@@ -75,24 +75,24 @@ bool TemperatureScreen::onTouchHeld(uint8_t tag) {
75 75
     case 22: UI_DECREMENT(TargetTemp_celsius, CHAMBER); break;
76 76
     case 23: UI_INCREMENT(TargetTemp_celsius, CHAMBER); break;
77 77
     #ifndef NO_TOOLHEAD_HEATER_GCODE
78
-    case  2: UI_DECREMENT(TargetTemp_celsius, E0); break;
79
-    case  3: UI_INCREMENT(TargetTemp_celsius, E0); break;
78
+      case  2: UI_DECREMENT(TargetTemp_celsius, E0); break;
79
+      case  3: UI_INCREMENT(TargetTemp_celsius, E0); break;
80 80
     #endif
81 81
     #if HOTENDS > 1
82
-    case  4: UI_DECREMENT(TargetTemp_celsius, E1); break;
83
-    case  5: UI_INCREMENT(TargetTemp_celsius, E1); break;
82
+      case  4: UI_DECREMENT(TargetTemp_celsius, E1); break;
83
+      case  5: UI_INCREMENT(TargetTemp_celsius, E1); break;
84 84
     #endif
85 85
     #if HOTENDS > 2
86
-    case  6: UI_DECREMENT(TargetTemp_celsius, E2); break;
87
-    case  7: UI_INCREMENT(TargetTemp_celsius, E2); break;
86
+      case  6: UI_DECREMENT(TargetTemp_celsius, E2); break;
87
+      case  7: UI_INCREMENT(TargetTemp_celsius, E2); break;
88 88
     #endif
89 89
     #if HOTENDS > 3
90
-    case  8: UI_DECREMENT(TargetTemp_celsius, E3); break;
91
-    case  9: UI_INCREMENT(TargetTemp_celsius, E3); break;
90
+      case  8: UI_DECREMENT(TargetTemp_celsius, E3); break;
91
+      case  9: UI_INCREMENT(TargetTemp_celsius, E3); break;
92 92
     #endif
93 93
     #if FAN_COUNT > 0
94
-    case 10: UI_DECREMENT(TargetFan_percent, FAN0); break;
95
-    case 11: UI_INCREMENT(TargetFan_percent, FAN0); break;
94
+      case 10: UI_DECREMENT(TargetFan_percent, FAN0); break;
95
+      case 11: UI_INCREMENT(TargetFan_percent, FAN0); break;
96 96
     #endif
97 97
     case 30:
98 98
       #define _HOTEND_OFF(N) setTargetTemp_celsius(0,E##N);

+ 20
- 19
Marlin/src/module/temperature.cpp View File

@@ -2331,25 +2331,26 @@ void Temperature::update_raw_temperatures() {
2331 2331
     #elif DISABLED(HEATER_1_USES_MAX6675)
2332 2332
       temp_hotend[1].update();
2333 2333
     #endif
2334
-    #if HAS_TEMP_ADC_2
2335
-      temp_hotend[2].update();
2336
-      #if HAS_TEMP_ADC_3
2337
-        temp_hotend[3].update();
2338
-        #if HAS_TEMP_ADC_4
2339
-          temp_hotend[4].update();
2340
-          #if HAS_TEMP_ADC_5
2341
-            temp_hotend[5].update();
2342
-            #if HAS_TEMP_ADC_6
2343
-              temp_hotend[6].update();
2344
-              #if HAS_TEMP_ADC_7
2345
-                temp_hotend[7].update();
2346
-              #endif // HAS_TEMP_ADC_7
2347
-            #endif // HAS_TEMP_ADC_6
2348
-          #endif // HAS_TEMP_ADC_5
2349
-        #endif // HAS_TEMP_ADC_4
2350
-      #endif // HAS_TEMP_ADC_3
2351
-    #endif // HAS_TEMP_ADC_2
2352
-  #endif // HAS_TEMP_ADC_1
2334
+  #endif
2335
+
2336
+  #if HAS_TEMP_ADC_2
2337
+    temp_hotend[2].update();
2338
+  #endif
2339
+  #if HAS_TEMP_ADC_3
2340
+    temp_hotend[3].update();
2341
+  #endif
2342
+  #if HAS_TEMP_ADC_4
2343
+    temp_hotend[4].update();
2344
+  #endif
2345
+  #if HAS_TEMP_ADC_5
2346
+    temp_hotend[5].update();
2347
+  #endif
2348
+  #if HAS_TEMP_ADC_6
2349
+    temp_hotend[6].update();
2350
+  #endif
2351
+  #if HAS_TEMP_ADC_7
2352
+    temp_hotend[7].update();
2353
+  #endif
2353 2354
 
2354 2355
   #if HAS_HEATED_BED
2355 2356
     temp_bed.update();

Loading…
Cancel
Save