SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More 8-extruder fixups

Browse source
This commit is contained in:
Scott Lahteine 2020-02-01 15:18:01 -06:00
parent c4cbc54484
commit 22556a7bbf
5 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/HAL/HAL_ESP32/HAL.cpp
View file

@ -172,6 +172,12 @@ void HAL_adc_init() {
#if HAS_TEMP_ADC_5 #if HAS_TEMP_ADC_5
adc1_set_attenuation(get_channel(TEMP_5_PIN), ADC_ATTEN_11db); adc1_set_attenuation(get_channel(TEMP_5_PIN), ADC_ATTEN_11db);
#endif #endif
#if HAS_TEMP_ADC_6
adc2_set_attenuation(get_channel(TEMP_6_PIN), ADC_ATTEN_11db);
#endif
#if HAS_TEMP_ADC_7
adc3_set_attenuation(get_channel(TEMP_7_PIN), ADC_ATTEN_11db);
#endif
#if HAS_HEATED_BED #if HAS_HEATED_BED
adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db); adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db);
#endif #endif

3
Marlin/src/MarlinCore.cpp
View file

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

5
Marlin/src/gcode/config/M200-M205.cpp
View file

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

20
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) {
case 22: UI_DECREMENT(TargetTemp_celsius, CHAMBER); break; case 22: UI_DECREMENT(TargetTemp_celsius, CHAMBER); break;
case 23: UI_INCREMENT(TargetTemp_celsius, CHAMBER); break; case 23: UI_INCREMENT(TargetTemp_celsius, CHAMBER); break;
#ifndef NO_TOOLHEAD_HEATER_GCODE #ifndef NO_TOOLHEAD_HEATER_GCODE
case 2: UI_DECREMENT(TargetTemp_celsius, E0); break; case 2: UI_DECREMENT(TargetTemp_celsius, E0); break;
case 3: UI_INCREMENT(TargetTemp_celsius, E0); break; case 3: UI_INCREMENT(TargetTemp_celsius, E0); break;
#endif #endif
#if HOTENDS > 1 #if HOTENDS > 1
case 4: UI_DECREMENT(TargetTemp_celsius, E1); break; case 4: UI_DECREMENT(TargetTemp_celsius, E1); break;
case 5: UI_INCREMENT(TargetTemp_celsius, E1); break; case 5: UI_INCREMENT(TargetTemp_celsius, E1); break;
#endif #endif
#if HOTENDS > 2 #if HOTENDS > 2
case 6: UI_DECREMENT(TargetTemp_celsius, E2); break; case 6: UI_DECREMENT(TargetTemp_celsius, E2); break;
case 7: UI_INCREMENT(TargetTemp_celsius, E2); break; case 7: UI_INCREMENT(TargetTemp_celsius, E2); break;
#endif #endif
#if HOTENDS > 3 #if HOTENDS > 3
case 8: UI_DECREMENT(TargetTemp_celsius, E3); break; case 8: UI_DECREMENT(TargetTemp_celsius, E3); break;
case 9: UI_INCREMENT(TargetTemp_celsius, E3); break; case 9: UI_INCREMENT(TargetTemp_celsius, E3); break;
#endif #endif
#if FAN_COUNT > 0 #if FAN_COUNT > 0
case 10: UI_DECREMENT(TargetFan_percent, FAN0); break; case 10: UI_DECREMENT(TargetFan_percent, FAN0); break;
case 11: UI_INCREMENT(TargetFan_percent, FAN0); break; case 11: UI_INCREMENT(TargetFan_percent, FAN0); break;
#endif #endif
case 30: case 30:
#define _HOTEND_OFF(N) setTargetTemp_celsius(0,E##N); #define _HOTEND_OFF(N) setTargetTemp_celsius(0,E##N);

39
Marlin/src/module/temperature.cpp
View file

@ -2331,25 +2331,26 @@ void Temperature::update_raw_temperatures() {
#elif DISABLED(HEATER_1_USES_MAX6675) #elif DISABLED(HEATER_1_USES_MAX6675)
temp_hotend[1].update(); temp_hotend[1].update();
#endif #endif
#if HAS_TEMP_ADC_2 #endif
temp_hotend[2].update();
#if HAS_TEMP_ADC_3 #if HAS_TEMP_ADC_2
temp_hotend[3].update(); temp_hotend[2].update();
#if HAS_TEMP_ADC_4 #endif
temp_hotend[4].update(); #if HAS_TEMP_ADC_3
#if HAS_TEMP_ADC_5 temp_hotend[3].update();
temp_hotend[5].update(); #endif
#if HAS_TEMP_ADC_6 #if HAS_TEMP_ADC_4
temp_hotend[6].update(); temp_hotend[4].update();
#if HAS_TEMP_ADC_7 #endif
temp_hotend[7].update(); #if HAS_TEMP_ADC_5
#endif // HAS_TEMP_ADC_7 temp_hotend[5].update();
#endif // HAS_TEMP_ADC_6 #endif
#endif // HAS_TEMP_ADC_5 #if HAS_TEMP_ADC_6
#endif // HAS_TEMP_ADC_4 temp_hotend[6].update();
#endif // HAS_TEMP_ADC_3 #endif
#endif // HAS_TEMP_ADC_2 #if HAS_TEMP_ADC_7
#endif // HAS_TEMP_ADC_1 temp_hotend[7].update();
#endif
#if HAS_HEATED_BED #if HAS_HEATED_BED
temp_bed.update(); temp_bed.update();