From 37fd9d1b119f83b4b2552e8b59de83757c682595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Thu, 26 Aug 2021 20:56:45 +0000 Subject: [PATCH] Convert NcTime to ShortTimer The variable is only used in ultralcd.cpp so I made it static there and deleted it from Marlin_main.cpp Saves 24 bytes of flash and 1 byte of SRAM --- Firmware/Marlin.h | 1 - Firmware/Marlin_main.cpp | 1 - Firmware/ultralcd.cpp | 6 +++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index e6c5685d0..e3b3fa393 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -330,7 +330,6 @@ extern unsigned int status_number; extern unsigned int heating_status_counter; extern char snmm_filaments_used; extern unsigned long PingTime; -extern unsigned long NcTime; extern bool no_response; extern uint8_t important_status; extern uint8_t saved_filament_type; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 115e4aa3a..ac28ec085 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -161,7 +161,6 @@ CardReader card; #endif unsigned long PingTime = _millis(); -unsigned long NcTime; uint8_t mbl_z_probe_nr = 3; //numer of Z measurements for each point in mesh bed leveling calibration diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 669cdd71c..2cfa73ada 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -55,7 +55,7 @@ int clock_interval = 0; - +static ShortTimer NcTime; static void lcd_sd_updir(); static void lcd_mesh_bed_leveling_settings(); #ifdef LCD_BL_PIN @@ -8705,10 +8705,10 @@ void lcd_printer_connected() { } static void lcd_send_status() { - if (farm_mode && no_response && ((_millis() - NcTime) > (NC_TIME * 1000))) { + if (farm_mode && no_response && (NcTime.expired(NC_TIME * 1000))) { //send important status messages periodicaly prusa_statistics(important_status, saved_filament_type); - NcTime = _millis(); + NcTime.start(); #ifdef FARM_CONNECT_MESSAGE lcd_connect_printer(); #endif //FARM_CONNECT_MESSAGE