Bläddra i källkod

More serial strings

Scott Lahteine 4 år sedan
förälder
incheckning
5ebba4b19f

+ 3
- 3
Marlin/src/feature/pause.cpp Visa fil

175
     #if HAS_LCD_MENU
175
     #if HAS_LCD_MENU
176
       if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_INSERT, mode);
176
       if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_INSERT, mode);
177
     #endif
177
     #endif
178
-    SERIAL_ECHO_MSG(_PMSG(MSG_FILAMENT_CHANGE_INSERT));
178
+    SERIAL_ECHO_MSG(_PMSG(STR_FILAMENT_CHANGE_INSERT));
179
 
179
 
180
     #if HAS_BUZZER
180
     #if HAS_BUZZER
181
       filament_change_beep(max_beep_count, true);
181
       filament_change_beep(max_beep_count, true);
480
     lcd_pause_show_message(is_reload ? PAUSE_MESSAGE_INSERT : PAUSE_MESSAGE_WAITING);
480
     lcd_pause_show_message(is_reload ? PAUSE_MESSAGE_INSERT : PAUSE_MESSAGE_WAITING);
481
   #endif
481
   #endif
482
   SERIAL_ECHO_START();
482
   SERIAL_ECHO_START();
483
-  serialprintPGM(is_reload ? PSTR(_PMSG(MSG_FILAMENT_CHANGE_INSERT) "\n") : PSTR(_PMSG(MSG_FILAMENT_CHANGE_WAIT) "\n"));
483
+  serialprintPGM(is_reload ? PSTR(_PMSG(STR_FILAMENT_CHANGE_INSERT) "\n") : PSTR(_PMSG(STR_FILAMENT_CHANGE_WAIT) "\n"));
484
 }
484
 }
485
 
485
 
486
 void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
486
 void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
530
       #if HAS_LCD_MENU
530
       #if HAS_LCD_MENU
531
         lcd_pause_show_message(PAUSE_MESSAGE_HEAT);
531
         lcd_pause_show_message(PAUSE_MESSAGE_HEAT);
532
       #endif
532
       #endif
533
-      SERIAL_ECHO_MSG(_PMSG(MSG_FILAMENT_CHANGE_HEAT));
533
+      SERIAL_ECHO_MSG(_PMSG(STR_FILAMENT_CHANGE_HEAT));
534
 
534
 
535
       #if ENABLED(HOST_PROMPT_SUPPORT)
535
       #if ENABLED(HOST_PROMPT_SUPPORT)
536
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("HeaterTimeout"), PSTR("Reheat"));
536
         host_prompt_do(PROMPT_USER_CONTINUE, PSTR("HeaterTimeout"), PSTR("Reheat"));

+ 2
- 2
Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp Visa fil

74
           1
74
           1
75
         #endif
75
         #endif
76
       )
76
       )
77
-      .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(STR_OFFSETS_MENU))
77
+      .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
78
       .enabled(
78
       .enabled(
79
         #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
79
         #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
80
           1
80
           1
142
           1
142
           1
143
         #endif
143
         #endif
144
       )
144
       )
145
-      .tag(4) .button( BTN_POS(1,2),  BTN_SIZE(1,1), GET_TEXT_F(STR_OFFSETS_MENU))
145
+      .tag(4) .button( BTN_POS(1,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
146
       .tag(12).button( BTN_POS(3,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
146
       .tag(12).button( BTN_POS(3,4),  BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
147
       .tag(5) .button( BTN_POS(2,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
147
       .tag(5) .button( BTN_POS(2,2),  BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
148
       .tag(6) .button( BTN_POS(2,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
148
       .tag(6) .button( BTN_POS(2,3),  BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp Visa fil

62
           1
62
           1
63
         #endif
63
         #endif
64
       )
64
       )
65
-      .tag(6) .button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(STR_OFFSETS_MENU))
65
+      .tag(6) .button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
66
 
66
 
67
 
67
 
68
       .tag(7) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
68
       .tag(7) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp Visa fil

41
   widgets_t w(what);
41
   widgets_t w(what);
42
   w.precision(2).units(GET_TEXT_F(MSG_UNITS_MM));
42
   w.precision(2).units(GET_TEXT_F(MSG_UNITS_MM));
43
 
43
 
44
-  w.heading(                          GET_TEXT_F(STR_OFFSETS_MENU));
44
+  w.heading(                          GET_TEXT_F(MSG_OFFSETS_MENU));
45
   w.color(Theme::x_axis).adjuster(2,  GET_TEXT_F(MSG_AXIS_X), ExtUI::getNozzleOffset_mm(X, E1));
45
   w.color(Theme::x_axis).adjuster(2,  GET_TEXT_F(MSG_AXIS_X), ExtUI::getNozzleOffset_mm(X, E1));
46
   w.color(Theme::y_axis).adjuster(4,  GET_TEXT_F(MSG_AXIS_Y), ExtUI::getNozzleOffset_mm(Y, E1));
46
   w.color(Theme::y_axis).adjuster(4,  GET_TEXT_F(MSG_AXIS_Y), ExtUI::getNozzleOffset_mm(Y, E1));
47
   w.color(Theme::z_axis).adjuster(6,  GET_TEXT_F(MSG_AXIS_Z), ExtUI::getNozzleOffset_mm(Z, E1));
47
   w.color(Theme::z_axis).adjuster(6,  GET_TEXT_F(MSG_AXIS_Z), ExtUI::getNozzleOffset_mm(Z, E1));

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp Visa fil

74
 
74
 
75
       #if HOTENDS > 1
75
       #if HOTENDS > 1
76
         format_position(str, getNozzleOffset_mm(X, E1), getNozzleOffset_mm(Y, E1), getNozzleOffset_mm(Z, E1));
76
         format_position(str, getNozzleOffset_mm(X, E1), getNozzleOffset_mm(Y, E1), getNozzleOffset_mm(Z, E1));
77
-        w.text_field(0, GET_TEXT_F(STR_OFFSETS_MENU), str);
77
+        w.text_field(0, GET_TEXT_F(MSG_OFFSETS_MENU), str);
78
       #endif
78
       #endif
79
     }
79
     }
80
   #endif
80
   #endif

+ 1
- 1
Marlin/src/lcd/menu/menu_configuration.cpp Visa fil

327
     #endif
327
     #endif
328
 
328
 
329
     #if HAS_HOTEND_OFFSET
329
     #if HAS_HOTEND_OFFSET
330
-      SUBMENU(STR_OFFSETS_MENU, menu_tool_offsets);
330
+      SUBMENU(MSG_OFFSETS_MENU, menu_tool_offsets);
331
     #endif
331
     #endif
332
 
332
 
333
     #if ENABLED(DUAL_X_CARRIAGE)
333
     #if ENABLED(DUAL_X_CARRIAGE)

+ 1
- 1
Marlin/src/module/endstops.cpp Visa fil

424
     bltouch._set_SW_mode();
424
     bltouch._set_SW_mode();
425
   #endif
425
   #endif
426
   SERIAL_ECHOLNPGM(STR_M119_REPORT);
426
   SERIAL_ECHOLNPGM(STR_M119_REPORT);
427
-  #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(MSG_##S))
427
+  #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(STR_##S))
428
   #if HAS_X_MIN
428
   #if HAS_X_MIN
429
     ES_REPORT(X_MIN);
429
     ES_REPORT(X_MIN);
430
   #endif
430
   #endif

Laddar…
Avbryt
Spara