|
@@ -629,7 +629,7 @@ int Temperature::getHeaterPower(const int heater) {
|
629
|
629
|
SBI(fanState, pgm_read_byte(&fanBit[e]));
|
630
|
630
|
|
631
|
631
|
#if HAS_TEMP_CHAMBER
|
632
|
|
- if (temp_chambercurrent > EXTRUDER_AUTO_FAN_TEMPERATURE)
|
|
632
|
+ if (temp_chamber.current > EXTRUDER_AUTO_FAN_TEMPERATURE)
|
633
|
633
|
SBI(fanState, pgm_read_byte(&fanBit[6]));
|
634
|
634
|
#endif
|
635
|
635
|
|
|
@@ -1053,14 +1053,14 @@ void Temperature::manage_heater() {
|
1053
|
1053
|
if (PENDING(ms, next_chamber_check_ms)) return;
|
1054
|
1054
|
next_chamber_check_ms = ms + CHAMBER_CHECK_INTERVAL;
|
1055
|
1055
|
|
1056
|
|
- if (WITHIN(temp_chambercurrent, CHAMBER_MINTEMP, CHAMBER_MAXTEMP)) {
|
|
1056
|
+ if (WITHIN(temp_chamber.current, CHAMBER_MINTEMP, CHAMBER_MAXTEMP)) {
|
1057
|
1057
|
#if ENABLED(CHAMBER_LIMIT_SWITCHING)
|
1058
|
|
- if (temp_chambercurrent >= temp_chamber.target + CHAMBER_HYSTERESIS)
|
|
1058
|
+ if (temp_chamber.current >= temp_chamber.target + CHAMBER_HYSTERESIS)
|
1059
|
1059
|
temp_chamber.soft_pwm_amount = 0;
|
1060
|
|
- else if (temp_chambercurrent <= temp_chamber.target - (CHAMBER_HYSTERESIS))
|
|
1060
|
+ else if (temp_chamber.current <= temp_chamber.target - (CHAMBER_HYSTERESIS))
|
1061
|
1061
|
temp_chamber.soft_pwm_amount = MAX_CHAMBER_POWER >> 1;
|
1062
|
1062
|
#else // !PIDTEMPCHAMBER && !CHAMBER_LIMIT_SWITCHING
|
1063
|
|
- temp_chamber.soft_pwm_amount = temp_chambercurrent < temp_chamber.target ? MAX_CHAMBER_POWER >> 1 : 0;
|
|
1063
|
+ temp_chamber.soft_pwm_amount = temp_chamber.current < temp_chamber.target ? MAX_CHAMBER_POWER >> 1 : 0;
|
1064
|
1064
|
#endif
|
1065
|
1065
|
}
|
1066
|
1066
|
else {
|
|
@@ -1069,11 +1069,11 @@ void Temperature::manage_heater() {
|
1069
|
1069
|
}
|
1070
|
1070
|
|
1071
|
1071
|
#if ENABLED(THERMAL_PROTECTION_CHAMBER)
|
1072
|
|
- thermal_runaway_protection(tr_state_machine_chamber, temp_chambercurrent, temp_chamber.target, -2, THERMAL_PROTECTION_CHAMBER_PERIOD, THERMAL_PROTECTION_CHAMBER_HYSTERESIS);
|
|
1072
|
+ thermal_runaway_protection(tr_state_machine_chamber, temp_chamber.current, temp_chamber.target, -2, THERMAL_PROTECTION_CHAMBER_PERIOD, THERMAL_PROTECTION_CHAMBER_HYSTERESIS);
|
1073
|
1073
|
#endif
|
1074
|
1074
|
|
1075
|
1075
|
// TODO: Implement true PID pwm
|
1076
|
|
- //temp_bed.soft_pwm_amount = WITHIN(temp_chambercurrent, CHAMBER_MINTEMP, CHAMBER_MAXTEMP) ? (int)get_pid_output_chamber() >> 1 : 0;
|
|
1076
|
+ //temp_bed.soft_pwm_amount = WITHIN(temp_chamber.current, CHAMBER_MINTEMP, CHAMBER_MAXTEMP) ? (int)get_pid_output_chamber() >> 1 : 0;
|
1077
|
1077
|
|
1078
|
1078
|
#endif // HAS_HEATED_CHAMBER
|
1079
|
1079
|
|
|
@@ -1235,7 +1235,7 @@ void Temperature::updateTemperaturesFromRawValues() {
|
1235
|
1235
|
temp_bed.current = analog_to_celsius_bed(temp_bed.raw);
|
1236
|
1236
|
#endif
|
1237
|
1237
|
#if HAS_TEMP_CHAMBER
|
1238
|
|
- temp_chambercurrent = analog_to_celsius_chamber(temp_chamber.raw);
|
|
1238
|
+ temp_chamber.current = analog_to_celsius_chamber(temp_chamber.raw);
|
1239
|
1239
|
#endif
|
1240
|
1240
|
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
|
1241
|
1241
|
redundant_temperature = analog_to_celsius_hotend(redundant_temperature_raw, 1);
|