diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index ca89fa54f..e298e6035 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -498,7 +498,7 @@ bool PAT9125_sensor::updatePAT9125() { } } - if (!pollingTimer.running() || pollingTimer.expired(pollingPeriod)) { + if (pollingTimer.expired_cont(pollingPeriod)) { pollingTimer.start(); if (!pat9125_update()) { init(); // try to reinit. diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 5dab747bd..447a39cd5 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2261,7 +2261,7 @@ static void check_min_temp_raw() if(target_temperature_isr[active_extruder]>minttemp[active_extruder]) { // ~ nozzle heating is on bCheckingOnHeater=bCheckingOnHeater||(current_temperature_isr[active_extruder]>(minttemp[active_extruder]+TEMP_HYSTERESIS)); // for eventually delay cutting - if(oTimer4minTempHeater.expired(HEATER_MINTEMP_DELAY)||(!oTimer4minTempHeater.running())||bCheckingOnHeater) { + if(oTimer4minTempHeater.expired_cont(HEATER_MINTEMP_DELAY) || bCheckingOnHeater) { bCheckingOnHeater=true; // not necessary check_min_temp_heater0(); // delay is elapsed or temperature is/was over minTemp => periodical checking is active } @@ -2275,7 +2275,7 @@ static void check_min_temp_raw() if(target_temperature_bed_isr>BED_MINTEMP) { // ~ bed heating is on bCheckingOnBed=bCheckingOnBed||(current_temperature_bed_isr>(BED_MINTEMP+TEMP_HYSTERESIS)); // for eventually delay cutting - if(oTimer4minTempBed.expired(BED_MINTEMP_DELAY)||(!oTimer4minTempBed.running())||bCheckingOnBed) { + if(oTimer4minTempBed.expired_cont(BED_MINTEMP_DELAY) || bCheckingOnBed) { bCheckingOnBed=true; // not necessary check_min_temp_bed(); // delay is elapsed or temperature is/was over minTemp => periodical checking is active } diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 65c7abd37..4947ea678 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -357,7 +357,7 @@ bool tmc2130_wait_standstill_xy(int timeout) void tmc2130_check_overtemp() { - if (tmc2130_overtemp_timer.expired(1000) || !tmc2130_overtemp_timer.running()) + if (tmc2130_overtemp_timer.expired_cont(1000)) { for (uint_least8_t i = 0; i < 4; i++) {