More 8-extruder fixups
This commit is contained in:
parent
c4cbc54484
commit
22556a7bbf
5 changed files with 42 additions and 31 deletions
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
#endif
|
||||||
|
|
||||||
#if HAS_TEMP_ADC_2
|
#if HAS_TEMP_ADC_2
|
||||||
temp_hotend[2].update();
|
temp_hotend[2].update();
|
||||||
|
#endif
|
||||||
#if HAS_TEMP_ADC_3
|
#if HAS_TEMP_ADC_3
|
||||||
temp_hotend[3].update();
|
temp_hotend[3].update();
|
||||||
|
#endif
|
||||||
#if HAS_TEMP_ADC_4
|
#if HAS_TEMP_ADC_4
|
||||||
temp_hotend[4].update();
|
temp_hotend[4].update();
|
||||||
|
#endif
|
||||||
#if HAS_TEMP_ADC_5
|
#if HAS_TEMP_ADC_5
|
||||||
temp_hotend[5].update();
|
temp_hotend[5].update();
|
||||||
|
#endif
|
||||||
#if HAS_TEMP_ADC_6
|
#if HAS_TEMP_ADC_6
|
||||||
temp_hotend[6].update();
|
temp_hotend[6].update();
|
||||||
|
#endif
|
||||||
#if HAS_TEMP_ADC_7
|
#if HAS_TEMP_ADC_7
|
||||||
temp_hotend[7].update();
|
temp_hotend[7].update();
|
||||||
#endif // HAS_TEMP_ADC_7
|
#endif
|
||||||
#endif // HAS_TEMP_ADC_6
|
|
||||||
#endif // HAS_TEMP_ADC_5
|
|
||||||
#endif // HAS_TEMP_ADC_4
|
|
||||||
#endif // HAS_TEMP_ADC_3
|
|
||||||
#endif // HAS_TEMP_ADC_2
|
|
||||||
#endif // HAS_TEMP_ADC_1
|
|
||||||
|
|
||||||
#if HAS_HEATED_BED
|
#if HAS_HEATED_BED
|
||||||
temp_bed.update();
|
temp_bed.update();
|
||||||
|
|
Reference in a new issue