Browse Source

Use named styles in draw_menu_item_static

Scott Lahteine 5 years ago
parent
commit
4c16661153

+ 4
- 3
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp View File

965
 
965
 
966
 #if HAS_LCD_MENU
966
 #if HAS_LCD_MENU
967
 
967
 
968
+  #include "../menu/menu.h"
969
+
968
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
970
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
969
 
971
 
970
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
972
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
976
 
978
 
977
   #endif // ADVANCED_PAUSE_FEATURE
979
   #endif // ADVANCED_PAUSE_FEATURE
978
 
980
 
979
-  void draw_menu_item_static(const uint8_t row, PGM_P pstr, const bool center/*=true*/, const bool invert/*=false*/, const char *valstr/*=nullptr*/) {
980
-    UNUSED(invert);
981
+  void draw_menu_item_static(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_CENTER*/, const char * const valstr/*=nullptr*/) {
981
     int8_t n = LCD_WIDTH;
982
     int8_t n = LCD_WIDTH;
982
     lcd_moveto(0, row);
983
     lcd_moveto(0, row);
983
-    if (center && !valstr) {
984
+    if ((style & SS_CENTER) && !valstr) {
984
       int8_t pad = (LCD_WIDTH - utf8_strlen_P(pstr)) / 2;
985
       int8_t pad = (LCD_WIDTH - utf8_strlen_P(pstr)) / 2;
985
       while (--pad >= 0) { lcd_put_wchar(' '); n--; }
986
       while (--pad >= 0) { lcd_put_wchar(' '); n--; }
986
     }
987
     }

+ 5
- 3
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp View File

309
 
309
 
310
 #if HAS_LCD_MENU
310
 #if HAS_LCD_MENU
311
 
311
 
312
+  #include "../menu/menu.h"
313
+
312
   u8g_uint_t row_y1, row_y2;
314
   u8g_uint_t row_y1, row_y2;
313
 
315
 
314
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
316
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
361
   }
363
   }
362
 
364
 
363
   // Draw a static line of text in the same idiom as a menu item
365
   // Draw a static line of text in the same idiom as a menu item
364
-  void draw_menu_item_static(const uint8_t row, PGM_P pstr, const bool center/*=true*/, const bool invert/*=false*/, const char* valstr/*=nullptr*/) {
366
+  void draw_menu_item_static(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_CENTER*/, const char * const valstr/*=nullptr*/) {
365
 
367
 
366
-    if (mark_as_selected(row, invert)) {
368
+    if (mark_as_selected(row, (style & SS_INVERT))) {
367
 
369
 
368
       u8g_uint_t n = LCD_PIXEL_WIDTH; // pixel width of string allowed
370
       u8g_uint_t n = LCD_PIXEL_WIDTH; // pixel width of string allowed
369
 
371
 
370
-      if (center && !valstr) {
372
+      if ((style & SS_CENTER) && !valstr) {
371
         int8_t pad = (LCD_WIDTH - utf8_strlen_P(pstr)) / 2;
373
         int8_t pad = (LCD_WIDTH - utf8_strlen_P(pstr)) / 2;
372
         while (--pad >= 0) { lcd_put_wchar(' '); n--; }
374
         while (--pad >= 0) { lcd_put_wchar(' '); n--; }
373
       }
375
       }

+ 5
- 1
Marlin/src/lcd/menu/menu.h View File

78
   do_select_screen(PSTR(MSG_YES), PSTR(MSG_NO), yesFunc, noFunc, pref, string, suff);
78
   do_select_screen(PSTR(MSG_YES), PSTR(MSG_NO), yesFunc, noFunc, pref, string, suff);
79
 }
79
 }
80
 
80
 
81
+#define SS_LEFT   0x00
82
+#define SS_CENTER 0x01
83
+#define SS_INVERT 0x02
84
+
81
 void draw_edit_screen(PGM_P const pstr, const char* const value=nullptr);
85
 void draw_edit_screen(PGM_P const pstr, const char* const value=nullptr);
82
 void draw_menu_item(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char);
86
 void draw_menu_item(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char);
83
-void draw_menu_item_static(const uint8_t row, PGM_P const pstr, const bool center=true, const bool invert=false, const char *valstr=nullptr);
87
+void draw_menu_item_static(const uint8_t row, PGM_P const pstr, const uint8_t style=SS_CENTER, const char * const valstr=nullptr);
84
 void _draw_menu_item_edit(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm);
88
 void _draw_menu_item_edit(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm);
85
 FORCE_INLINE void draw_menu_item_back(const bool sel, const uint8_t row, PGM_P const pstr) { draw_menu_item(sel, row, pstr, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0]); }
89
 FORCE_INLINE void draw_menu_item_back(const bool sel, const uint8_t row, PGM_P const pstr) { draw_menu_item(sel, row, pstr, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0]); }
86
 FORCE_INLINE void draw_menu_item_edit(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data) { _draw_menu_item_edit(sel, row, pstr, data, false); }
90
 FORCE_INLINE void draw_menu_item_edit(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data) { _draw_menu_item_edit(sel, row, pstr, data, false); }

+ 1
- 1
Marlin/src/lcd/menu/menu_configuration.cpp View File

75
     bar_percent += (int8_t)ui.encoderPosition;
75
     bar_percent += (int8_t)ui.encoderPosition;
76
     LIMIT(bar_percent, 0, 100);
76
     LIMIT(bar_percent, 0, 100);
77
     ui.encoderPosition = 0;
77
     ui.encoderPosition = 0;
78
-    draw_menu_item_static(0, PSTR(MSG_PROGRESS_BAR_TEST), true, true);
78
+    draw_menu_item_static(0, PSTR(MSG_PROGRESS_BAR_TEST), SS_CENTER|SS_INVERT);
79
     lcd_put_int((LCD_WIDTH) / 2 - 2, LCD_HEIGHT - 2, bar_percent); lcd_put_wchar('%');
79
     lcd_put_int((LCD_WIDTH) / 2 - 2, LCD_HEIGHT - 2, bar_percent); lcd_put_wchar('%');
80
     lcd_moveto(0, LCD_HEIGHT - 1); ui.draw_progress_bar(bar_percent);
80
     lcd_moveto(0, LCD_HEIGHT - 1); ui.draw_progress_bar(bar_percent);
81
   }
81
   }

+ 4
- 4
Marlin/src/lcd/menu/menu_filament.cpp View File

79
   _change_filament_temp_mode = mode;
79
   _change_filament_temp_mode = mode;
80
   _change_filament_temp_extruder = extruder;
80
   _change_filament_temp_extruder = extruder;
81
   START_MENU();
81
   START_MENU();
82
-  if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), true, true);
82
+  if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_CENTER|SS_INVERT);
83
   MENU_BACK(MSG_BACK);
83
   MENU_BACK(MSG_BACK);
84
   MENU_ITEM(function, MSG_PREHEAT_1, _lcd_change_filament_temp_1_func);
84
   MENU_ITEM(function, MSG_PREHEAT_1, _lcd_change_filament_temp_1_func);
85
   MENU_ITEM(function, MSG_PREHEAT_2, _lcd_change_filament_temp_2_func);
85
   MENU_ITEM(function, MSG_PREHEAT_2, _lcd_change_filament_temp_2_func);
328
 #define HOTEND_STATUS_ITEM() do { \
328
 #define HOTEND_STATUS_ITEM() do { \
329
   if (_menuLineNr == _thisItemNr) { \
329
   if (_menuLineNr == _thisItemNr) { \
330
     if (ui.should_draw()) { \
330
     if (ui.should_draw()) { \
331
-      draw_menu_item_static(_lcdLineNr, PSTR(MSG_FILAMENT_CHANGE_NOZZLE), false, true); \
331
+      draw_menu_item_static(_lcdLineNr, PSTR(MSG_FILAMENT_CHANGE_NOZZLE), SS_INVERT); \
332
       ui.draw_hotend_status(_lcdLineNr, hotend_status_extruder); \
332
       ui.draw_hotend_status(_lcdLineNr, hotend_status_extruder); \
333
     } \
333
     } \
334
     if (_skipStatic && encoderLine <= _thisItemNr) { \
334
     if (_skipStatic && encoderLine <= _thisItemNr) { \
351
 void menu_pause_option() {
351
 void menu_pause_option() {
352
   START_MENU();
352
   START_MENU();
353
   #if LCD_HEIGHT > 2
353
   #if LCD_HEIGHT > 2
354
-    STATIC_ITEM(MSG_FILAMENT_CHANGE_OPTION_HEADER, true, false);
354
+    STATIC_ITEM(MSG_FILAMENT_CHANGE_OPTION_HEADER);
355
   #endif
355
   #endif
356
   MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_PURGE, lcd_pause_extrude_more);
356
   MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_PURGE, lcd_pause_extrude_more);
357
   #if HAS_FILAMENT_SENSOR
357
   #if HAS_FILAMENT_SENSOR
369
 
369
 
370
 void _lcd_pause_message(PGM_P const msg1, PGM_P const msg2=nullptr, PGM_P const msg3=nullptr) {
370
 void _lcd_pause_message(PGM_P const msg1, PGM_P const msg2=nullptr, PGM_P const msg3=nullptr) {
371
   START_SCREEN();
371
   START_SCREEN();
372
-  STATIC_ITEM_P(pause_header(), true, true);
372
+  STATIC_ITEM_P(pause_header(), SS_CENTER|SS_INVERT);
373
   STATIC_ITEM_P(msg1);
373
   STATIC_ITEM_P(msg1);
374
   if (msg2) STATIC_ITEM_P(msg2);
374
   if (msg2) STATIC_ITEM_P(msg2);
375
   if (msg3 && (LCD_HEIGHT) >= 5) STATIC_ITEM_P(msg3);
375
   if (msg3 && (LCD_HEIGHT) >= 5) STATIC_ITEM_P(msg3);

+ 58
- 58
Marlin/src/lcd/menu/menu_info.cpp View File

34
   #include "game/game.h"
34
   #include "game/game.h"
35
 #endif
35
 #endif
36
 
36
 
37
-#define STATIC_PAIR(MSG, VALUE, CNTR)    do{ strcpy_P(buffer, PSTR(": ")); strcpy(buffer + 2, VALUE); STATIC_ITEM(MSG, CNTR, false, buffer); }while(0)
38
-#define STATIC_PAIR_P(MSG, PVALUE, CNTR) do{ strcpy_P(buffer, PSTR(": ")); strcpy_P(buffer + 2, PSTR(PVALUE)); STATIC_ITEM(MSG, CNTR, false, buffer); }while(0)
37
+#define STATIC_PAIR(MSG, VALUE, STYL)    do{ strcpy_P(buffer, PSTR(": ")); strcpy(buffer + 2, VALUE); STATIC_ITEM(MSG, STYL, buffer); }while(0)
38
+#define STATIC_PAIR_P(MSG, PVALUE, STYL) do{ strcpy_P(buffer, PSTR(": ")); strcpy_P(buffer + 2, PSTR(PVALUE)); STATIC_ITEM(MSG, STYL, buffer); }while(0)
39
 
39
 
40
 #if ENABLED(PRINTCOUNTER)
40
 #if ENABLED(PRINTCOUNTER)
41
 
41
 
55
 
55
 
56
     printStatistics stats = print_job_timer.getStats();
56
     printStatistics stats = print_job_timer.getStats();
57
 
57
 
58
-    START_SCREEN();                                                                                // 12345678901234567890
59
-    STATIC_PAIR(MSG_INFO_PRINT_COUNT, i16tostr3left(stats.totalPrints), false);                    // Print Count: 999
60
-    STATIC_PAIR(MSG_INFO_COMPLETED_PRINTS, i16tostr3left(stats.finishedPrints), false);            // Completed  : 666
58
+    START_SCREEN();                                                                           // 12345678901234567890
59
+    STATIC_PAIR(MSG_INFO_PRINT_COUNT, i16tostr3left(stats.totalPrints), SS_LEFT);             // Print Count: 999
60
+    STATIC_PAIR(MSG_INFO_COMPLETED_PRINTS, i16tostr3left(stats.finishedPrints), SS_LEFT);     // Completed  : 666
61
 
61
 
62
-    STATIC_PAIR_P(MSG_INFO_PRINT_TIME, "", false);                                                 // Total print Time:
63
-    STATIC_ITEM("> ", false, false, duration_t(stats.printTime).toString(buffer));                 // > 99y 364d 23h 59m 59s
62
+    STATIC_PAIR_P(MSG_INFO_PRINT_TIME, "", SS_LEFT);                                          // Total print Time:
63
+    STATIC_ITEM("> ", SS_LEFT, duration_t(stats.printTime).toString(buffer));                 // > 99y 364d 23h 59m 59s
64
 
64
 
65
-    STATIC_PAIR_P(MSG_INFO_PRINT_LONGEST, "", false);                                              // Longest job time:
66
-    STATIC_ITEM("> ", false, false, duration_t(stats.longestPrint).toString(buffer));              // > 99y 364d 23h 59m 59s
65
+    STATIC_PAIR_P(MSG_INFO_PRINT_LONGEST, "", SS_LEFT);                                       // Longest job time:
66
+    STATIC_ITEM("> ", SS_LEFT, duration_t(stats.longestPrint).toString(buffer));              // > 99y 364d 23h 59m 59s
67
 
67
 
68
-    STATIC_PAIR_P(MSG_INFO_PRINT_FILAMENT, "", false);                                             // Extruded total:
68
+    STATIC_PAIR_P(MSG_INFO_PRINT_FILAMENT, "", SS_LEFT);                                      // Extruded total:
69
     sprintf_P(buffer, PSTR("%ld.%im"), long(stats.filamentUsed / 1000), int16_t(stats.filamentUsed / 100) % 10);
69
     sprintf_P(buffer, PSTR("%ld.%im"), long(stats.filamentUsed / 1000), int16_t(stats.filamentUsed / 100) % 10);
70
-    STATIC_ITEM("> ", false, false, buffer);                                                       // > 125m
70
+    STATIC_ITEM("> ", SS_LEFT, buffer);                                                       // > 125m
71
 
71
 
72
     #if SERVICE_INTERVAL_1 > 0
72
     #if SERVICE_INTERVAL_1 > 0
73
-      STATIC_ITEM(SERVICE_NAME_1 MSG_SERVICE_IN, false, false);                                    // Service X in:
74
-      STATIC_ITEM("> ", false, false, duration_t(stats.nextService1).toString(buffer));            // > 7d 12h 11m 10s
73
+      STATIC_ITEM(SERVICE_NAME_1 MSG_SERVICE_IN, SS_LEFT);                                    // Service X in:
74
+      STATIC_ITEM("> ", SS_LEFT, duration_t(stats.nextService1).toString(buffer));            // > 7d 12h 11m 10s
75
     #endif
75
     #endif
76
 
76
 
77
     #if SERVICE_INTERVAL_2 > 0
77
     #if SERVICE_INTERVAL_2 > 0
78
-      STATIC_ITEM(SERVICE_NAME_2 MSG_SERVICE_IN, false, false);
79
-      STATIC_ITEM("> ", false, false, duration_t(stats.nextService2).toString(buffer));
78
+      STATIC_ITEM(SERVICE_NAME_2 MSG_SERVICE_IN, SS_LEFT);
79
+      STATIC_ITEM("> ", SS_LEFT, duration_t(stats.nextService2).toString(buffer));
80
     #endif
80
     #endif
81
 
81
 
82
     #if SERVICE_INTERVAL_3 > 0
82
     #if SERVICE_INTERVAL_3 > 0
83
-      STATIC_ITEM(SERVICE_NAME_3 MSG_SERVICE_IN, false, false);
84
-      STATIC_ITEM("> ", false, false, duration_t(stats.nextService3).toString(buffer));
83
+      STATIC_ITEM(SERVICE_NAME_3 MSG_SERVICE_IN, SS_LEFT);
84
+      STATIC_ITEM("> ", SS_LEFT, duration_t(stats.nextService3).toString(buffer));
85
     #endif
85
     #endif
86
 
86
 
87
     END_SCREEN();
87
     END_SCREEN();
105
   #if EXTRUDERS
105
   #if EXTRUDERS
106
     #define THERMISTOR_ID TEMP_SENSOR_0
106
     #define THERMISTOR_ID TEMP_SENSOR_0
107
     #include "../thermistornames.h"
107
     #include "../thermistornames.h"
108
-    STATIC_ITEM("T0: " THERMISTOR_NAME, false, true);
109
-    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_0_MINTEMP), false);
110
-    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_0_MAXTEMP), false);
108
+    STATIC_ITEM("T0: " THERMISTOR_NAME, SS_INVERT);
109
+    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_0_MINTEMP), SS_LEFT);
110
+    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_0_MAXTEMP), SS_LEFT);
111
   #endif
111
   #endif
112
 
112
 
113
   #if TEMP_SENSOR_1 != 0
113
   #if TEMP_SENSOR_1 != 0
114
     #undef THERMISTOR_ID
114
     #undef THERMISTOR_ID
115
     #define THERMISTOR_ID TEMP_SENSOR_1
115
     #define THERMISTOR_ID TEMP_SENSOR_1
116
     #include "../thermistornames.h"
116
     #include "../thermistornames.h"
117
-    STATIC_ITEM("T1: " THERMISTOR_NAME, false, true);
118
-    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_1_MINTEMP), false);
119
-    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_1_MAXTEMP), false);
117
+    STATIC_ITEM("T1: " THERMISTOR_NAME, SS_INVERT);
118
+    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_1_MINTEMP), SS_LEFT);
119
+    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_1_MAXTEMP), SS_LEFT);
120
   #endif
120
   #endif
121
 
121
 
122
   #if TEMP_SENSOR_2 != 0
122
   #if TEMP_SENSOR_2 != 0
123
     #undef THERMISTOR_ID
123
     #undef THERMISTOR_ID
124
     #define THERMISTOR_ID TEMP_SENSOR_2
124
     #define THERMISTOR_ID TEMP_SENSOR_2
125
     #include "../thermistornames.h"
125
     #include "../thermistornames.h"
126
-    STATIC_ITEM("T2: " THERMISTOR_NAME, false, true);
127
-    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_2_MINTEMP), false);
128
-    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_2_MAXTEMP), false);
126
+    STATIC_ITEM("T2: " THERMISTOR_NAME, SS_INVERT);
127
+    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_2_MINTEMP), SS_LEFT);
128
+    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_2_MAXTEMP), SS_LEFT);
129
   #endif
129
   #endif
130
 
130
 
131
   #if TEMP_SENSOR_3 != 0
131
   #if TEMP_SENSOR_3 != 0
132
     #undef THERMISTOR_ID
132
     #undef THERMISTOR_ID
133
     #define THERMISTOR_ID TEMP_SENSOR_3
133
     #define THERMISTOR_ID TEMP_SENSOR_3
134
     #include "../thermistornames.h"
134
     #include "../thermistornames.h"
135
-    STATIC_ITEM("T3: " THERMISTOR_NAME, false, true);
136
-    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_3_MINTEMP), false);
137
-    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_3_MAXTEMP), false);
135
+    STATIC_ITEM("T3: " THERMISTOR_NAME, SS_INVERT);
136
+    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_3_MINTEMP), SS_LEFT);
137
+    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_3_MAXTEMP), SS_LEFT);
138
   #endif
138
   #endif
139
 
139
 
140
   #if TEMP_SENSOR_4 != 0
140
   #if TEMP_SENSOR_4 != 0
141
     #undef THERMISTOR_ID
141
     #undef THERMISTOR_ID
142
     #define THERMISTOR_ID TEMP_SENSOR_4
142
     #define THERMISTOR_ID TEMP_SENSOR_4
143
     #include "../thermistornames.h"
143
     #include "../thermistornames.h"
144
-    STATIC_ITEM("T4: " THERMISTOR_NAME, false, true);
145
-    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_4_MINTEMP), false);
146
-    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_4_MAXTEMP), false);
144
+    STATIC_ITEM("T4: " THERMISTOR_NAME, SS_INVERT);
145
+    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_4_MINTEMP), SS_LEFT);
146
+    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_4_MAXTEMP), SS_LEFT);
147
   #endif
147
   #endif
148
 
148
 
149
   #if TEMP_SENSOR_5 != 0
149
   #if TEMP_SENSOR_5 != 0
150
     #undef THERMISTOR_ID
150
     #undef THERMISTOR_ID
151
     #define THERMISTOR_ID TEMP_SENSOR_5
151
     #define THERMISTOR_ID TEMP_SENSOR_5
152
     #include "../thermistornames.h"
152
     #include "../thermistornames.h"
153
-    STATIC_ITEM("T5: " THERMISTOR_NAME, false, true);
154
-    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_5_MINTEMP), false);
155
-    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_5_MAXTEMP), false);
153
+    STATIC_ITEM("T5: " THERMISTOR_NAME, SS_INVERT);
154
+    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_5_MINTEMP), SS_LEFT);
155
+    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_5_MAXTEMP), SS_LEFT);
156
   #endif
156
   #endif
157
 
157
 
158
   #if HAS_HEATED_BED
158
   #if HAS_HEATED_BED
159
     #undef THERMISTOR_ID
159
     #undef THERMISTOR_ID
160
     #define THERMISTOR_ID TEMP_SENSOR_BED
160
     #define THERMISTOR_ID TEMP_SENSOR_BED
161
     #include "../thermistornames.h"
161
     #include "../thermistornames.h"
162
-    STATIC_ITEM("TBed:" THERMISTOR_NAME, false, true);
163
-    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(BED_MINTEMP), false);
164
-    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(BED_MAXTEMP), false);
162
+    STATIC_ITEM("TBed:" THERMISTOR_NAME, SS_INVERT);
163
+    STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(BED_MINTEMP), SS_LEFT);
164
+    STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(BED_MAXTEMP), SS_LEFT);
165
   #endif
165
   #endif
166
   END_SCREEN();
166
   END_SCREEN();
167
 }
167
 }
179
   char buffer[21];  // for STATIC_PAIR_P
179
   char buffer[21];  // for STATIC_PAIR_P
180
 
180
 
181
   START_SCREEN();
181
   START_SCREEN();
182
-  STATIC_ITEM(BOARD_INFO_NAME, true, true);                       // MyPrinterController
182
+  STATIC_ITEM(BOARD_INFO_NAME, SS_CENTER|SS_INVERT);                // MyPrinterController
183
   #ifdef BOARD_WEBSITE_URL
183
   #ifdef BOARD_WEBSITE_URL
184
-    STATIC_ITEM(BOARD_WEBSITE_URL, false, false);                 // www.my3dprinter.com
184
+    STATIC_ITEM(BOARD_WEBSITE_URL, SS_LEFT);                        // www.my3dprinter.com
185
   #endif
185
   #endif
186
-  STATIC_PAIR_P(MSG_INFO_BAUDRATE, STRINGIFY(BAUDRATE), true);    // Baud: 250000
187
-  STATIC_PAIR_P(MSG_INFO_PROTOCOL, PROTOCOL_VERSION, true);       // Protocol: 1.0
188
-  STATIC_PAIR_P(MSG_INFO_PSU,      PSU_NAME, true);
186
+  STATIC_PAIR_P(MSG_INFO_BAUDRATE, STRINGIFY(BAUDRATE), SS_CENTER); // Baud: 250000
187
+  STATIC_PAIR_P(MSG_INFO_PROTOCOL, PROTOCOL_VERSION, SS_CENTER);    // Protocol: 1.0
188
+  STATIC_PAIR_P(MSG_INFO_PSU,      PSU_NAME, SS_CENTER);
189
   END_SCREEN();
189
   END_SCREEN();
190
 }
190
 }
191
 
191
 
215
       #endif
215
       #endif
216
     );
216
     );
217
     START_SCREEN();
217
     START_SCREEN();
218
-    STATIC_ITEM(MSG_MARLIN, true, true);                             // Marlin
219
-    STATIC_ITEM(SHORT_BUILD_VERSION, true);                          // x.x.x-Branch
220
-    STATIC_ITEM(STRING_DISTRIBUTION_DATE, true);                     // YYYY-MM-DD HH:MM
221
-    STATIC_ITEM(MACHINE_NAME, true);                                 // My3DPrinter
222
-    STATIC_ITEM(WEBSITE_URL, true);                                  // www.my3dprinter.com
223
-    STATIC_ITEM(MSG_INFO_EXTRUDERS ": " STRINGIFY(EXTRUDERS), true); // Extruders: 2
218
+    STATIC_ITEM(MSG_MARLIN, SS_CENTER|SS_INVERT);               // Marlin
219
+    STATIC_ITEM(SHORT_BUILD_VERSION);                           // x.x.x-Branch
220
+    STATIC_ITEM(STRING_DISTRIBUTION_DATE);                      // YYYY-MM-DD HH:MM
221
+    STATIC_ITEM(MACHINE_NAME);                                  // My3DPrinter
222
+    STATIC_ITEM(WEBSITE_URL);                                   // www.my3dprinter.com
223
+    STATIC_ITEM(MSG_INFO_EXTRUDERS ": " STRINGIFY(EXTRUDERS));  // Extruders: 2
224
     #if ENABLED(AUTO_BED_LEVELING_3POINT)
224
     #if ENABLED(AUTO_BED_LEVELING_3POINT)
225
-      STATIC_ITEM(MSG_3POINT_LEVELING, true);                        // 3-Point Leveling
225
+      STATIC_ITEM(MSG_3POINT_LEVELING);                         // 3-Point Leveling
226
     #elif ENABLED(AUTO_BED_LEVELING_LINEAR)
226
     #elif ENABLED(AUTO_BED_LEVELING_LINEAR)
227
-      STATIC_ITEM(MSG_LINEAR_LEVELING, true);                        // Linear Leveling
227
+      STATIC_ITEM(MSG_LINEAR_LEVELING);                         // Linear Leveling
228
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
228
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
229
-      STATIC_ITEM(MSG_BILINEAR_LEVELING, true);                      // Bi-linear Leveling
229
+      STATIC_ITEM(MSG_BILINEAR_LEVELING);                       // Bi-linear Leveling
230
     #elif ENABLED(AUTO_BED_LEVELING_UBL)
230
     #elif ENABLED(AUTO_BED_LEVELING_UBL)
231
-      STATIC_ITEM(MSG_UBL_LEVELING, true);                           // Unified Bed Leveling
231
+      STATIC_ITEM(MSG_UBL_LEVELING);                            // Unified Bed Leveling
232
     #elif ENABLED(MESH_BED_LEVELING)
232
     #elif ENABLED(MESH_BED_LEVELING)
233
-      STATIC_ITEM(MSG_MESH_LEVELING, true);                          // Mesh Leveling
233
+      STATIC_ITEM(MSG_MESH_LEVELING);                           // Mesh Leveling
234
     #endif
234
     #endif
235
     END_SCREEN();
235
     END_SCREEN();
236
   }
236
   }
252
       #endif
252
       #endif
253
     ));
253
     ));
254
   #else
254
   #else
255
-    MENU_ITEM(submenu, MSG_INFO_PRINTER_MENU, menu_info_printer);        // Printer Info >
256
-    MENU_ITEM(submenu, MSG_INFO_BOARD_MENU, menu_info_board);            // Board Info >
255
+    MENU_ITEM(submenu, MSG_INFO_PRINTER_MENU, menu_info_printer);           // Printer Info >
256
+    MENU_ITEM(submenu, MSG_INFO_BOARD_MENU, menu_info_board);               // Board Info >
257
     #if EXTRUDERS
257
     #if EXTRUDERS
258
-      MENU_ITEM(submenu, MSG_INFO_THERMISTOR_MENU, menu_info_thermistors); // Thermistors >
258
+      MENU_ITEM(submenu, MSG_INFO_THERMISTOR_MENU, menu_info_thermistors);  // Thermistors >
259
     #endif
259
     #endif
260
   #endif
260
   #endif
261
 
261
 
262
   #if ENABLED(PRINTCOUNTER)
262
   #if ENABLED(PRINTCOUNTER)
263
-    MENU_ITEM(submenu, MSG_INFO_STATS_MENU, menu_info_stats);          // Printer Stats >
263
+    MENU_ITEM(submenu, MSG_INFO_STATS_MENU, menu_info_stats);               // Printer Stats >
264
   #endif
264
   #endif
265
 
265
 
266
   #if HAS_GAMES
266
   #if HAS_GAMES

+ 1
- 1
Marlin/src/lcd/menu/menu_led.cpp View File

36
   void menu_led_presets() {
36
   void menu_led_presets() {
37
     START_MENU();
37
     START_MENU();
38
     #if LCD_HEIGHT > 2
38
     #if LCD_HEIGHT > 2
39
-      STATIC_ITEM(MSG_LED_PRESETS, true, true);
39
+      STATIC_ITEM(MSG_LED_PRESETS, SS_CENTER|SS_INVERT);
40
     #endif
40
     #endif
41
     MENU_BACK(MSG_LED_CONTROL);
41
     MENU_BACK(MSG_LED_CONTROL);
42
     MENU_ITEM(function, MSG_SET_LEDS_WHITE, leds.set_white);
42
     MENU_ITEM(function, MSG_SET_LEDS_WHITE, leds.set_white);

+ 2
- 2
Marlin/src/lcd/menu/menu_mmu2.cpp View File

164
 void menu_mmu2_choose_filament() {
164
 void menu_mmu2_choose_filament() {
165
   START_MENU();
165
   START_MENU();
166
   #if LCD_HEIGHT > 2
166
   #if LCD_HEIGHT > 2
167
-    STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, true, true);
167
+    STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, SS_CENTER|SS_INVERT);
168
   #endif
168
   #endif
169
   MENU_ITEM(function, MSG_MMU2_FILAMENT0, action_mmu2_choose0);
169
   MENU_ITEM(function, MSG_MMU2_FILAMENT0, action_mmu2_choose0);
170
   MENU_ITEM(function, MSG_MMU2_FILAMENT1, action_mmu2_choose1);
170
   MENU_ITEM(function, MSG_MMU2_FILAMENT1, action_mmu2_choose1);
187
   currentTool = mmu2.get_current_tool();
187
   currentTool = mmu2.get_current_tool();
188
   START_MENU();
188
   START_MENU();
189
   #if LCD_HEIGHT > 2
189
   #if LCD_HEIGHT > 2
190
-    STATIC_ITEM(MSG_MMU2_FILAMENT_CHANGE_HEADER, true, true);
190
+    STATIC_ITEM(MSG_MMU2_FILAMENT_CHANGE_HEADER, SS_CENTER|SS_INVERT);
191
   #endif
191
   #endif
192
   MENU_ITEM(function, MSG_MMU2_RESUME, action_mmu2_M600_resume);
192
   MENU_ITEM(function, MSG_MMU2_RESUME, action_mmu2_M600_resume);
193
   MENU_ITEM(function, MSG_MMU2_UNLOAD_FILAMENT, action_mmu2_M600_unload_filament);
193
   MENU_ITEM(function, MSG_MMU2_UNLOAD_FILAMENT, action_mmu2_M600_unload_filament);

+ 4
- 4
Marlin/src/lcd/menu/menu_motion.cpp View File

262
   START_MENU();
262
   START_MENU();
263
   if (LCD_HEIGHT >= 4) {
263
   if (LCD_HEIGHT >= 4) {
264
     switch (axis) {
264
     switch (axis) {
265
-      case X_AXIS: STATIC_ITEM(MSG_MOVE_X, true, true); break;
266
-      case Y_AXIS: STATIC_ITEM(MSG_MOVE_Y, true, true); break;
267
-      case Z_AXIS: STATIC_ITEM(MSG_MOVE_Z, true, true); break;
265
+      case X_AXIS: STATIC_ITEM(MSG_MOVE_X, SS_CENTER|SS_INVERT); break;
266
+      case Y_AXIS: STATIC_ITEM(MSG_MOVE_Y, SS_CENTER|SS_INVERT); break;
267
+      case Z_AXIS: STATIC_ITEM(MSG_MOVE_Z, SS_CENTER|SS_INVERT); break;
268
       default:
268
       default:
269
         #if ENABLED(MANUAL_E_MOVES_RELATIVE)
269
         #if ENABLED(MANUAL_E_MOVES_RELATIVE)
270
           manual_move_e_origin = current_position[E_AXIS];
270
           manual_move_e_origin = current_position[E_AXIS];
271
         #endif
271
         #endif
272
-        STATIC_ITEM(MSG_MOVE_E, true, true);
272
+        STATIC_ITEM(MSG_MOVE_E, SS_CENTER|SS_INVERT);
273
         break;
273
         break;
274
     }
274
     }
275
   }
275
   }

Loading…
Cancel
Save