From 2ba863d8a57185b21a94ec7c9f23be7cd3dba35a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 16 Sep 2022 17:23:38 +0200 Subject: [PATCH] Reuse MSG_IR_0x_OR_.. fix lowercase remove todos --- Firmware/Filament_sensor.cpp | 4 ++-- Firmware/messages.cpp | 4 +--- Firmware/messages.h | 2 -- Firmware/ultralcd.cpp | 8 -------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index ef9a2fc9d..5b235f121 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -359,10 +359,10 @@ void IR_sensor_analog::IR_ANALOG_Check(SensorRevision isVersion, SensorRevision printf_IRSensorAnalogBoardChange(); switch (switchTo) { case SensorRevision::_Old: - lcd_setstatuspgm(_T(MSG_FS_V_03_OR_OLDER)); ////MSG_FS_V_03_OR_OLDER c=18 + lcd_setstatuspgm(_T(MSG_IR_03_OR_OLDER)); break; case SensorRevision::_Rev04: - lcd_setstatuspgm(_T(MSG_FS_V_04_OR_NEWER)); ////MSG_FS_V_04_OR_NEWER c=18 + lcd_setstatuspgm(_T(MSG_IR_04_OR_NEWER)); break; default: break; diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 9400c66ad..59dfb5d7d 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -54,7 +54,7 @@ const char MSG_SELECT_FILAMENT[] PROGMEM_I1 = ISTR("Select filament:"); ////MSG_ const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////MSG_LAST_PRINT c=18 const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////MSG_LAST_PRINT_FAILURES c=20 const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_FILAMENT c=17 -const char MSG_LOAD_TO_EXTRUDER[] PROGMEM_I1 = ISTR("Load to Extruder"); ////MSG_LOAD_TO_EXTRUDER c=18 +const char MSG_LOAD_TO_EXTRUDER[] PROGMEM_I1 = ISTR("Load to extruder"); ////MSG_LOAD_TO_EXTRUDER c=18 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////MSG_LOADING_FILAMENT c=20 const char MSG_TESTING_FILAMENT[] PROGMEM_I1 = ISTR("Testing filament"); ////MSG_TESTING_FILAMENT c=20 const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); ////MSG_EJECT_FILAMENT c=17 @@ -159,8 +159,6 @@ const char MSG_TIMEOUT[] PROGMEM_I1 = ISTR("Timeout"); ////MSG_TIMEOUT c=12 const char MSG_BRIGHT[] PROGMEM_I1 = ISTR("Bright"); ////MSG_BRIGHT c=6 const char MSG_DIM[] PROGMEM_I1 = ISTR("Dim"); ////MSG_DIM c=6 const char MSG_AUTO[] PROGMEM_I1 = ISTR("Auto"); ////MSG_AUTO c=6 -const char MSG_FS_V_03_OR_OLDER[] PROGMEM_I1 = ISTR("FS v0.3 or older"); ////MSG_FS_V_03_OR_OLDER c=18 -const char MSG_FS_V_04_OR_NEWER[] PROGMEM_I1 = ISTR("FS v0.4 or newer"); ////MSG_FS_V_04_OR_NEWER c=18 #if (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) // Beware - the space at the beginning is necessary since it is reused in LCD menu items which are to be with a space const char MSG_IR_04_OR_NEWER[] PROGMEM_I1 = ISTR(" 0.4 or newer");////MSG_IR_04_OR_NEWER c=18 diff --git a/Firmware/messages.h b/Firmware/messages.h index 9c5703cb2..72e113d8f 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -170,8 +170,6 @@ extern const char MSG_TIMEOUT[]; extern const char MSG_BRIGHT[]; extern const char MSG_DIM[]; extern const char MSG_AUTO[]; -extern const char MSG_FS_V_03_OR_OLDER[]; -extern const char MSG_FS_V_04_OR_NEWER[]; #if (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) extern const char MSG_IR_04_OR_NEWER[]; extern const char MSG_IR_03_OR_OLDER[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 85d5b4700..c2e69da97 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1136,7 +1136,6 @@ static void pgmtext_with_colon(const char *ipgmLabel, char *dst, uint8_t dstSize //! | | //! ---------------------- //! @endcode -//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. void lcd_menu_extruder_info() // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") { @@ -1179,7 +1178,6 @@ static void lcd_menu_fails_stats_mmu() //! | | //! ---------------------- //! @endcode -//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_fails_stats_mmu_print() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -1238,7 +1236,6 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%- //! | Crash X:000 Y:000| MSG_CRASH c=7 //! ---------------------- //! @endcode -//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_fails_stats_total() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -1347,7 +1344,6 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" "%S\n" " %-1 //! | Fil. runouts 000| MSG_FIL_RUNOUTS c=15 //! ---------------------- //! @endcode -//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_fails_stats() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -1426,7 +1422,6 @@ static void lcd_menu_temperatures_line(const char *ipgmLabel, int value){ //! ---------------------- //! D - Degree sysmbol LCD_STR_DEGREE //! @endcode -//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_temperatures() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -1457,7 +1452,6 @@ static void lcd_menu_temperatures() //! | IR : 00.0V | c=12 optional //! ---------------------- //! @endcode -//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_voltages() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -1483,7 +1477,6 @@ static void lcd_menu_voltages() //! | | //! ---------------------- //! @endcode -//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_belt_status() { lcd_home(); @@ -2375,7 +2368,6 @@ static void lcd_LoadFilament() //! | 00d 00h 00m | //! ---------------------- //! @endcode -//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. Translations missing for "d"days, "h"ours, "m"inutes", "s"seconds". void lcd_menu_statistics() { lcd_timeoutToStatus.stop(); //infinite timeout