From 0a68de0bbe2dea0517fe45a2ab8e72336e864c2c Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 13 Sep 2022 14:53:50 +0200 Subject: [PATCH] Update MSG c=xx Mark unused strings as `_n` --- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.cpp | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c3915d1e..5574015d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2460,7 +2460,7 @@ void gcode_M105(uint8_t extruder) } #else SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_i("No thermistors - no temperature"));////MSG_ERR_NO_THERMISTORS + SERIAL_ERRORLNRPGM(_n("No thermistors - no temperature"));////MSG_ERR_NO_THERMISTORS #endif SERIAL_PROTOCOLPGM(" @:"); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5d3c3f76..2de25a37 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2803,7 +2803,7 @@ void lcd_adjust_z() { lcd_clear(); lcd_set_cursor(0, 0); - lcd_puts_P(_i("Auto adjust Z?"));////MSG_ADJUSTZ + lcd_puts_P(_n("Auto adjust Z?"));////MSG_ADJUSTZ lcd_set_cursor(1, 1); lcd_puts_P(_T(MSG_YES)); @@ -4433,16 +4433,16 @@ do\ switch(e_mbl_type)\ {\ case e_MBL_FAST:\ - MENU_ITEM_FUNCTION_P(_i("Mode [Fast]"),mbl_mode_set);\ + MENU_ITEM_FUNCTION_P(_n("Mode [Fast]"),mbl_mode_set);\ break; \ case e_MBL_OPTIMAL:\ - MENU_ITEM_FUNCTION_P(_i("Mode [Optimal]"), mbl_mode_set); \ + MENU_ITEM_FUNCTION_P(_n("Mode [Optimal]"), mbl_mode_set); \ break; \ case e_MBL_PREC:\ - MENU_ITEM_FUNCTION_P(_i("Mode [Precise]"), mbl_mode_set); \ + MENU_ITEM_FUNCTION_P(_n("Mode [Precise]"), mbl_mode_set); \ break; \ default:\ - MENU_ITEM_FUNCTION_P(_i("Mode [Optimal]"), mbl_mode_set); \ + MENU_ITEM_FUNCTION_P(_n("Mode [Optimal]"), mbl_mode_set); \ break; \ }\ }\ @@ -5550,7 +5550,7 @@ static void lcd_main_menu() bMain=true; // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function MENU_ITEM_SUBMENU_P(_i("No SD card"), lcd_sdcard_menu);////MSG_NO_CARD c=18 #if SDCARDDETECT < 1 - MENU_ITEM_GCODE_P(_i("Init. SD card"), PSTR("M21")); // Manually initialize the SD-card via user interface////MSG_INIT_SDCARD + MENU_ITEM_GCODE_P(_i("Init. SD card"), PSTR("M21")); // Manually initialize the SD-card via user interface////MSG_INIT_SDCARD c=18 #endif //SDCARDDETECT } #endif //SDSUPPORT @@ -5601,7 +5601,7 @@ static void lcd_main_menu() } MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT c=18 #ifdef LCD_TEST - MENU_ITEM_SUBMENU_P(_i("XFLASH init"), lcd_test_menu);////MSG_XFLASH + MENU_ITEM_SUBMENU_P(_i("XFLASH init"), lcd_test_menu);////MSG_XFLASH c=18 #endif //LCD_TEST MENU_END(); @@ -5890,10 +5890,10 @@ static void lcd_control_temperature_menu() MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10); #endif #if TEMP_SENSOR_1 != 0 - MENU_ITEM_EDIT_int3_P(_i("Nozzle2"), &target_temperature[1], 0, HEATER_1_MAXTEMP - 10);////MSG_NOZZLE1 + MENU_ITEM_EDIT_int3_P(_n("Nozzle2"), &target_temperature[1], 0, HEATER_1_MAXTEMP - 10);////MSG_NOZZLE1 #endif #if TEMP_SENSOR_2 != 0 - MENU_ITEM_EDIT_int3_P(_i("Nozzle3"), &target_temperature[2], 0, HEATER_2_MAXTEMP - 10);////MSG_NOZZLE2 + MENU_ITEM_EDIT_int3_P(_n("Nozzle3"), &target_temperature[2], 0, HEATER_2_MAXTEMP - 10);////MSG_NOZZLE2 #endif #if TEMP_SENSOR_BED != 0 MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 3); @@ -5902,9 +5902,9 @@ static void lcd_control_temperature_menu() #if defined AUTOTEMP && (TEMP_SENSOR_0 != 0) //MENU_ITEM_EDIT removed, following code must be redesigned if AUTOTEMP enabled MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled); - MENU_ITEM_EDIT(float3, _i(" \xdf Min"), &autotemp_min, 0, HEATER_0_MAXTEMP - 10);////MSG_MIN - MENU_ITEM_EDIT(float3, _i(" \xdf Max"), &autotemp_max, 0, HEATER_0_MAXTEMP - 10);////MSG_MAX - MENU_ITEM_EDIT(float32, _i(" \xdf Fact"), &autotemp_factor, 0.0, 1.0);////MSG_FACTOR + MENU_ITEM_EDIT(float3, _n(" \xdf Min"), &autotemp_min, 0, HEATER_0_MAXTEMP - 10);////MSG_MIN + MENU_ITEM_EDIT(float3, _n(" \xdf Max"), &autotemp_max, 0, HEATER_0_MAXTEMP - 10);////MSG_MAX + MENU_ITEM_EDIT(float32, _n(" \xdf Fact"), &autotemp_factor, 0.0, 1.0);////MSG_FACTOR #endif MENU_END();