MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pid_autotune parity with 2.0.x

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-03 03:26:47 -05:00 committed by GitHub
parent 39cc36d3f1
commit 193a0e9273
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/temperature.cpp
View File

@ -220,7 +220,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS],
int cycles = 0; int cycles = 0;
bool heating = true; bool heating = true;
millis_t temp_ms = millis(), t1 = temp_ms, t2 = temp_ms; millis_t next_temp_ms = millis(), t1 = next_temp_ms, t2 = next_temp_ms;
long t_high = 0, t_low = 0; long t_high = 0, t_low = 0;
long bias, d; long bias, d;
@ -256,13 +256,13 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS],
TEMP_HYSTERESIS TEMP_HYSTERESIS
#endif #endif
; ;
millis_t temp_change_ms = temp_ms + watch_temp_period * 1000UL; millis_t temp_change_ms = next_temp_ms + watch_temp_period * 1000UL;
float next_watch_temp = 0.0; float next_watch_temp = 0.0;
bool heated = false; bool heated = false;
#endif #endif
#if HAS_AUTO_FAN #if HAS_AUTO_FAN
next_auto_fan_check_ms = temp_ms + 2500UL; next_auto_fan_check_ms = next_temp_ms + 2500UL;
#endif #endif
#if ENABLED(PIDTEMP) #if ENABLED(PIDTEMP)
@ -419,13 +419,13 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS],
break; break;
} }
// Every 2 seconds... // Every 2 seconds...
if (ELAPSED(ms, temp_ms)) { if (ELAPSED(ms, next_temp_ms)) {
#if HAS_TEMP_HOTEND || HAS_TEMP_BED #if HAS_TEMP_HOTEND || HAS_TEMP_BED
print_heaterstates(); print_heaterstates();
SERIAL_EOL(); SERIAL_EOL();
#endif #endif
temp_ms = ms + 2000UL; next_temp_ms = ms + 2000UL;
#if WATCH_THE_BED || WATCH_HOTENDS #if WATCH_THE_BED || WATCH_HOTENDS
if (!heated && input > next_watch_temp) { if (!heated && input > next_watch_temp) {