Browse Source

Tweak FTDI spacing

Scott Lahteine 4 years ago
parent
commit
34b6bca006
20 changed files with 151 additions and 151 deletions
  1. 16
    16
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
  2. 2
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
  3. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp
  4. 14
    14
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
  5. 9
    9
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
  6. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
  7. 7
    7
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
  8. 11
    11
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
  9. 8
    8
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
  10. 7
    7
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
  11. 2
    2
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
  12. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
  13. 18
    18
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
  14. 4
    4
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
  15. 1
    1
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
  16. 6
    6
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
  17. 10
    10
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
  18. 11
    11
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
  19. 13
    13
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
  20. 9
    9
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp

+ 16
- 16
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp View File

@@ -90,29 +90,29 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
90 90
     cmd.colors(normal_btn)
91 91
        .font(Theme::font_medium)
92 92
       .enabled(ENABLED(HAS_BED_PROBE))
93
-      .tag(2) .button( ZPROBE_ZOFFSET_POS,     GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
93
+      .tag(2) .button(ZPROBE_ZOFFSET_POS,     GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
94 94
       .enabled(ENABLED(CASE_LIGHT_ENABLE))
95
-      .tag(16).button( CASE_LIGHT_POS,         GET_TEXT_F(MSG_CASE_LIGHT))
96
-      .tag(3) .button( STEPS_PER_MM_POS,       GET_TEXT_F(MSG_STEPS_PER_MM))
95
+      .tag(16).button(CASE_LIGHT_POS,         GET_TEXT_F(MSG_CASE_LIGHT))
96
+      .tag(3) .button(STEPS_PER_MM_POS,       GET_TEXT_F(MSG_STEPS_PER_MM))
97 97
       .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
98
-      .tag(13).button( TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
98
+      .tag(13).button(TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
99 99
       .enabled(ENABLED(SENSORLESS_HOMING))
100
-      .tag(14).button( TMC_HOMING_THRS_POS,    GET_TEXT_F(MSG_TMC_HOMING_THRS))
100
+      .tag(14).button(TMC_HOMING_THRS_POS,    GET_TEXT_F(MSG_TMC_HOMING_THRS))
101 101
       .enabled(ENABLED(HAS_MULTI_HOTEND))
102
-      .tag(4) .button( OFFSETS_POS,            GET_TEXT_F(MSG_OFFSETS_MENU))
102
+      .tag(4) .button(OFFSETS_POS,            GET_TEXT_F(MSG_OFFSETS_MENU))
103 103
       .enabled(EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR))
104
-      .tag(11).button( FILAMENT_POS,           GET_TEXT_F(MSG_FILAMENT))
105
-      .tag(12).button( ENDSTOPS_POS,           GET_TEXT_F(MSG_LCD_ENDSTOPS))
106
-      .tag(15).button( DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
107
-      .tag(9) .button( INTERFACE_POS,          GET_TEXT_F(MSG_INTERFACE))
108
-      .tag(10).button( RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
109
-      .tag(5) .button( VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
110
-      .tag(6) .button( ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
111
-      .tag(7) .button( JERK_POS,               GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
104
+      .tag(11).button(FILAMENT_POS,           GET_TEXT_F(MSG_FILAMENT))
105
+      .tag(12).button(ENDSTOPS_POS,           GET_TEXT_F(MSG_LCD_ENDSTOPS))
106
+      .tag(15).button(DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
107
+      .tag(9) .button(INTERFACE_POS,          GET_TEXT_F(MSG_INTERFACE))
108
+      .tag(10).button(RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
109
+      .tag(5) .button(VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
110
+      .tag(6) .button(ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
111
+      .tag(7) .button(JERK_POS,               GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
112 112
       .enabled(ENABLED(BACKLASH_GCODE))
113
-      .tag(8).button( BACKLASH_POS,            GET_TEXT_F(MSG_BACKLASH))
113
+      .tag(8).button(BACKLASH_POS,            GET_TEXT_F(MSG_BACKLASH))
114 114
       .colors(action_btn)
115
-      .tag(1).button( BACK_POS,                GET_TEXT_F(MSG_BACK));
115
+      .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BACK));
116 116
   }
117 117
 }
118 118
 

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp View File

@@ -219,7 +219,7 @@ void BaseNumericAdjustmentScreen::widgets_t::adjuster_sram_val(uint8_t tag, prog
219 219
        .font(font_small)
220 220
        .text( BTN_POS(1,_line), BTN_SIZE(4,1), label);
221 221
     _button_style(cmd, TEXT_AREA);
222
-    cmd.fgcolor(_color).button( BTN_POS(5,_line), BTN_SIZE(5,1), F(""), OPT_FLAT);
222
+    cmd.fgcolor(_color).button(BTN_POS(5,_line), BTN_SIZE(5,1), F(""), OPT_FLAT);
223 223
   }
224 224
 
225 225
   cmd.font(font_medium);
@@ -282,7 +282,7 @@ void BaseNumericAdjustmentScreen::widgets_t::text_field(uint8_t tag, progmem_str
282 282
     _button_style(cmd, TEXT_AREA);
283 283
     cmd.fgcolor(_color)
284 284
        .tag(tag)
285
-       .button( BTN_POS(5,_line), BTN_SIZE(9,1), F(""), OPT_FLAT);
285
+       .button(BTN_POS(5,_line), BTN_SIZE(9,1), F(""), OPT_FLAT);
286 286
   }
287 287
 
288 288
   if (_what & FOREGROUND) {

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp View File

@@ -250,7 +250,7 @@ void BedMeshScreen::drawHighlightedPointValue() {
250 250
      .text(Z_LABEL_POS, GET_TEXT_F(MSG_MESH_EDIT_Z))
251 251
      .text(Z_VALUE_POS, str)
252 252
      .colors(action_btn)
253
-     .tag(1).button( OKAY_POS, GET_TEXT_F(MSG_BUTTON_OKAY))
253
+     .tag(1).button(OKAY_POS, GET_TEXT_F(MSG_BUTTON_OKAY))
254 254
      .tag(0);
255 255
 
256 256
   switch (screen_data.BedMeshScreen.message) {

+ 14
- 14
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp View File

@@ -43,50 +43,50 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
43 43
     #define GRID_ROWS 9
44 44
     #define GRID_COLS 2
45 45
 
46
-      .tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
46
+      .tag(2) .button(BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
47 47
       .enabled(
48 48
         #if HAS_TRINAMIC_CONFIG
49 49
           1
50 50
         #endif
51 51
       )
52
-      .tag(3) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
52
+      .tag(3) .button(BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
53 53
       .enabled(
54 54
         #if HAS_TRINAMIC_CONFIG
55 55
           1
56 56
         #endif
57 57
       )
58
-      .tag(4) .button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
59
-      .tag(5) .button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
58
+      .tag(4) .button(BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
59
+      .tag(5) .button(BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
60 60
       .enabled(
61 61
         #if HAS_MULTI_HOTEND
62 62
           1
63 63
         #endif
64 64
       )
65
-      .tag(6) .button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_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))
69
-      .tag(8) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
70
-      .tag(9) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
68
+      .tag(7) .button(BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
69
+      .tag(8) .button(BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
70
+      .tag(9) .button(BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
71 71
       #if HAS_JUNCTION_DEVIATION
72
-        .tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
72
+        .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
73 73
       #else
74
-        .tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
74
+        .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
75 75
       #endif
76 76
       .enabled(
77 77
         #if ENABLED(BACKLASH_GCODE)
78 78
           1
79 79
         #endif
80 80
       )
81
-      .tag(11) .button( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
81
+      .tag(11) .button(BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
82 82
       .enabled(
83 83
         #if ENABLED(LIN_ADVANCE)
84 84
           1
85 85
         #endif
86 86
       )
87
-      .tag(12) .button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
88
-      .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
89
-      .tag(14) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
87
+      .tag(12) .button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
88
+      .tag(13) .button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
89
+      .tag(14) .button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
90 90
       .colors(action_btn)
91 91
       .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
92 92
     #undef GRID_COLS

+ 9
- 9
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp View File

@@ -46,16 +46,16 @@ void MainMenu::onRedraw(draw_mode_t what) {
46 46
        .font(font_large).text( BTN_POS(1,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_MAIN))
47 47
        .colors(normal_btn)
48 48
        .font(font_medium)
49
-       .tag(2).button( BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_MOVE_TO_HOME))
50
-       .tag(3).button( BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_RAISE_PLUNGER))
51
-       .tag(4).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
52
-       .tag(5).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS))
53
-       .tag(6).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BED_TEMPERATURE))
54
-       .tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
55
-       .tag(8).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
56
-       .tag(9).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
49
+       .tag(2).button(BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_MOVE_TO_HOME))
50
+       .tag(3).button(BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_RAISE_PLUNGER))
51
+       .tag(4).button(BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
52
+       .tag(5).button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS))
53
+       .tag(6).button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BED_TEMPERATURE))
54
+       .tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
55
+       .tag(8).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS))
56
+       .tag(9).button(BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU))
57 57
        .colors(action_btn)
58
-       .tag(1).button( BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
58
+       .tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
59 59
   }
60 60
 
61 61
   #undef GRID_COLS

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp View File

@@ -81,7 +81,7 @@ void BioPrintingDialogBox::draw_interaction_buttons(draw_mode_t what) {
81 81
        .enabled(isPrinting() ? TERN0(SDSUPPORT, isPrintingFromMedia()) : 1)
82 82
        .tag(3)
83 83
        .colors(isPrinting() ? normal_btn : action_btn)
84
-       .button( BTN_POS(2,9), BTN_SIZE(1,1), isPrinting() ? F("Cancel") : F("Back"));
84
+       .button(BTN_POS(2,9), BTN_SIZE(1,1), isPrinting() ? F("Cancel") : F("Back"));
85 85
   }
86 86
 }
87 87
 

+ 7
- 7
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp View File

@@ -48,14 +48,14 @@ void TuneMenu::onRedraw(draw_mode_t what) {
48 48
     CommandProcessor cmd;
49 49
     cmd.colors(normal_btn)
50 50
        .font(font_medium)
51
-       .enabled( isPrinting()).tag(2).button( BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_PRINT_SPEED))
52
-                              .tag(3).button( BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_BED_TEMPERATURE))
51
+       .enabled( isPrinting()).tag(2).button(BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_PRINT_SPEED))
52
+                              .tag(3).button(BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_BED_TEMPERATURE))
53 53
        .enabled(TERN_(BABYSTEPPING, true))
54
-                              .tag(4).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_NUDGE_NOZZLE))
55
-       .enabled(!isPrinting()).tag(5).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_MOVE_TO_HOME))
56
-       .enabled(!isPrinting()).tag(6).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_RAISE_PLUNGER))
57
-       .enabled(!isPrinting()).tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
58
-       .colors(action_btn)    .tag(1).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
54
+                              .tag(4).button(BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_NUDGE_NOZZLE))
55
+       .enabled(!isPrinting()).tag(5).button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_MOVE_TO_HOME))
56
+       .enabled(!isPrinting()).tag(6).button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_RAISE_PLUNGER))
57
+       .enabled(!isPrinting()).tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
58
+       .colors(action_btn)    .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
59 59
   }
60 60
   #undef GRID_COLS
61 61
   #undef GRID_ROWS

+ 11
- 11
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp View File

@@ -56,22 +56,22 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
56 56
     CommandProcessor cmd;
57 57
     cmd.colors(normal_btn)
58 58
        .font(Theme::font_medium)
59
-      .tag(2) .button( STEPS_PER_MM_POS,       GET_TEXT_F(MSG_STEPS_PER_MM))
59
+      .tag(2) .button(STEPS_PER_MM_POS,       GET_TEXT_F(MSG_STEPS_PER_MM))
60 60
       .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
61
-      .tag(3) .button( TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
61
+      .tag(3) .button(TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
62 62
       .enabled(ENABLED(LIN_ADVANCE))
63 63
       .tag(4) .button(LIN_ADVANCE_POS,         GET_TEXT_F(MSG_LINEAR_ADVANCE))
64
-      .tag(5) .button( VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
65
-      .tag(6) .button( ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
66
-      .tag(7) .button( JERK_POS,               GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
67
-      .tag(8) .button( ENDSTOPS_POS,           GET_TEXT_F(MSG_LCD_ENDSTOPS))
68
-      .tag(9) .button( INTERFACE_POS,          GET_TEXT_F(MSG_INTERFACE))
69
-      .tag(10).button( DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
64
+      .tag(5) .button(VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
65
+      .tag(6) .button(ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
66
+      .tag(7) .button(JERK_POS,               GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
67
+      .tag(8) .button(ENDSTOPS_POS,           GET_TEXT_F(MSG_LCD_ENDSTOPS))
68
+      .tag(9) .button(INTERFACE_POS,          GET_TEXT_F(MSG_INTERFACE))
69
+      .tag(10).button(DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
70 70
       .enabled(ENABLED(CASE_LIGHT_ENABLE))
71
-      .tag(11).button( CASE_LIGHT_POS,         GET_TEXT_F(MSG_CASE_LIGHT))
72
-      .tag(12).button( RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
71
+      .tag(11).button(CASE_LIGHT_POS,         GET_TEXT_F(MSG_CASE_LIGHT))
72
+      .tag(12).button(RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
73 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_BACK));
75 75
   }
76 76
 }
77 77
 

+ 8
- 8
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp View File

@@ -53,16 +53,16 @@ void MainMenu::onRedraw(draw_mode_t what) {
53 53
     CommandProcessor cmd;
54 54
     cmd.colors(normal_btn)
55 55
        .font(Theme::font_medium)
56
-       .tag(2).button( MOVE_XYZ_POS,          GET_TEXT_F(MSG_XYZ_MOVE))
57
-       .tag(3).button( TEMPERATURE_POS,       GET_TEXT_F(MSG_TEMPERATURE))
56
+       .tag(2).button(MOVE_XYZ_POS,          GET_TEXT_F(MSG_XYZ_MOVE))
57
+       .tag(3).button(TEMPERATURE_POS,       GET_TEXT_F(MSG_TEMPERATURE))
58 58
        .enabled(BOTH(HAS_LEVELING, HAS_BED_PROBE))
59
-       .tag(4).button( ZPROBE_ZOFFSET_POS,    GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
60
-       .tag(5).button( MOVE_E_POS,            GET_TEXT_F(MSG_E_MOVE))
61
-       .tag(6).button( SPEED_POS,             GET_TEXT_F(MSG_PRINT_SPEED))
62
-       .tag(7).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
63
-       .tag(8).button( ABOUT_PRINTER_POS,     GET_TEXT_F(MSG_INFO_MENU))
59
+       .tag(4).button(ZPROBE_ZOFFSET_POS,    GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
60
+       .tag(5).button(MOVE_E_POS,            GET_TEXT_F(MSG_E_MOVE))
61
+       .tag(6).button(SPEED_POS,             GET_TEXT_F(MSG_PRINT_SPEED))
62
+       .tag(7).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
63
+       .tag(8).button(ABOUT_PRINTER_POS,     GET_TEXT_F(MSG_INFO_MENU))
64 64
        .colors(action_btn)
65
-       .tag(1).button( BACK_POS,              GET_TEXT_F(MSG_BACK));
65
+       .tag(1).button(BACK_POS,              GET_TEXT_F(MSG_BACK));
66 66
   }
67 67
 }
68 68
 

+ 7
- 7
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp View File

@@ -53,16 +53,16 @@ void PreheatMenu::onRedraw(draw_mode_t what) {
53 53
     CommandProcessor cmd;
54 54
     cmd.font(Theme::font_medium)
55 55
        .colors(normal_btn)
56
-       .tag(2).button( BTN_POS(1,2), w, h, F("Dark Chocolate"))
57
-       .tag(3).button( BTN_POS(1,3), w, h, F("Milk Chocolate"))
58
-       .tag(4).button( BTN_POS(1,4), w, h, F("White Chocolate"));
56
+       .tag(2).button(BTN_POS(1,2), w, h, F("Dark Chocolate"))
57
+       .tag(3).button(BTN_POS(1,3), w, h, F("Milk Chocolate"))
58
+       .tag(4).button(BTN_POS(1,4), w, h, F("White Chocolate"));
59 59
     if (has_extra_heater()) {
60
-        cmd.tag(5).button( BTN_POS(2,2), w, h, F("Dark Chocolate"))
61
-           .tag(6).button( BTN_POS(2,3), w, h, F("Milk Chocolate"))
62
-           .tag(7).button( BTN_POS(2,4), w, h, F("White Chocolate"));
60
+        cmd.tag(5).button(BTN_POS(2,2), w, h, F("Dark Chocolate"))
61
+           .tag(6).button(BTN_POS(2,3), w, h, F("Milk Chocolate"))
62
+           .tag(7).button(BTN_POS(2,4), w, h, F("White Chocolate"));
63 63
     }
64 64
     cmd.colors(action_btn)
65
-       .tag(1) .button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
65
+       .tag(1) .button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
66 66
   }
67 67
 }
68 68
 

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp View File

@@ -78,7 +78,7 @@ void PreheatTimerScreen::draw_interaction_buttons(draw_mode_t what) {
78 78
     CommandProcessor cmd;
79 79
     cmd.colors(normal_btn)
80 80
        .font(font_medium)
81
-       .tag(1).button( BACK_POS, GET_TEXT_F(MSG_BACK));
81
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
82 82
   }
83 83
 }
84 84
 
@@ -101,7 +101,7 @@ void PreheatTimerScreen::draw_adjuster(draw_mode_t what, uint8_t tag, progmem_st
101 101
        .font(font_small);
102 102
     if (what & BACKGROUND) {
103 103
         cmd.text(   SUB_POS(1,1), SUB_SIZE(9,1), label)
104
-           .button( SUB_POS(1,2), SUB_SIZE(5,1), F(""), OPT_FLAT);
104
+           .button(SUB_POS(1,2), SUB_SIZE(5,1), F(""), OPT_FLAT);
105 105
     }
106 106
 
107 107
     if (what & FOREGROUND) {

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp View File

@@ -40,7 +40,7 @@ void DefaultAccelerationScreen::onRedraw(draw_mode_t what) {
40 40
   w.adjuster(  4, GET_TEXT_F(MSG_ACCEL_TRAVEL),   getTravelAcceleration_mm_s2() );
41 41
   w.adjuster(  6, GET_TEXT_F(MSG_ACCEL_RETRACT),  getRetractAcceleration_mm_s2() );
42 42
   w.increments();
43
-  w.button(    8, GET_TEXT_F(MSG_SET_MAXIMUM));
43
+  w.button(   8, GET_TEXT_F(MSG_SET_MAXIMUM));
44 44
 }
45 45
 
46 46
 bool DefaultAccelerationScreen::onTouchHeld(uint8_t tag) {

+ 18
- 18
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp View File

@@ -57,32 +57,32 @@ void DeveloperMenu::onRedraw(draw_mode_t what) {
57 57
       #define GRID_COLS 1
58 58
       cmd.font(font_large)         .text  ( BTN_POS(1,1), BTN_SIZE(1,1), F("Developer Menu"))
59 59
          .colors(normal_btn)
60
-         .tag(2).font(font_medium) .button( BTN_POS(1,2), BTN_SIZE(1,1), F("Show All Widgets"))
61
-         .tag(3)                   .button( BTN_POS(1,3), BTN_SIZE(1,1), F("Stress Test"))
62
-         .tag(4)                   .button( BTN_POS(1,4), BTN_SIZE(1,1), F("Show Touch Registers"))
63
-         .tag(5)                   .button( BTN_POS(1,5), BTN_SIZE(1,1), F("Play Song"))
64
-         .tag(6).enabled(has_media).button( BTN_POS(1,6), BTN_SIZE(1,1), F("Play Video from Media"))
65
-         .tag(7).enabled(has_flash).button( BTN_POS(1,7), BTN_SIZE(1,1), F("Play Video from SPI Flash"))
66
-         .tag(8).enabled(has_flash).button( BTN_POS(1,8), BTN_SIZE(1,1), F("Load Video to SPI Flash"))
67
-         .tag(9).enabled(has_flash).button( BTN_POS(1,9), BTN_SIZE(1,1), F("Erase SPI Flash"))
60
+         .tag(2).font(font_medium) .button(BTN_POS(1,2), BTN_SIZE(1,1), F("Show All Widgets"))
61
+         .tag(3)                   .button(BTN_POS(1,3), BTN_SIZE(1,1), F("Stress Test"))
62
+         .tag(4)                   .button(BTN_POS(1,4), BTN_SIZE(1,1), F("Show Touch Registers"))
63
+         .tag(5)                   .button(BTN_POS(1,5), BTN_SIZE(1,1), F("Play Song"))
64
+         .tag(6).enabled(has_media).button(BTN_POS(1,6), BTN_SIZE(1,1), F("Play Video from Media"))
65
+         .tag(7).enabled(has_flash).button(BTN_POS(1,7), BTN_SIZE(1,1), F("Play Video from SPI Flash"))
66
+         .tag(8).enabled(has_flash).button(BTN_POS(1,8), BTN_SIZE(1,1), F("Load Video to SPI Flash"))
67
+         .tag(9).enabled(has_flash).button(BTN_POS(1,9), BTN_SIZE(1,1), F("Erase SPI Flash"))
68 68
 
69 69
          .tag(1).colors(action_btn)
70
-                                   .button( BTN_POS(1,10), BTN_SIZE(1,1), F("Back"));
70
+                                   .button(BTN_POS(1,10), BTN_SIZE(1,1), F("Back"));
71 71
     #else
72 72
       #define GRID_ROWS 6
73 73
       #define GRID_COLS 2
74 74
       cmd.font(font_medium)        .text  ( BTN_POS(1,1), BTN_SIZE(2,1), F("Developer Menu"))
75 75
          .colors(normal_btn)
76
-         .tag(2).font(font_small)  .button( BTN_POS(1,2), BTN_SIZE(1,1), F("Show All Widgets"))
77
-         .tag(3)                   .button( BTN_POS(1,3), BTN_SIZE(1,1), F("Show Touch Registers"))
78
-         .tag(9)                   .button( BTN_POS(1,4), BTN_SIZE(1,1), F("Show Pin States"))
79
-         .tag(4)                   .button( BTN_POS(1,5), BTN_SIZE(1,1), F("Play Song"))
80
-         .tag(5).enabled(has_media).button( BTN_POS(2,2), BTN_SIZE(1,1), F("Play Video from Media"))
81
-         .tag(6).enabled(has_flash).button( BTN_POS(2,3), BTN_SIZE(1,1), F("Play Video from SPI Flash"))
82
-         .tag(7).enabled(has_flash).button( BTN_POS(2,4), BTN_SIZE(1,1), F("Load Video to SPI Flash"))
83
-         .tag(8).enabled(has_flash).button( BTN_POS(2,5), BTN_SIZE(1,1), F("Erase SPI Flash"))
76
+         .tag(2).font(font_small)  .button(BTN_POS(1,2), BTN_SIZE(1,1), F("Show All Widgets"))
77
+         .tag(3)                   .button(BTN_POS(1,3), BTN_SIZE(1,1), F("Show Touch Registers"))
78
+         .tag(9)                   .button(BTN_POS(1,4), BTN_SIZE(1,1), F("Show Pin States"))
79
+         .tag(4)                   .button(BTN_POS(1,5), BTN_SIZE(1,1), F("Play Song"))
80
+         .tag(5).enabled(has_media).button(BTN_POS(2,2), BTN_SIZE(1,1), F("Play Video from Media"))
81
+         .tag(6).enabled(has_flash).button(BTN_POS(2,3), BTN_SIZE(1,1), F("Play Video from SPI Flash"))
82
+         .tag(7).enabled(has_flash).button(BTN_POS(2,4), BTN_SIZE(1,1), F("Load Video to SPI Flash"))
83
+         .tag(8).enabled(has_flash).button(BTN_POS(2,5), BTN_SIZE(1,1), F("Erase SPI Flash"))
84 84
          .tag(1).colors(action_btn)
85
-                                   .button( BTN_POS(1,6), BTN_SIZE(2,1), F("Back"));
85
+                                   .button(BTN_POS(1,6), BTN_SIZE(2,1), F("Back"));
86 86
     #endif
87 87
   }
88 88
 }

+ 4
- 4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp View File

@@ -50,20 +50,20 @@ template void DialogBoxBaseClass::drawMessage(progmem_str, int16_t font);
50 50
 void DialogBoxBaseClass::drawYesNoButtons(uint8_t default_btn) {
51 51
   CommandProcessor cmd;
52 52
   cmd.font(font_medium)
53
-     .colors(default_btn == 1 ? action_btn : normal_btn).tag(1).button( BTN_POS(1,8), BTN_SIZE(1,1), GET_TEXT_F(MSG_YES))
54
-     .colors(default_btn == 2 ? action_btn : normal_btn).tag(2).button( BTN_POS(2,8), BTN_SIZE(1,1), GET_TEXT_F(MSG_NO));
53
+     .colors(default_btn == 1 ? action_btn : normal_btn).tag(1).button(BTN_POS(1,8), BTN_SIZE(1,1), GET_TEXT_F(MSG_YES))
54
+     .colors(default_btn == 2 ? action_btn : normal_btn).tag(2).button(BTN_POS(2,8), BTN_SIZE(1,1), GET_TEXT_F(MSG_NO));
55 55
 }
56 56
 
57 57
 void DialogBoxBaseClass::drawOkayButton() {
58 58
   CommandProcessor cmd;
59 59
   cmd.font(font_medium)
60
-     .tag(1).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_OKAY));
60
+     .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_OKAY));
61 61
 }
62 62
 
63 63
 void DialogBoxBaseClass::drawButton(const progmem_str label) {
64 64
   CommandProcessor cmd;
65 65
   cmd.font(font_medium)
66
-     .tag(1).button( BTN_POS(1,8), BTN_SIZE(2,1), label);
66
+     .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), label);
67 67
 }
68 68
 
69 69
 void DialogBoxBaseClass::drawSpinner() {

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp View File

@@ -121,7 +121,7 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
121 121
 
122 122
   cmd.font(font_medium)
123 123
      .colors(action_btn)
124
-     .tag(1).button( BTN_POS(1,7), BTN_SIZE(6,1), GET_TEXT_F(MSG_BACK));
124
+     .tag(1).button(BTN_POS(1,7), BTN_SIZE(6,1), GET_TEXT_F(MSG_BACK));
125 125
   #undef GRID_COLS
126 126
   #undef GRID_ROWS
127 127
 }

+ 6
- 6
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp View File

@@ -141,11 +141,11 @@ void FilesScreen::drawHeader() {
141 141
   CommandProcessor cmd;
142 142
   cmd.colors(normal_btn)
143 143
      .font(font_small)
144
-     .tag(0).button( BTN_POS(2,1), BTN_SIZE(4,header_h), str, OPT_CENTER | OPT_FLAT)
144
+     .tag(0).button(BTN_POS(2,1), BTN_SIZE(4,header_h), str, OPT_CENTER | OPT_FLAT)
145 145
      .font(font_medium)
146 146
      .colors(action_btn)
147
-     .tag(241).enabled(prev_enabled).button( BTN_POS(1,1), BTN_SIZE(1,header_h), F("<"))
148
-     .tag(242).enabled(next_enabled).button( BTN_POS(6,1), BTN_SIZE(1,header_h), F(">"));
147
+     .tag(241).enabled(prev_enabled).button(BTN_POS(1,1), BTN_SIZE(1,header_h), F("<"))
148
+     .tag(242).enabled(next_enabled).button(BTN_POS(6,1), BTN_SIZE(1,header_h), F(">"));
149 149
 }
150 150
 
151 151
 void FilesScreen::drawFooter() {
@@ -167,14 +167,14 @@ void FilesScreen::drawFooter() {
167 167
   cmd.colors(normal_btn)
168 168
      .font(font_medium)
169 169
      .colors(has_selection ? normal_btn : action_btn)
170
-     .tag(back_tag).button( BTN_POS(4,y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BACK))
170
+     .tag(back_tag).button(BTN_POS(4,y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BACK))
171 171
      .enabled(has_selection)
172 172
      .colors(has_selection ? action_btn : normal_btn);
173 173
 
174 174
   if (screen_data.FilesScreen.flags.is_dir)
175
-    cmd.tag(244).button( BTN_POS(1, y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_OPEN));
175
+    cmd.tag(244).button(BTN_POS(1, y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_OPEN));
176 176
   else
177
-    cmd.tag(243).button( BTN_POS(1, y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_PRINT));
177
+    cmd.tag(243).button(BTN_POS(1, y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_PRINT));
178 178
 }
179 179
 
180 180
 void FilesScreen::onRedraw(draw_mode_t what) {

+ 10
- 10
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp View File

@@ -69,20 +69,20 @@ void MainMenu::onRedraw(draw_mode_t what) {
69 69
     CommandProcessor cmd;
70 70
     cmd.colors(normal_btn)
71 71
        .font(Theme::font_medium)
72
-       .tag( 2).button( AUTO_HOME_POS,       GET_TEXT_F(MSG_AUTO_HOME))
72
+       .tag( 2).button(AUTO_HOME_POS,       GET_TEXT_F(MSG_AUTO_HOME))
73 73
        .enabled(ENABLED(NOZZLE_CLEAN_FEATURE))
74
-       .tag( 3).button( CLEAN_NOZZLE_POS,    GET_TEXT_F(MSG_CLEAN_NOZZLE))
75
-       .tag( 4).button( MOVE_AXIS_POS,       GET_TEXT_F(MSG_MOVE_AXIS))
76
-       .tag( 5).button( DISABLE_STEPPERS_POS,GET_TEXT_F(MSG_DISABLE_STEPPERS))
77
-       .tag( 6).button( TEMPERATURE_POS,     GET_TEXT_F(MSG_TEMPERATURE))
74
+       .tag( 3).button(CLEAN_NOZZLE_POS,    GET_TEXT_F(MSG_CLEAN_NOZZLE))
75
+       .tag( 4).button(MOVE_AXIS_POS,       GET_TEXT_F(MSG_MOVE_AXIS))
76
+       .tag( 5).button(DISABLE_STEPPERS_POS,GET_TEXT_F(MSG_DISABLE_STEPPERS))
77
+       .tag( 6).button(TEMPERATURE_POS,     GET_TEXT_F(MSG_TEMPERATURE))
78 78
        .enabled(IF_DISABLED(TOUCH_UI_LULZBOT_BIO, 1))
79
-       .tag( 7).button( FILAMENTCHANGE_POS,  GET_TEXT_F(MSG_FILAMENTCHANGE))
80
-       .tag( 8).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
79
+       .tag( 7).button(FILAMENTCHANGE_POS,  GET_TEXT_F(MSG_FILAMENTCHANGE))
80
+       .tag( 8).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
81 81
        .enabled(TERN_(HAS_LEVELING, 1))
82
-       .tag( 9).button( LEVELING_POS,        GET_TEXT_F(MSG_LEVELING))
83
-       .tag(10).button( ABOUT_PRINTER_POS,   GET_TEXT_F(MSG_INFO_MENU))
82
+       .tag( 9).button(LEVELING_POS,        GET_TEXT_F(MSG_LEVELING))
83
+       .tag(10).button(ABOUT_PRINTER_POS,   GET_TEXT_F(MSG_INFO_MENU))
84 84
        .colors(action_btn)
85
-       .tag(1).button( BACK_POS,             GET_TEXT_F(MSG_BACK));
85
+       .tag(1).button(BACK_POS,             GET_TEXT_F(MSG_BACK));
86 86
   }
87 87
 }
88 88
 

+ 11
- 11
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp View File

@@ -66,13 +66,13 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
66 66
     cmd.tag(6)
67 67
        .fgcolor(Theme::axis_label)
68 68
        .font(Theme::font_large)
69
-                               .button( UNION_POS(X_LBL_POS, X_VAL_POS), F(""), OPT_FLAT)
70
-                               .button( UNION_POS(Y_LBL_POS, Y_VAL_POS), F(""), OPT_FLAT)
71
-                               .button( UNION_POS(Z_LBL_POS, Z_VAL_POS), F(""), OPT_FLAT)
69
+                               .button(UNION_POS(X_LBL_POS, X_VAL_POS), F(""), OPT_FLAT)
70
+                               .button(UNION_POS(Y_LBL_POS, Y_VAL_POS), F(""), OPT_FLAT)
71
+                               .button(UNION_POS(Z_LBL_POS, Z_VAL_POS), F(""), OPT_FLAT)
72 72
        .font(Theme::font_medium)
73
-       .fgcolor(Theme::x_axis) .button( X_VAL_POS, F(""), OPT_FLAT)
74
-       .fgcolor(Theme::y_axis) .button( Y_VAL_POS, F(""), OPT_FLAT)
75
-       .fgcolor(Theme::z_axis) .button( Z_VAL_POS, F(""), OPT_FLAT)
73
+       .fgcolor(Theme::x_axis) .button(X_VAL_POS, F(""), OPT_FLAT)
74
+       .fgcolor(Theme::y_axis) .button(Y_VAL_POS, F(""), OPT_FLAT)
75
+       .fgcolor(Theme::z_axis) .button(Z_VAL_POS, F(""), OPT_FLAT)
76 76
        .font(Theme::font_small)
77 77
                                .text  ( X_LBL_POS, GET_TEXT_F(MSG_AXIS_X))
78 78
                                .text  ( Y_LBL_POS, GET_TEXT_F(MSG_AXIS_Y))
@@ -137,9 +137,9 @@ void StatusScreen::draw_temperature(draw_mode_t what) {
137 137
   if (what & BACKGROUND) {
138 138
     cmd.font(Theme::font_small)
139 139
        .tag(5)
140
-       .fgcolor(temp)     .button( TEMP_RECT_1, F(""), OPT_FLAT)
141
-                          .button( TEMP_RECT_2, F(""), OPT_FLAT)
142
-       .fgcolor(fan_speed).button( FAN_POS,     F(""), OPT_FLAT)
140
+       .fgcolor(temp)     .button(TEMP_RECT_1, F(""), OPT_FLAT)
141
+                          .button(TEMP_RECT_2, F(""), OPT_FLAT)
142
+       .fgcolor(fan_speed).button(FAN_POS,     F(""), OPT_FLAT)
143 143
        .tag(0);
144 144
 
145 145
     // Draw Extruder Bitmap on Extruder Temperature Button
@@ -269,7 +269,7 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
269 269
        .enabled(has_media)
270 270
        .tag(3).button(MEDIA_BTN_POS, isPrintingFromMedia() ? GET_TEXT_F(MSG_PRINTING) : GET_TEXT_F(MSG_BUTTON_MEDIA))
271 271
        .colors(!has_media ? action_btn : normal_btn)
272
-       .tag(4).button( MENU_BTN_POS, GET_TEXT_F(MSG_BUTTON_MENU));
272
+       .tag(4).button(MENU_BTN_POS, GET_TEXT_F(MSG_BUTTON_MENU));
273 273
   }
274 274
   #undef  GRID_COLS
275 275
 }
@@ -287,7 +287,7 @@ void StatusScreen::draw_status_message(draw_mode_t what, const char* message) {
287 287
     CommandProcessor cmd;
288 288
     cmd.fgcolor(Theme::status_msg)
289 289
        .tag(0)
290
-       .button( STATUS_POS, F(""), OPT_FLAT);
290
+       .button(STATUS_POS, F(""), OPT_FLAT);
291 291
 
292 292
     draw_text_box(cmd, STATUS_POS, message, OPT_CENTER, font_large);
293 293
   }

+ 13
- 13
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp View File

@@ -47,19 +47,19 @@ void TouchRegistersScreen::onRedraw(draw_mode_t) {
47 47
    #define GRID_COLS 2
48 48
    cmd.tag(0)
49 49
       .font(font_xsmall)
50
-      .fgcolor(transformA)  .button( BTN_POS(1,1), BTN_SIZE(1,1), F("TOUCH_XFORM_A"))
51
-      .fgcolor(transformB)  .button( BTN_POS(1,2), BTN_SIZE(1,1), F("TOUCH_XFORM_B"))
52
-      .fgcolor(transformC)  .button( BTN_POS(1,3), BTN_SIZE(1,1), F("TOUCH_XFORM_C"))
53
-      .fgcolor(transformD)  .button( BTN_POS(1,4), BTN_SIZE(1,1), F("TOUCH_XFORM_D"))
54
-      .fgcolor(transformE)  .button( BTN_POS(1,5), BTN_SIZE(1,1), F("TOUCH_XFORM_E"))
55
-      .fgcolor(transformF)  .button( BTN_POS(1,6), BTN_SIZE(1,1), F("TOUCH_XFORM_F"))
50
+      .fgcolor(transformA)  .button(BTN_POS(1,1), BTN_SIZE(1,1), F("TOUCH_XFORM_A"))
51
+      .fgcolor(transformB)  .button(BTN_POS(1,2), BTN_SIZE(1,1), F("TOUCH_XFORM_B"))
52
+      .fgcolor(transformC)  .button(BTN_POS(1,3), BTN_SIZE(1,1), F("TOUCH_XFORM_C"))
53
+      .fgcolor(transformD)  .button(BTN_POS(1,4), BTN_SIZE(1,1), F("TOUCH_XFORM_D"))
54
+      .fgcolor(transformE)  .button(BTN_POS(1,5), BTN_SIZE(1,1), F("TOUCH_XFORM_E"))
55
+      .fgcolor(transformF)  .button(BTN_POS(1,6), BTN_SIZE(1,1), F("TOUCH_XFORM_F"))
56 56
 
57
-      .fgcolor(transformVal).button( BTN_POS(2,1), BTN_SIZE(1,1), F(""), OPT_FLAT)
58
-      .fgcolor(transformVal).button( BTN_POS(2,2), BTN_SIZE(1,1), F(""), OPT_FLAT)
59
-      .fgcolor(transformVal).button( BTN_POS(2,3), BTN_SIZE(1,1), F(""), OPT_FLAT)
60
-      .fgcolor(transformVal).button( BTN_POS(2,4), BTN_SIZE(1,1), F(""), OPT_FLAT)
61
-      .fgcolor(transformVal).button( BTN_POS(2,5), BTN_SIZE(1,1), F(""), OPT_FLAT)
62
-      .fgcolor(transformVal).button( BTN_POS(2,6), BTN_SIZE(1,1), F(""), OPT_FLAT);
57
+      .fgcolor(transformVal).button(BTN_POS(2,1), BTN_SIZE(1,1), F(""), OPT_FLAT)
58
+      .fgcolor(transformVal).button(BTN_POS(2,2), BTN_SIZE(1,1), F(""), OPT_FLAT)
59
+      .fgcolor(transformVal).button(BTN_POS(2,3), BTN_SIZE(1,1), F(""), OPT_FLAT)
60
+      .fgcolor(transformVal).button(BTN_POS(2,4), BTN_SIZE(1,1), F(""), OPT_FLAT)
61
+      .fgcolor(transformVal).button(BTN_POS(2,5), BTN_SIZE(1,1), F(""), OPT_FLAT)
62
+      .fgcolor(transformVal).button(BTN_POS(2,6), BTN_SIZE(1,1), F(""), OPT_FLAT);
63 63
 
64 64
    sprintf_P(b, PSTR("0x%08lX"), T_Transform_A); cmd.text( BTN_POS(2,1), BTN_SIZE(1,1), b);
65 65
    sprintf_P(b, PSTR("0x%08lX"), T_Transform_B); cmd.text( BTN_POS(2,2), BTN_SIZE(1,1), b);
@@ -69,7 +69,7 @@ void TouchRegistersScreen::onRedraw(draw_mode_t) {
69 69
    sprintf_P(b, PSTR("0x%08lX"), T_Transform_F); cmd.text( BTN_POS(2,6), BTN_SIZE(1,1), b);
70 70
 
71 71
    cmd.colors(action_btn).font(font_medium)
72
-      .tag(1).button( BTN_POS(2,7), BTN_SIZE(1,1), F("Back"));
72
+      .tag(1).button(BTN_POS(2,7), BTN_SIZE(1,1), F("Back"));
73 73
    #undef GRID_COLS
74 74
    #undef GRID_ROWS
75 75
  }

+ 9
- 9
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp View File

@@ -71,23 +71,23 @@ void TuneMenu::onRedraw(draw_mode_t what) {
71 71
     CommandProcessor cmd;
72 72
     cmd.colors(normal_btn)
73 73
        .font(font_medium)
74
-       .tag(2).button( TEMPERATURE_POS, GET_TEXT_F(MSG_TEMPERATURE))
74
+       .tag(2).button(TEMPERATURE_POS, GET_TEXT_F(MSG_TEMPERATURE))
75 75
        .enabled(!sdOrHostPrinting || sdOrHostPaused)
76
-       .tag(3).button( FIL_CHANGE_POS,  GET_TEXT_F(MSG_FILAMENTCHANGE))
76
+       .tag(3).button(FIL_CHANGE_POS,  GET_TEXT_F(MSG_FILAMENTCHANGE))
77 77
        .enabled(EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR))
78
-       .tag(9).button( FILAMENT_POS, GET_TEXT_F(MSG_FILAMENT))
78
+       .tag(9).button(FILAMENT_POS, GET_TEXT_F(MSG_FILAMENT))
79 79
        .enabled(BOTH(HAS_LEVELING, HAS_BED_PROBE) || ENABLED(BABYSTEPPING))
80
-       .tag(4).button( NUDGE_NOZ_POS, GET_TEXT_F(TERN(BABYSTEPPING, MSG_NUDGE_NOZZLE, MSG_ZPROBE_ZOFFSET)))
81
-       .tag(5).button( SPEED_POS, GET_TEXT_F(MSG_PRINT_SPEED))
80
+       .tag(4).button(NUDGE_NOZ_POS, GET_TEXT_F(TERN(BABYSTEPPING, MSG_NUDGE_NOZZLE, MSG_ZPROBE_ZOFFSET)))
81
+       .tag(5).button(SPEED_POS, GET_TEXT_F(MSG_PRINT_SPEED))
82 82
        .enabled(sdOrHostPrinting)
83 83
        .tag(sdOrHostPaused ? 7 : 6)
84
-       .button( PAUSE_POS, sdOrHostPaused ? GET_TEXT_F(MSG_RESUME_PRINT) : GET_TEXT_F(MSG_PAUSE_PRINT))
84
+       .button(PAUSE_POS, sdOrHostPaused ? GET_TEXT_F(MSG_RESUME_PRINT) : GET_TEXT_F(MSG_PAUSE_PRINT))
85 85
        .enabled(sdOrHostPrinting)
86
-       .tag(8).button( STOP_POS, GET_TEXT_F(MSG_STOP_PRINT))
86
+       .tag(8).button(STOP_POS, GET_TEXT_F(MSG_STOP_PRINT))
87 87
        .enabled(ENABLED(CASE_LIGHT_ENABLE))
88
-       .tag(10).button( CASE_LIGHT_POS, GET_TEXT_F(MSG_CASE_LIGHT))
88
+       .tag(10).button(CASE_LIGHT_POS, GET_TEXT_F(MSG_CASE_LIGHT))
89 89
        .tag(1).colors(action_btn)
90
-             .button( BACK_POS, GET_TEXT_F(MSG_BACK));
90
+             .button(BACK_POS, GET_TEXT_F(MSG_BACK));
91 91
   }
92 92
   #undef GRID_COLS
93 93
   #undef GRID_ROWS

Loading…
Cancel
Save