Sfoglia il codice sorgente

📺 Fix Makefile build, improve Touch UI button titles (#22361)

Marcio T 4 anni fa
parent
commit
3be35a6bd6
25 ha cambiato i file con 29 aggiunte e 25 eliminazioni
  1. 4
    0
      Marlin/src/feature/power.cpp
  2. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
  3. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
  4. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
  5. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
  6. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
  7. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
  8. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
  9. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
  10. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
  11. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
  12. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
  13. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
  14. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
  15. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
  16. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
  17. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
  18. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
  19. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
  20. 2
    2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
  21. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
  22. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
  23. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
  24. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
  25. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp

+ 4
- 0
Marlin/src/feature/power.cpp Vedi File

38
   #include "../gcode/gcode.h"
38
   #include "../gcode/gcode.h"
39
 #endif
39
 #endif
40
 
40
 
41
+#if EITHER(PSU_CONTROL, AUTO_POWER_CONTROL)
42
+
41
 Power powerManager;
43
 Power powerManager;
42
 bool Power::psu_on;
44
 bool Power::psu_on;
43
 
45
 
214
   #endif
216
   #endif
215
 
217
 
216
 #endif // AUTO_POWER_CONTROL
218
 #endif // AUTO_POWER_CONTROL
219
+
220
+#endif // PSU_CONTROL || AUTO_POWER_CONTROL

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp Vedi File

87
       .tag(13) .button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
87
       .tag(13) .button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
88
       .tag(14) .button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
88
       .tag(14) .button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
89
       .colors(action_btn)
89
       .colors(action_btn)
90
-      .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
90
+      .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
91
     #undef GRID_COLS
91
     #undef GRID_COLS
92
     #undef GRID_ROWS
92
     #undef GRID_ROWS
93
   }
93
   }

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp Vedi File

54
        .tag(8).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
54
        .tag(8).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
55
        .tag(9).button(BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
55
        .tag(9).button(BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
56
        .colors(action_btn)
56
        .colors(action_btn)
57
-       .tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
57
+       .tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
58
   }
58
   }
59
 
59
 
60
   #undef GRID_COLS
60
   #undef GRID_COLS

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp Vedi File

54
        .enabled(!isPrinting()).tag(5).button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_MOVE_TO_HOME))
54
        .enabled(!isPrinting()).tag(5).button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_MOVE_TO_HOME))
55
        .enabled(!isPrinting()).tag(6).button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_RAISE_PLUNGER))
55
        .enabled(!isPrinting()).tag(6).button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_RAISE_PLUNGER))
56
        .enabled(!isPrinting()).tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
56
        .enabled(!isPrinting()).tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
57
-       .colors(action_btn)    .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
57
+       .colors(action_btn)    .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
58
   }
58
   }
59
   #undef GRID_COLS
59
   #undef GRID_COLS
60
   #undef GRID_ROWS
60
   #undef GRID_ROWS

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp Vedi File

67
       .tag(10).button(DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
67
       .tag(10).button(DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
68
       .tag(11).button(RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
68
       .tag(11).button(RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
69
       .colors(action_btn)
69
       .colors(action_btn)
70
-      .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BACK));
70
+      .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BUTTON_DONE));
71
   }
71
   }
72
 }
72
 }
73
 
73
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp Vedi File

71
        #undef  GRID_COLS
71
        #undef  GRID_COLS
72
        #define GRID_COLS 3
72
        #define GRID_COLS 3
73
        .colors(action_btn)
73
        .colors(action_btn)
74
-       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
74
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
75
   }
75
   }
76
 }
76
 }
77
 
77
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp Vedi File

90
   cmd.tag(3).button(x, y, h, v, GET_TEXT_F(MSG_FULL_LOAD));
90
   cmd.tag(3).button(x, y, h, v, GET_TEXT_F(MSG_FULL_LOAD));
91
 
91
 
92
   ui.bounds(POLY(load_screen_back_btn), x, y, h, v);
92
   ui.bounds(POLY(load_screen_back_btn), x, y, h, v);
93
-  cmd.tag(1).colors(action_btn).button(x, y, h, v, GET_TEXT_F(MSG_BACK));
93
+  cmd.tag(1).colors(action_btn).button(x, y, h, v, GET_TEXT_F(MSG_BUTTON_DONE));
94
 }
94
 }
95
 
95
 
96
 void LoadChocolateScreen::draw_text(draw_mode_t what) {
96
 void LoadChocolateScreen::draw_text(draw_mode_t what) {

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp Vedi File

68
        .tag(10).button(LEVELING_POS,          GET_TEXT_F(MSG_LEVELING))
68
        .tag(10).button(LEVELING_POS,          GET_TEXT_F(MSG_LEVELING))
69
        .tag(11).button(ABOUT_PRINTER_POS,     GET_TEXT_F(MSG_INFO_MENU))
69
        .tag(11).button(ABOUT_PRINTER_POS,     GET_TEXT_F(MSG_INFO_MENU))
70
        .colors(action_btn)
70
        .colors(action_btn)
71
-       .tag(1).button(BACK_POS,               GET_TEXT_F(MSG_BACK));
71
+       .tag(1).button(BACK_POS,               GET_TEXT_F(MSG_BUTTON_DONE));
72
   }
72
   }
73
 }
73
 }
74
 
74
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp Vedi File

65
       }
65
       }
66
     #endif
66
     #endif
67
     cmd.colors(action_btn)
67
     cmd.colors(action_btn)
68
-       .tag(1) .button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
68
+       .tag(1) .button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
69
   }
69
   }
70
 }
70
 }
71
 
71
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp Vedi File

77
     CommandProcessor cmd;
77
     CommandProcessor cmd;
78
     cmd.colors(normal_btn)
78
     cmd.colors(normal_btn)
79
        .font(font_medium)
79
        .font(font_medium)
80
-       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
80
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
81
   }
81
   }
82
 }
82
 }
83
 
83
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp Vedi File

94
        .tag(2).button(STATS_POS, GET_TEXT_F(MSG_INFO_STATS_MENU));
94
        .tag(2).button(STATS_POS, GET_TEXT_F(MSG_INFO_STATS_MENU));
95
   #endif
95
   #endif
96
   cmd.colors(action_btn)
96
   cmd.colors(action_btn)
97
-     .tag(1).button(BACK_POS,  GET_TEXT_F(MSG_BACK));
97
+     .tag(1).button(BACK_POS,  GET_TEXT_F(MSG_BUTTON_DONE));
98
 }
98
 }
99
 
99
 
100
 bool AboutScreen::onTouchEnd(uint8_t tag) {
100
 bool AboutScreen::onTouchEnd(uint8_t tag) {

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp Vedi File

111
       .enabled(ENABLED(BACKLASH_GCODE))
111
       .enabled(ENABLED(BACKLASH_GCODE))
112
       .tag(8).button(BACKLASH_POS,            GET_TEXT_F(MSG_BACKLASH))
112
       .tag(8).button(BACKLASH_POS,            GET_TEXT_F(MSG_BACKLASH))
113
       .colors(action_btn)
113
       .colors(action_btn)
114
-      .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BACK));
114
+      .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BUTTON_DONE));
115
   }
115
   }
116
 }
116
 }
117
 
117
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp Vedi File

61
     #else
61
     #else
62
       BTN_POS(15,7), BTN_SIZE(4,1),
62
       BTN_POS(15,7), BTN_SIZE(4,1),
63
     #endif
63
     #endif
64
-    GET_TEXT_F(MSG_BACK), true, true
64
+    GET_TEXT_F(MSG_BUTTON_DONE), true, true
65
   );
65
   );
66
 
66
 
67
   _line = 1;
67
   _line = 1;

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp Vedi File

136
   if (mydata.highlight.x != NONE)
136
   if (mydata.highlight.x != NONE)
137
     draw_adjuster(cmd, Z_VALUE_POS, 3, getHighlightedValue(), GET_TEXT_F(MSG_UNITS_MM), 4, 3);
137
     draw_adjuster(cmd, Z_VALUE_POS, 3, getHighlightedValue(), GET_TEXT_F(MSG_UNITS_MM), 4, 3);
138
   cmd.colors(mydata.needSave ? normal_btn : action_btn)
138
   cmd.colors(mydata.needSave ? normal_btn : action_btn)
139
-     .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_BACK))
139
+     .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE))
140
      .colors(mydata.needSave ? action_btn : normal_btn)
140
      .colors(mydata.needSave ? action_btn : normal_btn)
141
      .enabled(mydata.needSave)
141
      .enabled(mydata.needSave)
142
      .tag(2).button(SAVE_POS, GET_TEXT_F(MSG_TOUCHMI_SAVE));
142
      .tag(2).button(SAVE_POS, GET_TEXT_F(MSG_TOUCHMI_SAVE));

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp Vedi File

224
        .tag(6)                .enabled(t_ok).button (LOAD_MOMN_POS, GET_TEXT_F(MSG_MOMENTARY))
224
        .tag(6)                .enabled(t_ok).button (LOAD_MOMN_POS, GET_TEXT_F(MSG_MOMENTARY))
225
        .tag(7).TOG_STYLE(tog7).enabled(t_ok).button (UNLD_CONT_POS, GET_TEXT_F(MSG_CONTINUOUS))
225
        .tag(7).TOG_STYLE(tog7).enabled(t_ok).button (UNLD_CONT_POS, GET_TEXT_F(MSG_CONTINUOUS))
226
        .tag(8).TOG_STYLE(tog8).enabled(t_ok).button (LOAD_CONT_POS, GET_TEXT_F(MSG_CONTINUOUS))
226
        .tag(8).TOG_STYLE(tog8).enabled(t_ok).button (LOAD_CONT_POS, GET_TEXT_F(MSG_CONTINUOUS))
227
-       .tag(1).colors(action_btn)           .button (BACK_POS, GET_TEXT_F(MSG_BACK));
227
+       .tag(1).colors(action_btn)           .button (BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
228
   }
228
   }
229
 }
229
 }
230
 
230
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp Vedi File

135
         _USER_ITEM(20)
135
         _USER_ITEM(20)
136
        #endif
136
        #endif
137
       .colors(action_btn)
137
       .colors(action_btn)
138
-      .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
138
+      .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
139
   }
139
   }
140
 }
140
 }
141
 
141
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp Vedi File

120
 
120
 
121
   cmd.font(font_medium)
121
   cmd.font(font_medium)
122
      .colors(action_btn)
122
      .colors(action_btn)
123
-     .tag(1).button(BTN_POS(1,7), BTN_SIZE(6,1), GET_TEXT_F(MSG_BACK));
123
+     .tag(1).button(BTN_POS(1,7), BTN_SIZE(6,1), GET_TEXT_F(MSG_BUTTON_DONE));
124
   #undef GRID_COLS
124
   #undef GRID_COLS
125
   #undef GRID_ROWS
125
   #undef GRID_ROWS
126
 }
126
 }

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp Vedi File

63
        .enabled(ENABLED(LIN_ADVANCE))
63
        .enabled(ENABLED(LIN_ADVANCE))
64
        .tag(3).button(LIN_ADVANCE_POS, GET_TEXT_F(MSG_LINEAR_ADVANCE))
64
        .tag(3).button(LIN_ADVANCE_POS, GET_TEXT_F(MSG_LINEAR_ADVANCE))
65
        .colors(action_btn)
65
        .colors(action_btn)
66
-       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
66
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
67
   }
67
   }
68
 }
68
 }
69
 
69
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp Vedi File

168
   cmd.colors(normal_btn)
168
   cmd.colors(normal_btn)
169
      .font(font_medium)
169
      .font(font_medium)
170
      .colors(has_selection ? normal_btn : action_btn)
170
      .colors(has_selection ? normal_btn : action_btn)
171
-     .tag(back_tag).button(BTN_POS(4,y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BACK))
171
+     .tag(back_tag).button(BTN_POS(4,y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_DONE))
172
      .enabled(has_selection)
172
      .enabled(has_selection)
173
      .colors(has_selection ? action_btn : normal_btn);
173
      .colors(has_selection ? action_btn : normal_btn);
174
 
174
 

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp Vedi File

108
        .colors(normal_btn)
108
        .colors(normal_btn)
109
        .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
109
        .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS))
110
        .colors(action_btn)
110
        .colors(action_btn)
111
-       .tag(1).button (BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BACK));
111
+       .tag(1).button (BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BUTTON_DONE));
112
     #else
112
     #else
113
        .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUNDS))
113
        .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUNDS))
114
        .colors(action_btn)
114
        .colors(action_btn)
115
-       .tag(1).button (BTN_POS(3,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
115
+       .tag(1).button (BTN_POS(3,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
116
     #endif
116
     #endif
117
   }
117
   }
118
 }
118
 }

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp Vedi File

102
        .tag(5).button    (BTN_POS(3,6), BTN_SIZE(2,1), getSoundSelection(PRINTING_FINISHED))
102
        .tag(5).button    (BTN_POS(3,6), BTN_SIZE(2,1), getSoundSelection(PRINTING_FINISHED))
103
        .tag(6).button    (BTN_POS(3,7), BTN_SIZE(2,1), getSoundSelection(PRINTING_FAILED))
103
        .tag(6).button    (BTN_POS(3,7), BTN_SIZE(2,1), getSoundSelection(PRINTING_FAILED))
104
        .colors(action_btn)
104
        .colors(action_btn)
105
-       .tag(1).button    (BTN_POS(1,9), BTN_SIZE(4,1), GET_TEXT_F(MSG_BACK));
105
+       .tag(1).button    (BTN_POS(1,9), BTN_SIZE(4,1), GET_TEXT_F(MSG_BUTTON_DONE));
106
   }
106
   }
107
 }
107
 }
108
 
108
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp Vedi File

96
        .tag(8).button(BLTOUCH_TEST_POS,  GET_TEXT_F(MSG_BLTOUCH_SELFTEST))
96
        .tag(8).button(BLTOUCH_TEST_POS,  GET_TEXT_F(MSG_BLTOUCH_SELFTEST))
97
     #endif
97
     #endif
98
        .colors(action_btn)
98
        .colors(action_btn)
99
-       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
99
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
100
   }
100
   }
101
 }
101
 }
102
 
102
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp Vedi File

95
         .tag(11).button(CUSTOM_MENU_POS, GET_TEXT_F(MSG_CUSTOM_COMMANDS))
95
         .tag(11).button(CUSTOM_MENU_POS, GET_TEXT_F(MSG_CUSTOM_COMMANDS))
96
        #endif
96
        #endif
97
        .colors(action_btn)
97
        .colors(action_btn)
98
-       .tag(1).button(BACK_POS,             GET_TEXT_F(MSG_BACK));
98
+       .tag(1).button(BACK_POS,             GET_TEXT_F(MSG_BUTTON_DONE));
99
   }
99
   }
100
 }
100
 }
101
 
101
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp Vedi File

63
   if (what & FOREGROUND) {
63
   if (what & FOREGROUND) {
64
     cmd.font(Theme::font_medium)
64
     cmd.font(Theme::font_medium)
65
        .colors(action_btn)
65
        .colors(action_btn)
66
-       .tag(1).button(BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BACK));
66
+       .tag(1).button(BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BUTTON_DONE));
67
   }
67
   }
68
 }
68
 }
69
 
69
 

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp Vedi File

92
        .tag(10).button(CASE_LIGHT_POS, GET_TEXT_F(MSG_CASE_LIGHT))
92
        .tag(10).button(CASE_LIGHT_POS, GET_TEXT_F(MSG_CASE_LIGHT))
93
        .tag(11).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
93
        .tag(11).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
94
        .tag(1).colors(action_btn)
94
        .tag(1).colors(action_btn)
95
-             .button(BACK_POS, GET_TEXT_F(MSG_BACK));
95
+             .button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
96
   }
96
   }
97
   #undef GRID_COLS
97
   #undef GRID_COLS
98
   #undef GRID_ROWS
98
   #undef GRID_ROWS

Loading…
Annulla
Salva