bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Add millis helper macros

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-03 19:49:45 -05:00
parent 723d4d6f61
commit 0e06aaa2bc
10 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/calibrate/G76_M871.cpp
View File

@ -182,7 +182,7 @@ void GcodeSuite::G76() {
do_blocking_move_to(parkpos);
// Wait for heatbed to reach target temp and probe to cool below target temp
if (wait_for_temps(target_bed, target_probe, next_temp_report, millis() + 900UL * 1000UL)) {
if (wait_for_temps(target_bed, target_probe, next_temp_report, millis() + MIN_TO_MS(15))) {
SERIAL_ECHOLNPGM("!Bed heating timeout.");
break;
}

2
Marlin/src/gcode/gcode.cpp
View File

@ -988,7 +988,7 @@ void GcodeSuite::process_subcommands_now(char * gcode) {
break;
}
}
next_busy_signal_ms = ms + host_keepalive_interval * 1000UL;
next_busy_signal_ms = ms + SEC_TO_MS(host_keepalive_interval);
}
#endif // HOST_KEEPALIVE_FEATURE