Browse Source

Fix Live K, allow "Advance K" to be translated

Yuri D'Elia 4 years ago
parent
commit
0b9123ce24
4 changed files with 9 additions and 5 deletions
  1. 0 2
      Firmware/menu.h
  2. 3 0
      Firmware/messages.c
  3. 3 0
      Firmware/messages.h
  4. 3 3
      Firmware/ultralcd.cpp

+ 0 - 2
Firmware/menu.h

@@ -132,8 +132,6 @@ extern const char menu_fmt_int3[];
 
 extern const char menu_fmt_float31[];
 extern const char menu_fmt_float13[];
-extern const char menu_fmt_float13off[];
-
 
 extern void menu_draw_float31(const char* str, float val);
 

+ 3 - 0
Firmware/messages.c

@@ -131,6 +131,9 @@ const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
 const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////
 const char MSG_FS_CONTINUE[] PROGMEM_I1 = ISTR("Cont."); ////
 const char MSG_FS_PAUSE[] PROGMEM_I1 = ISTR("Pause"); ////
+#ifdef LA_LIVE_K
+const char MSG_ADVANCE_K[] PROGMEM_I1 = ISTR("Advance K:"); ////
+#endif
 
 //not internationalized messages
 const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////

+ 3 - 0
Firmware/messages.h

@@ -131,6 +131,9 @@ extern const char MSG_MAGNETS_COMP[];
 extern const char MSG_FS_ACTION[];
 extern const char MSG_FS_CONTINUE[];
 extern const char MSG_FS_PAUSE[];
+#ifdef LA_LIVE_K
+extern const char MSG_ADVANCE_K[];
+#endif
 
 //not internationalized messages
 extern const char MSG_BROWNOUT_RESET[];

+ 3 - 3
Firmware/ultralcd.cpp

@@ -7065,14 +7065,14 @@ static void lcd_colorprint_change() {
 #ifdef LA_LIVE_K
 // @wavexx: looks like there's no generic float editing function in menu.cpp so we
 //          redefine our custom handling functions to mimick other tunables
-#define MSG_ADVANCE_K PSTR("Advance K:")
+const char menu_fmt_float13off[] PROGMEM = "%c%-13.13S%6.6S";
 
 static void lcd_advance_draw_K(char chr, float val)
 {
     if (val <= 0)
-        lcd_printf_P(menu_fmt_float13off, chr, MSG_ADVANCE_K, " [off]");
+        lcd_printf_P(menu_fmt_float13off, chr, _T(MSG_ADVANCE_K), _T(MSG_OFF));
     else
-        lcd_printf_P(menu_fmt_float13, chr, MSG_ADVANCE_K, val);
+        lcd_printf_P(menu_fmt_float13, chr, _T(MSG_ADVANCE_K), val);
 }
 
 static void lcd_advance_edit_K(void)