Browse Source

🌐 Update German language, FTDI cleanup (#24047)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Ludy 2 years ago
parent
commit
3d3898145a
No account linked to committer's email address
41 changed files with 155 additions and 210 deletions
  1. 1
    1
      Marlin/src/lcd/e3v2/jyersui/dwin.cpp
  2. 21
    55
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
  3. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
  4. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
  5. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
  6. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
  7. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
  8. 6
    8
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
  9. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
  10. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
  11. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
  12. 7
    7
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h
  13. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
  14. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
  15. 6
    8
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
  16. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
  17. 3
    0
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
  18. 3
    0
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
  19. 5
    5
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
  20. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
  21. 3
    3
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
  22. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
  23. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
  24. 2
    2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
  25. 2
    2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
  26. 8
    16
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
  27. 2
    2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
  28. 2
    2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
  29. 4
    7
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
  30. 3
    6
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
  31. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
  32. 2
    2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
  33. 3
    11
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
  34. 5
    5
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
  35. 6
    18
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
  36. 3
    4
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
  37. 5
    4
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
  38. 11
    0
      Marlin/src/lcd/language/language_de.h
  39. 1
    1
      Marlin/src/lcd/language/language_en.h
  40. 1
    1
      Marlin/src/lcd/language/language_it.h
  41. 1
    1
      Marlin/src/lcd/menu/menu_advanced.cpp

+ 1
- 1
Marlin/src/lcd/e3v2/jyersui/dwin.cpp View File

@@ -3155,7 +3155,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
3155 3155
                   mesh_conf.goto_mesh_value = true;
3156 3156
                   mesh_conf.mesh_x = mesh_conf.mesh_y = 0;
3157 3157
                   Popup_Handler(MoveWait);
3158
-                  mesh_conf.manual_move();;
3158
+                  mesh_conf.manual_move();
3159 3159
                   Draw_Menu(UBLMesh);
3160 3160
                 #endif
3161 3161
               #elif HAS_BED_PROBE

+ 21
- 55
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp View File

@@ -1,6 +1,6 @@
1
-/*****************************
2
- * bio_advanced_settings.cpp *
3
- *****************************/
1
+/*************************
2
+ * advanced_settings.cpp *
3
+ *************************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -28,6 +28,9 @@
28 28
 using namespace FTDI;
29 29
 using namespace Theme;
30 30
 
31
+#define GRID_COLS 2
32
+#define GRID_ROWS 9
33
+
31 34
 void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
32 35
   if (what & BACKGROUND) {
33 36
     CommandProcessor cmd;
@@ -38,58 +41,30 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
38 41
   if (what & FOREGROUND) {
39 42
     CommandProcessor cmd;
40 43
     cmd.colors(normal_btn)
41
-       .font(Theme::font_medium)
42
-    #define GRID_ROWS 9
43
-    #define GRID_COLS 2
44
+      .font(Theme::font_medium)
44 45
 
45 46
       .tag(2) .button(BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
46
-      .enabled(
47
-        #if HAS_TRINAMIC_CONFIG
48
-          1
49
-        #endif
50
-      )
47
+              .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
51 48
       .tag(3) .button(BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
52
-      .enabled(
53
-        #if HAS_TRINAMIC_CONFIG
54
-          1
55
-        #endif
56
-      )
49
+              .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
57 50
       .tag(4) .button(BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
58 51
       .tag(5) .button(BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
59
-      .enabled(
60
-        #if HAS_MULTI_HOTEND
61
-          1
62
-        #endif
63
-      )
52
+              .enabled(ENABLED(HAS_MULTI_HOTEND))
64 53
       .tag(6) .button(BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
65 54
 
66 55
 
67 56
       .tag(7) .button(BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
68 57
       .tag(8) .button(BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
69 58
       .tag(9) .button(BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
70
-      #if HAS_JUNCTION_DEVIATION
71
-        .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
72
-      #else
73
-        .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
74
-      #endif
75
-      .enabled(
76
-        #if ENABLED(BACKLASH_GCODE)
77
-          1
78
-        #endif
79
-      )
59
+      .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
60
+               .enabled(ENABLED(BACKLASH_GCODE))
80 61
       .tag(11) .button(BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
81
-      .enabled(
82
-        #if ENABLED(LIN_ADVANCE)
83
-          1
84
-        #endif
85
-      )
62
+               .enabled(ENABLED(LIN_ADVANCE))
86 63
       .tag(12) .button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
87 64
       .tag(13) .button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
88 65
       .tag(14) .button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
89
-      .colors(action_btn)
66
+               .colors(action_btn)
90 67
       .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
91
-    #undef GRID_COLS
92
-    #undef GRID_ROWS
93 68
   }
94 69
 }
95 70
 
@@ -100,35 +75,26 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
100 75
     case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
101 76
     case 2: GOTO_SCREEN(DisplayTuningScreen);              break;
102 77
     #if HAS_TRINAMIC_CONFIG
103
-    case 3: GOTO_SCREEN(StepperCurrentScreen);             break;
104
-    case 4: GOTO_SCREEN(StepperBumpSensitivityScreen);     break;
78
+      case 3: GOTO_SCREEN(StepperCurrentScreen);           break;
79
+      case 4: GOTO_SCREEN(StepperBumpSensitivityScreen);   break;
105 80
     #endif
106 81
     case 5: GOTO_SCREEN(EndstopStatesScreen);              break;
107 82
     #if HAS_MULTI_HOTEND
108
-    case 6: GOTO_SCREEN(NozzleOffsetScreen);               break;
83
+      case 6: GOTO_SCREEN(NozzleOffsetScreen);             break;
109 84
     #endif
110
-
111 85
     case 7: GOTO_SCREEN(StepsScreen);                      break;
112 86
     case 8: GOTO_SCREEN(MaxVelocityScreen);                break;
113 87
     case 9: GOTO_SCREEN(DefaultAccelerationScreen);        break;
114
-    case 10:
115
-      #if HAS_JUNCTION_DEVIATION
116
-        GOTO_SCREEN(JunctionDeviationScreen);
117
-      #else
118
-        GOTO_SCREEN(JerkScreen);
119
-      #endif
120
-      break;
88
+    case 10: GOTO_SCREEN(TERN(HAS_JUNCTION_DEVIATION, JunctionDeviationScreen, JerkScreen)); break;
121 89
     #if ENABLED(BACKLASH_GCODE)
122
-    case 11: GOTO_SCREEN(BacklashCompensationScreen);      break;
90
+      case 11: GOTO_SCREEN(BacklashCompensationScreen);    break;
123 91
     #endif
124 92
     #if ENABLED(LIN_ADVANCE)
125
-    case 12: GOTO_SCREEN(LinearAdvanceScreen);             break;
93
+      case 12: GOTO_SCREEN(LinearAdvanceScreen);           break;
126 94
     #endif
127 95
     case 13: GOTO_SCREEN(InterfaceSettingsScreen);         break;
128 96
     case 14: GOTO_SCREEN(RestoreFailsafeDialogBox);        break;
129
-
130
-    default:
131
-      return false;
97
+    default: return false;
132 98
   }
133 99
   return true;
134 100
 }

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h View File

@@ -1,6 +1,6 @@
1
-/***************************
2
- * bio_advanced_settings.h *
3
- ***************************/
1
+/***********************
2
+ * advanced_settings.h *
3
+ ***********************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp View File

@@ -1,6 +1,6 @@
1
-/****************************
2
- * bio_confirm_home_xyz.cpp *
3
- ****************************/
1
+/************************
2
+ * confirm_home_xyz.cpp *
3
+ ************************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h View File

@@ -1,6 +1,6 @@
1
-/****************************
2
- * bio_confirm_home_e.h *
3
- ****************************/
1
+/********************
2
+ * confirm_home_e.h *
3
+ ********************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp View File

@@ -1,6 +1,6 @@
1
-/****************************
2
- * bio_confirm_home_xyz.cpp *
3
- ****************************/
1
+/************************
2
+ * confirm_home_xyz.cpp *
3
+ ************************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h View File

@@ -1,6 +1,6 @@
1
-/**************************
2
- * bio_confirm_home_xyz.h *
3
- **************************/
1
+/**********************
2
+ * confirm_home_xyz.h *
3
+ **********************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 6
- 8
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp View File

@@ -1,6 +1,6 @@
1
-/*********************
2
- * bio_main_menu.cpp *
3
- *********************/
1
+/*****************
2
+ * main_menu.cpp *
3
+ *****************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -28,9 +28,10 @@
28 28
 using namespace FTDI;
29 29
 using namespace Theme;
30 30
 
31
+#define GRID_COLS 2
32
+#define GRID_ROWS 10
33
+
31 34
 void MainMenu::onRedraw(draw_mode_t what) {
32
-  #define GRID_ROWS 10
33
-  #define GRID_COLS 2
34 35
 
35 36
   if (what & BACKGROUND) {
36 37
     CommandProcessor cmd;
@@ -56,9 +57,6 @@ void MainMenu::onRedraw(draw_mode_t what) {
56 57
        .colors(action_btn)
57 58
        .tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
58 59
   }
59
-
60
-  #undef GRID_COLS
61
-  #undef GRID_ROWS
62 60
 }
63 61
 
64 62
 bool MainMenu::onTouchEnd(uint8_t tag) {

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h View File

@@ -1,6 +1,6 @@
1
-/*********************
2
- * bio_main_menu.cpp *
3
- *********************/
1
+/*****************
2
+ * main_menu.cpp *
3
+ *****************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp View File

@@ -1,6 +1,6 @@
1
-/*******************************
2
- * bio_printing_dialog_box.cpp *
3
- *******************************/
1
+/***************************
2
+ * printing_dialog_box.cpp *
3
+ ***************************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h View File

@@ -1,6 +1,6 @@
1
-/*****************************
2
- * bio_printing_dialog_box.h *
3
- *****************************/
1
+/*************************
2
+ * printing_dialog_box.h *
3
+ *************************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 7
- 7
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h View File

@@ -96,10 +96,10 @@ enum {
96 96
 #include "../generic/z_offset_screen.h"
97 97
 #include "../generic/files_screen.h"
98 98
 
99
-#include "bio_status_screen.h"
100
-#include "bio_main_menu.h"
101
-#include "bio_tune_menu.h"
102
-#include "bio_advanced_settings.h"
103
-#include "bio_printing_dialog_box.h"
104
-#include "bio_confirm_home_xyz.h"
105
-#include "bio_confirm_home_e.h"
99
+#include "status_screen.h"
100
+#include "main_menu.h"
101
+#include "tune_menu.h"
102
+#include "advanced_settings.h"
103
+#include "printing_dialog_box.h"
104
+#include "confirm_home_xyz.h"
105
+#include "confirm_home_e.h"

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp View File

@@ -1,6 +1,6 @@
1
-/*************************
2
- * bio_status_screen.cpp *
3
- *************************/
1
+/*********************
2
+ * status_screen.cpp *
3
+ *********************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h View File

@@ -1,6 +1,6 @@
1
-/*************************
2
- * bio_status_screen.cpp *
3
- *************************/
1
+/*********************
2
+ * status_screen.cpp *
3
+ *********************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 6
- 8
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp View File

@@ -1,6 +1,6 @@
1
-/*********************
2
- * bio_tune_menu.cpp *
3
- *********************/
1
+/*****************
2
+ * tune_menu.cpp *
3
+ *****************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -29,10 +29,10 @@ using namespace FTDI;
29 29
 using namespace Theme;
30 30
 using namespace ExtUI;
31 31
 
32
-void TuneMenu::onRedraw(draw_mode_t what) {
33
-  #define GRID_ROWS 8
34
-  #define GRID_COLS 2
32
+#define GRID_COLS 2
33
+#define GRID_ROWS 8
35 34
 
35
+void TuneMenu::onRedraw(draw_mode_t what) {
36 36
   if (what & BACKGROUND) {
37 37
     CommandProcessor cmd;
38 38
     cmd.cmd(CLEAR_COLOR_RGB(bg_color))
@@ -56,8 +56,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
56 56
        .enabled(!isPrinting()).tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
57 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
60
-  #undef GRID_ROWS
61 59
 }
62 60
 
63 61
 bool TuneMenu::onTouchEnd(uint8_t tag) {

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h View File

@@ -1,6 +1,6 @@
1
-/*******************
2
- * bio_tune_menu.h *
3
- *******************/
1
+/***************
2
+ * tune_menu.h *
3
+ ***************/
4 4
 
5 5
 /****************************************************************************
6 6
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

+ 3
- 0
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h View File

@@ -1,3 +1,6 @@
1
+/******************
2
+ * ui_landscape.h *
3
+ ******************/
1 4
 
2 5
 /****************************************************************************
3 6
  *   This program is free software: you can redistribute it and/or modify   *

+ 3
- 0
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h View File

@@ -1,3 +1,6 @@
1
+/*****************
2
+ * ui_portrait.h *
3
+ *****************/
1 4
 
2 5
 /****************************************************************************
3 6
  *   This program is free software: you can redistribute it and/or modify   *

+ 5
- 5
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp View File

@@ -29,8 +29,8 @@ using namespace FTDI;
29 29
 using namespace ExtUI;
30 30
 using namespace Theme;
31 31
 
32
-#define GRID_ROWS 4
33 32
 #define GRID_COLS 3
33
+#define GRID_ROWS 4
34 34
 #define STEPS_PER_MM_POS        BTN_POS(1,1), BTN_SIZE(1,1)
35 35
 #define TMC_CURRENT_POS         BTN_POS(2,1), BTN_SIZE(1,1)
36 36
 #define LIN_ADVANCE_POS         BTN_POS(3,1), BTN_SIZE(1,1)
@@ -53,11 +53,11 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
53 53
   if (what & FOREGROUND) {
54 54
     CommandProcessor cmd;
55 55
     cmd.colors(normal_btn)
56
-       .font(Theme::font_medium)
56
+      .font(Theme::font_medium)
57 57
       .tag(2) .button(STEPS_PER_MM_POS,       GET_TEXT_F(MSG_STEPS_PER_MM))
58
-      .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
58
+              .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
59 59
       .tag(3) .button(TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
60
-      .enabled(ENABLED(LIN_ADVANCE))
60
+              .enabled(ENABLED(LIN_ADVANCE))
61 61
       .tag(4) .button(LIN_ADVANCE_POS,         GET_TEXT_F(MSG_LINEAR_ADVANCE))
62 62
       .tag(5) .button(VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
63 63
       .tag(6) .button(ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
@@ -66,7 +66,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
66 66
       .tag(9) .button(INTERFACE_POS,          GET_TEXT_F(MSG_INTERFACE))
67 67
       .tag(10).button(DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
68 68
       .tag(11).button(RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
69
-      .colors(action_btn)
69
+              .colors(action_btn)
70 70
       .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BUTTON_DONE));
71 71
   }
72 72
 }

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp View File

@@ -33,8 +33,8 @@ using namespace FTDI;
33 33
 using namespace ExtUI;
34 34
 using namespace Theme;
35 35
 
36
-#define GRID_ROWS 5
37 36
 #define GRID_COLS 3
37
+#define GRID_ROWS 5
38 38
 #define BED_MESH_TITLE_POS BTN_POS(1,1), BTN_SIZE(3,1)
39 39
 #define PROBE_BED_POS      BTN_POS(1,2), BTN_SIZE(1,1)
40 40
 #define SHOW_MESH_POS      BTN_POS(2,2), BTN_SIZE(1,1)
@@ -60,9 +60,9 @@ void LevelingMenu::onRedraw(draw_mode_t what) {
60 60
        .text(BLTOUCH_TITLE_POS, GET_TEXT_F(MSG_BLTOUCH))
61 61
        .font(font_medium).colors(normal_btn)
62 62
        .tag(2).button(PROBE_BED_POS, GET_TEXT_F(MSG_PROBE_BED))
63
-       .enabled(ENABLED(HAS_MESH))
63
+              .enabled(ENABLED(HAS_MESH))
64 64
        .tag(3).button(SHOW_MESH_POS, GET_TEXT_F(MSG_MESH_VIEW))
65
-       .enabled(ENABLED(HAS_MESH))
65
+              .enabled(ENABLED(HAS_MESH))
66 66
        .tag(4).button(EDIT_MESH_POS, GET_TEXT_F(MSG_EDIT_MESH))
67 67
        #undef  GRID_COLS
68 68
        #define GRID_COLS 2

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp View File

@@ -29,8 +29,8 @@
29 29
 using namespace FTDI;
30 30
 using namespace Theme;
31 31
 
32
-#define GRID_ROWS 6
33 32
 #define GRID_COLS 2
33
+#define GRID_ROWS 6
34 34
 
35 35
 #define ZPROBE_ZOFFSET_POS    BTN_POS(1,1), BTN_SIZE(1,1)
36 36
 #define MOVE_XYZ_POS          BTN_POS(1,2), BTN_SIZE(1,1)
@@ -57,14 +57,14 @@ void MainMenu::onRedraw(draw_mode_t what) {
57 57
        .font(Theme::font_medium)
58 58
        .tag( 2).button(MOVE_XYZ_POS,          GET_TEXT_F(MSG_XYZ_MOVE))
59 59
        .tag( 3).button(TEMPERATURE_POS,       GET_TEXT_F(MSG_TEMPERATURE))
60
-       .enabled(BOTH(HAS_LEVELING, HAS_BED_PROBE))
60
+               .enabled(BOTH(HAS_LEVELING, HAS_BED_PROBE))
61 61
        .tag( 4).button(ZPROBE_ZOFFSET_POS,    GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
62 62
        .tag( 5).button(MOVE_E_POS,            GET_TEXT_F(MSG_E_MOVE))
63 63
        .tag( 6).button(SPEED_POS,             GET_TEXT_F(MSG_PRINT_SPEED))
64 64
        .tag( 7).button(FLOW_POS,              GET_TEXT_F(MSG_FLOW))
65 65
        .tag( 8).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
66 66
        .tag( 9).button(DISABLE_STEPPERS_POS,  GET_TEXT_F(MSG_DISABLE_STEPPERS))
67
-       .enabled(HAS_LEVELING)
67
+               .enabled(ENABLED(HAS_LEVELING))
68 68
        .tag(10).button(LEVELING_POS,          GET_TEXT_F(MSG_LEVELING))
69 69
        .tag(11).button(ABOUT_PRINTER_POS,     GET_TEXT_F(MSG_INFO_MENU))
70 70
        .colors(action_btn)

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

@@ -28,8 +28,8 @@ using namespace FTDI;
28 28
 using namespace ExtUI;
29 29
 using namespace Theme;
30 30
 
31
-#define GRID_ROWS 5
32 31
 #define GRID_COLS 2
32
+#define GRID_ROWS 5
33 33
 
34 34
 void PreheatMenu::onRedraw(draw_mode_t what) {
35 35
   const int16_t w = TERN0(COCOA_PRESS_EXTRA_HEATER, has_extra_heater() ? BTN_W(1) : BTN_W(2));

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

@@ -64,8 +64,8 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
64 64
         #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
65 65
       #endif
66 66
     #else
67
-      #define GRID_ROWS 6
68 67
       #define GRID_COLS 3
68
+      #define GRID_ROWS 6
69 69
       #define ZPROBE_ZOFFSET_POS      BTN_POS(1,1), BTN_SIZE(1,1)
70 70
       #define CASE_LIGHT_POS          BTN_POS(1,4), BTN_SIZE(1,1)
71 71
       #define STEPS_PER_MM_POS        BTN_POS(2,1), BTN_SIZE(1,1)

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp View File

@@ -54,8 +54,8 @@ void CustomUserMenus::onRedraw(draw_mode_t what) {
54 54
   #endif
55 55
 
56 56
   #if ENABLED(TOUCH_UI_PORTRAIT)
57
-    #define GRID_ROWS 11
58 57
     #define GRID_COLS (1 + _MORE_THAN_TEN)
58
+    #define GRID_ROWS 11
59 59
     #define USER_ITEM_POS(N) BTN_POS((1+((N-1)/10)), ((N-1) % 10 + 1)), BTN_SIZE(1,1)
60 60
     #define BACK_POS         BTN_POS(1,11), BTN_SIZE(1,1)
61 61
   #else
@@ -64,8 +64,8 @@ void CustomUserMenus::onRedraw(draw_mode_t what) {
64 64
     #else
65 65
       #define _MORE_THAN_FIVE 0
66 66
     #endif
67
-    #define GRID_ROWS 6
68 67
     #define GRID_COLS (1 + _MORE_THAN_FIVE + _MORE_THAN_TEN + _MORE_THAN_FIFTEEN)
68
+    #define GRID_ROWS 6
69 69
     #define USER_ITEM_POS(N) BTN_POS((1+((N-1)/5)), ((N-1) % 5 + 1)), BTN_SIZE(1,1)
70 70
     #define BACK_POS         BTN_POS(1,6), BTN_SIZE(GRID_COLS,1)
71 71
   #endif

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp View File

@@ -52,8 +52,8 @@ void DeveloperMenu::onRedraw(draw_mode_t what) {
52 52
 
53 53
     cmd.cmd(COLOR_RGB(bg_text_enabled));
54 54
     #if ENABLED(TOUCH_UI_PORTRAIT)
55
-      #define GRID_ROWS 10
56 55
       #define GRID_COLS 1
56
+      #define GRID_ROWS 10
57 57
       cmd.font(font_large)         .text  ( BTN_POS(1,1), BTN_SIZE(1,1), F("Developer Menu"))
58 58
          .colors(normal_btn)
59 59
          .tag(2).font(font_medium) .button(BTN_POS(1,2), BTN_SIZE(1,1), F("Show All Widgets"))
@@ -68,8 +68,8 @@ void DeveloperMenu::onRedraw(draw_mode_t what) {
68 68
          .tag(1).colors(action_btn)
69 69
                                    .button(BTN_POS(1,10), BTN_SIZE(1,1), F("Back"));
70 70
     #else
71
-      #define GRID_ROWS 6
72 71
       #define GRID_COLS 2
72
+      #define GRID_ROWS 6
73 73
       cmd.font(font_medium)        .text  ( BTN_POS(1,1), BTN_SIZE(2,1), F("Developer Menu"))
74 74
          .colors(normal_btn)
75 75
          .tag(2).font(font_small)  .button(BTN_POS(1,2), BTN_SIZE(1,1), F("Show All Widgets"))

+ 8
- 16
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp View File

@@ -37,6 +37,13 @@ void EndstopStatesScreen::onExit() {
37 37
   BaseScreen::onExit();
38 38
 }
39 39
 
40
+#define GRID_COLS 6
41
+#define GRID_ROWS 7
42
+
43
+#define PIN_BTN(X,Y,PIN,LABEL)          button(BTN_POS(X,Y), BTN_SIZE(2,1), LABEL)
44
+#define PIN_ENABLED(X,Y,LABEL,PIN,INV)  cmd.enabled(1).colors(READ(PIN##_PIN) != INV ? action_btn : normal_btn).PIN_BTN(X,Y,PIN,LABEL);
45
+#define PIN_DISABLED(X,Y,LABEL,PIN)     cmd.enabled(0).PIN_BTN(X,Y,PIN,LABEL);
46
+
40 47
 void EndstopStatesScreen::onRedraw(draw_mode_t) {
41 48
   CommandProcessor cmd;
42 49
   cmd.cmd(CLEAR_COLOR_RGB(bg_color))
@@ -44,20 +51,7 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
44 51
      .cmd(CLEAR(true,true,true))
45 52
      .tag(0);
46 53
 
47
-  #define GRID_ROWS 7
48
-  #define GRID_COLS 6
49
-
50
-  #define PIN_BTN(X,Y,PIN,LABEL)          button(BTN_POS(X,Y), BTN_SIZE(2,1), LABEL)
51
-  #define PIN_ENABLED(X,Y,LABEL,PIN,INV)  cmd.enabled(1).colors(READ(PIN##_PIN) != INV ? action_btn : normal_btn).PIN_BTN(X,Y,PIN,LABEL);
52
-  #define PIN_DISABLED(X,Y,LABEL,PIN)     cmd.enabled(0).PIN_BTN(X,Y,PIN,LABEL);
53
-
54
-  cmd.font(
55
-    #if ENABLED(TOUCH_UI_PORTRAIT)
56
-      font_large
57
-    #else
58
-      font_medium
59
-    #endif
60
-  )
54
+  cmd.font(TERN(TOUCH_UI_PORTRAIT, font_large, font_medium))
61 55
   .text(BTN_POS(1,1), BTN_SIZE(6,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
62 56
   .font(font_tiny);
63 57
   #if HAS_X_MAX
@@ -121,8 +115,6 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
121 115
   cmd.font(font_medium)
122 116
      .colors(action_btn)
123 117
      .tag(1).button(BTN_POS(1,7), BTN_SIZE(6,1), GET_TEXT_F(MSG_BUTTON_DONE));
124
-  #undef GRID_COLS
125
-  #undef GRID_ROWS
126 118
 }
127 119
 
128 120
 bool EndstopStatesScreen::onTouchEnd(uint8_t tag) {

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp View File

@@ -30,15 +30,15 @@ using namespace ExtUI;
30 30
 using namespace Theme;
31 31
 
32 32
 #if ENABLED(TOUCH_UI_PORTRAIT)
33
-  #define GRID_ROWS 9
34 33
   #define GRID_COLS 2
34
+  #define GRID_ROWS 9
35 35
   #define TITLE_POS          BTN_POS(1,1), BTN_SIZE(2,1)
36 36
   #define RUNOUT_SENSOR_POS  BTN_POS(1,2), BTN_SIZE(2,1)
37 37
   #define LIN_ADVANCE_POS    BTN_POS(1,3), BTN_SIZE(2,1)
38 38
   #define BACK_POS           BTN_POS(1,9), BTN_SIZE(2,1)
39 39
 #else
40
-  #define GRID_ROWS 6
41 40
   #define GRID_COLS 2
41
+  #define GRID_ROWS 6
42 42
   #define TITLE_POS          BTN_POS(1,1), BTN_SIZE(2,1)
43 43
   #define RUNOUT_SENSOR_POS  BTN_POS(1,2), BTN_SIZE(2,1)
44 44
   #define LIN_ADVANCE_POS    BTN_POS(1,3), BTN_SIZE(2,1)

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #if ENABLED(TOUCH_UI_PORTRAIT)
30 30
   #define GRID_COLS  6
31
-  #define GRID_ROWS  15
31
+  #define GRID_ROWS 15
32 32
   #define FILES_PER_PAGE 11
33 33
   #define PREV_DIR LEFT
34 34
   #define NEXT_DIR RIGHT
@@ -40,7 +40,7 @@
40 40
   #define BTN1_POS BTN_POS(1,14), BTN_SIZE(3,2)
41 41
   #define BTN2_POS BTN_POS(4,14), BTN_SIZE(3,2)
42 42
 #else
43
-  #define GRID_COLS  12
43
+  #define GRID_COLS 12
44 44
   #define GRID_ROWS  8
45 45
   #define FILES_PER_PAGE 6
46 46
   #define PREV_DIR UP

+ 4
- 7
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp View File

@@ -52,14 +52,13 @@ void InterfaceSettingsScreen::onEntry() {
52 52
   BaseScreen::onEntry();
53 53
 }
54 54
 
55
+#define GRID_COLS 4
56
+#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 7, 6)
57
+
55 58
 void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
56 59
   CommandProcessor cmd;
57 60
 
58 61
   if (what & BACKGROUND) {
59
-
60
-    #define GRID_COLS 4
61
-    #define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 7, 6)
62
-
63 62
     cmd.cmd(CLEAR_COLOR_RGB(bg_color))
64 63
        .cmd(CLEAR(true,true,true))
65 64
        .cmd(COLOR_RGB(bg_text_enabled))
@@ -128,7 +127,7 @@ bool InterfaceSettingsScreen::onTouchEnd(uint8_t tag) {
128 127
           LockScreen::disable();
129 128
         break;
130 129
     #endif
131
-    case 5: UIData::enable_animations(!UIData::animations_enabled());; break;
130
+    case 5: UIData::enable_animations(!UIData::animations_enabled()); break;
132 131
     case 6: GOTO_SCREEN(InterfaceSoundsScreen); return true;
133 132
     default:
134 133
       return false;
@@ -148,8 +147,6 @@ bool InterfaceSettingsScreen::onTouchStart(uint8_t tag) {
148 147
   }
149 148
   #undef EDGE_R
150 149
   #define EDGE_R 0
151
-  #undef GRID_COLS
152
-  #undef GRID_ROWS
153 150
   return true;
154 151
 }
155 152
 

+ 3
- 6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp View File

@@ -27,6 +27,9 @@
27 27
 
28 28
 using namespace FTDI;
29 29
 
30
+#define GRID_COLS 4
31
+#define GRID_ROWS 8
32
+
30 33
 // The kill screen is an oddball that happens after Marlin has killed the events
31 34
 // loop. So we only have a show() method rather than onRedraw(). The KillScreen
32 35
 // should not be used as a model for other UI screens as it is an exception.
@@ -39,18 +42,12 @@ void KillScreen::show(const char *message) {
39 42
      .cmd(CLEAR(true,true,true))
40 43
      .tag(0);
41 44
 
42
-  #define GRID_COLS 4
43
-  #define GRID_ROWS 8
44
-
45 45
   cmd.font(Theme::font_large)
46 46
      .cmd(COLOR_RGB(Theme::bg_text_enabled))
47 47
      .text(BTN_POS(1,2), BTN_SIZE(4,1), message)
48 48
      .text(BTN_POS(1,3), BTN_SIZE(4,1), GET_TEXT_F(MSG_HALTED))
49 49
      .text(BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_PLEASE_RESET));
50 50
 
51
-  #undef GRID_COLS
52
-  #undef GRID_ROWS
53
-
54 51
   cmd.cmd(DL::DL_DISPLAY)
55 52
      .cmd(CMD_SWAP)
56 53
      .execute();

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp View File

@@ -37,8 +37,8 @@ void LanguageMenu::onRedraw(draw_mode_t) {
37 37
      .colors(normal_btn)
38 38
      .font(Theme::font_medium);
39 39
 
40
-  #define GRID_ROWS 8
41 40
   #define GRID_COLS 1
41
+  #define GRID_ROWS 8
42 42
 
43 43
   cmd.tag(1).button(BTN_POS(1,1), BTN_SIZE(1,1), GET_LANGUAGE_NAME(1));
44 44
   cmd.tag(2).button(BTN_POS(1,2), BTN_SIZE(1,1), GET_LANGUAGE_NAME(2));

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp View File

@@ -34,8 +34,8 @@ using namespace ExtUI;
34 34
 using namespace Theme;
35 35
 
36 36
 #if ENABLED(TOUCH_UI_PORTRAIT)
37
-  #define GRID_ROWS 8
38 37
   #define GRID_COLS 2
38
+  #define GRID_ROWS 8
39 39
   #define LEVELING_TITLE_POS BTN_POS(1,1), BTN_SIZE(2,1)
40 40
   #define LEVEL_AXIS_POS     BTN_POS(1,2), BTN_SIZE(2,1)
41 41
   #define BED_MESH_TITLE_POS BTN_POS(1,3), BTN_SIZE(2,1)
@@ -48,8 +48,8 @@ using namespace Theme;
48 48
   #define BLTOUCH_TEST_POS   BTN_POS(2,7), BTN_SIZE(1,1)
49 49
   #define BACK_POS           BTN_POS(1,8), BTN_SIZE(2,1)
50 50
 #else
51
-  #define GRID_ROWS 6
52 51
   #define GRID_COLS 3
52
+  #define GRID_ROWS 6
53 53
   #define LEVELING_TITLE_POS BTN_POS(1,1), BTN_SIZE(3,1)
54 54
   #define LEVEL_AXIS_POS     BTN_POS(1,2), BTN_SIZE(3,1)
55 55
   #define BED_MESH_TITLE_POS BTN_POS(1,3), BTN_SIZE(2,1)

+ 3
- 11
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp View File

@@ -39,6 +39,9 @@ void LockScreen::onEntry() {
39 39
   BaseScreen::onEntry();
40 40
 }
41 41
 
42
+#define GRID_COLS 1
43
+#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 10, 7)
44
+
42 45
 void LockScreen::onRedraw(draw_mode_t what) {
43 46
   CommandProcessor cmd;
44 47
 
@@ -50,14 +53,6 @@ void LockScreen::onRedraw(draw_mode_t what) {
50 53
   }
51 54
 
52 55
   if (what & FOREGROUND) {
53
-    #if ENABLED(TOUCH_UI_PORTRAIT)
54
-      #define GRID_COLS 1
55
-      #define GRID_ROWS 10
56
-    #else
57
-      #define GRID_COLS 1
58
-      #define GRID_ROWS 7
59
-    #endif
60
-
61 56
     #undef MARGIN_T
62 57
     #undef MARGIN_B
63 58
     #define MARGIN_T 3
@@ -108,9 +103,6 @@ void LockScreen::onRedraw(draw_mode_t what) {
108 103
     #undef MARGIN_B
109 104
     #define MARGIN_T MARGIN_DEFAULT
110 105
     #define MARGIN_B MARGIN_DEFAULT
111
-
112
-    #undef GRID_COLS
113
-    #undef GRID_ROWS
114 106
   }
115 107
 }
116 108
 

+ 5
- 5
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp View File

@@ -37,8 +37,8 @@ void MainMenu::onRedraw(draw_mode_t what) {
37 37
   }
38 38
 
39 39
   #if ENABLED(TOUCH_UI_PORTRAIT)
40
-    #define GRID_ROWS 8
41 40
     #define GRID_COLS 2
41
+    #define GRID_ROWS 8
42 42
     #define ABOUT_PRINTER_POS     BTN_POS(1,1), BTN_SIZE(2,1)
43 43
     #define ADVANCED_SETTINGS_POS BTN_POS(1,2), BTN_SIZE(2,1)
44 44
     #if ENABLED(CUSTOM_MENU_MAIN)
@@ -55,8 +55,8 @@ void MainMenu::onRedraw(draw_mode_t what) {
55 55
     #define CLEAN_NOZZLE_POS      BTN_POS(2,7), BTN_SIZE(1,1)
56 56
     #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
57 57
   #else
58
-    #define GRID_ROWS 5
59 58
     #define GRID_COLS 6
59
+    #define GRID_ROWS 5
60 60
     #define ADVANCED_SETTINGS_POS BTN_POS(1,1), BTN_SIZE(3,1)
61 61
     #define ABOUT_PRINTER_POS     BTN_POS(4,1), BTN_SIZE(3,1)
62 62
     #define AUTO_HOME_POS         BTN_POS(1,2), BTN_SIZE(3,1)
@@ -80,15 +80,15 @@ void MainMenu::onRedraw(draw_mode_t what) {
80 80
     cmd.colors(normal_btn)
81 81
        .font(Theme::font_medium)
82 82
        .tag( 2).button(AUTO_HOME_POS,       GET_TEXT_F(MSG_AUTO_HOME))
83
-       .enabled(ENABLED(NOZZLE_CLEAN_FEATURE))
83
+               .enabled(ENABLED(NOZZLE_CLEAN_FEATURE))
84 84
        .tag( 3).button(CLEAN_NOZZLE_POS,    GET_TEXT_F(MSG_CLEAN_NOZZLE))
85 85
        .tag( 4).button(MOVE_AXIS_POS,       GET_TEXT_F(MSG_MOVE_AXIS))
86 86
        .tag( 5).button(DISABLE_STEPPERS_POS,GET_TEXT_F(MSG_DISABLE_STEPPERS))
87 87
        .tag( 6).button(TEMPERATURE_POS,     GET_TEXT_F(MSG_TEMPERATURE))
88
-       .enabled(IF_DISABLED(TOUCH_UI_LULZBOT_BIO, 1))
88
+               .enabled(DISABLED(TOUCH_UI_LULZBOT_BIO))
89 89
        .tag( 7).button(FILAMENTCHANGE_POS,  GET_TEXT_F(MSG_FILAMENTCHANGE))
90 90
        .tag( 8).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
91
-       .enabled(TERN_(HAS_LEVELING, 1))
91
+               .enabled(ENABLED(HAS_LEVELING))
92 92
        .tag( 9).button(LEVELING_POS,        GET_TEXT_F(MSG_LEVELING))
93 93
        .tag(10).button(ABOUT_PRINTER_POS,   GET_TEXT_F(MSG_INFO_MENU))
94 94
        #if ENABLED(CUSTOM_MENU_MAIN)

+ 6
- 18
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp View File

@@ -31,17 +31,12 @@
31 31
 using namespace FTDI;
32 32
 using namespace Theme;
33 33
 
34
-#if ENABLED(TOUCH_UI_PORTRAIT)
35
-  #define GRID_ROWS 16
36
-#else
37
-  #define GRID_ROWS 16
38
-#endif
34
+#define GRID_COLS 3
35
+#define GRID_ROWS 16
39 36
 
40 37
 void StatusScreen::draw_axis_position(draw_mode_t what) {
41 38
   CommandProcessor cmd;
42 39
 
43
-  #define GRID_COLS 3
44
-
45 40
   #if ENABLED(TOUCH_UI_PORTRAIT)
46 41
     #define X_LBL_POS  BTN_POS(1, 9), BTN_SIZE(1,2)
47 42
     #define Y_LBL_POS  BTN_POS(1,11), BTN_SIZE(1,2)
@@ -106,15 +101,10 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
106 101
        .text(Y_VAL_POS, y_str)
107 102
        .text(Z_VAL_POS, z_str);
108 103
   }
109
-
110
-  #undef GRID_COLS
111 104
 }
112 105
 
113
-#if ENABLED(TOUCH_UI_PORTRAIT)
114
-  #define GRID_COLS 8
115
-#else
116
-  #define GRID_COLS 12
117
-#endif
106
+#undef GRID_COLS
107
+#define GRID_COLS TERN(TOUCH_UI_PORTRAIT, 8, 12)
118 108
 
119 109
 void StatusScreen::draw_temperature(draw_mode_t what) {
120 110
   using namespace Theme;
@@ -293,11 +283,10 @@ void StatusScreen::draw_progress(draw_mode_t what) {
293 283
          .text(PROGRESS_POS, progress_str);
294 284
     #endif
295 285
   }
296
-
297
-  #undef GRID_COLS
298 286
 }
299 287
 
300 288
 void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
289
+  #undef GRID_COLS
301 290
   #define GRID_COLS 4
302 291
   if (what & FOREGROUND) {
303 292
     using namespace ExtUI;
@@ -321,10 +310,10 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
321 310
        .colors(!has_media ? action_btn : normal_btn)
322 311
        .tag(4).button(MENU_BTN_POS, GET_TEXT_F(MSG_BUTTON_MENU));
323 312
   }
324
-  #undef  GRID_COLS
325 313
 }
326 314
 
327 315
 void StatusScreen::draw_status_message(draw_mode_t what, const char *message) {
316
+  #undef  GRID_COLS
328 317
   #define GRID_COLS 1
329 318
 
330 319
   #if ENABLED(TOUCH_UI_PORTRAIT)
@@ -341,7 +330,6 @@ void StatusScreen::draw_status_message(draw_mode_t what, const char *message) {
341 330
 
342 331
     draw_text_box(cmd, STATUS_POS, message, OPT_CENTER, font_large);
343 332
   }
344
-  #undef  GRID_COLS
345 333
 }
346 334
 
347 335
 void StatusScreen::setStatusMessage(FSTR_P message) {

+ 3
- 4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp View File

@@ -28,6 +28,9 @@
28 28
 using namespace FTDI;
29 29
 using namespace Theme;
30 30
 
31
+#define GRID_COLS 2
32
+#define GRID_ROWS 7
33
+
31 34
 void TouchRegistersScreen::onRedraw(draw_mode_t) {
32 35
    const uint32_t T_Transform_A = CLCD::mem_read_32(CLCD::REG::TOUCH_TRANSFORM_A);
33 36
    const uint32_t T_Transform_B = CLCD::mem_read_32(CLCD::REG::TOUCH_TRANSFORM_B);
@@ -42,8 +45,6 @@ void TouchRegistersScreen::onRedraw(draw_mode_t) {
42 45
       .cmd(CLEAR(true,true,true))
43 46
       .tag(0);
44 47
 
45
-   #define GRID_ROWS 7
46
-   #define GRID_COLS 2
47 48
    cmd.tag(0)
48 49
       .font(font_xsmall)
49 50
       .fgcolor(transformA)  .button(BTN_POS(1,1), BTN_SIZE(1,1), F("TOUCH_XFORM_A"))
@@ -69,8 +70,6 @@ void TouchRegistersScreen::onRedraw(draw_mode_t) {
69 70
 
70 71
    cmd.colors(action_btn).font(font_medium)
71 72
       .tag(1).button(BTN_POS(2,7), BTN_SIZE(1,1), F("Back"));
72
-   #undef GRID_COLS
73
-   #undef GRID_ROWS
74 73
  }
75 74
 
76 75
  bool TouchRegistersScreen::onTouchEnd(uint8_t tag) {

+ 5
- 4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp View File

@@ -30,6 +30,9 @@
30 30
 using namespace FTDI;
31 31
 using namespace Theme;
32 32
 
33
+#define GRID_COLS 2
34
+#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 9, 5)
35
+
33 36
 void TuneMenu::onRedraw(draw_mode_t what) {
34 37
   if (what & BACKGROUND) {
35 38
     CommandProcessor cmd;
@@ -38,8 +41,8 @@ void TuneMenu::onRedraw(draw_mode_t what) {
38 41
   }
39 42
 
40 43
   #if ENABLED(TOUCH_UI_PORTRAIT)
41
-    #define GRID_ROWS 9
42 44
     #define GRID_COLS 2
45
+    #define GRID_ROWS 9
43 46
     #define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(2,1)
44 47
     #define FIL_CHANGE_POS  BTN_POS(1,2), BTN_SIZE(2,1)
45 48
     #define FILAMENT_POS    BTN_POS(1,3), BTN_SIZE(2,1)
@@ -51,8 +54,8 @@ void TuneMenu::onRedraw(draw_mode_t what) {
51 54
     #define ADVANCED_SETTINGS_POS BTN_POS(1,9), BTN_SIZE(1,1)
52 55
     #define BACK_POS        BTN_POS(2,9), BTN_SIZE(1,1)
53 56
   #else
54
-    #define GRID_ROWS 5
55 57
     #define GRID_COLS 2
58
+    #define GRID_ROWS 5
56 59
     #define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(1,1)
57 60
     #define NUDGE_NOZ_POS   BTN_POS(2,1), BTN_SIZE(1,1)
58 61
     #define FIL_CHANGE_POS  BTN_POS(1,2), BTN_SIZE(1,1)
@@ -94,8 +97,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
94 97
        .tag(1).colors(action_btn)
95 98
              .button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
96 99
   }
97
-  #undef GRID_COLS
98
-  #undef GRID_ROWS
99 100
 }
100 101
 
101 102
 bool TuneMenu::onTouchEnd(uint8_t tag) {

+ 11
- 0
Marlin/src/lcd/language/language_de.h View File

@@ -87,6 +87,9 @@ namespace Language_de {
87 87
   LSTR MSG_HOME_OFFSET_I                  = _UxGT("Homeversatz ") STR_I;
88 88
   LSTR MSG_HOME_OFFSET_J                  = _UxGT("Homeversatz ") STR_J;
89 89
   LSTR MSG_HOME_OFFSET_K                  = _UxGT("Homeversatz ") STR_K;
90
+  LSTR MSG_HOME_OFFSET_U                  = _UxGT("Homeversatz ") STR_U;
91
+  LSTR MSG_HOME_OFFSET_V                  = _UxGT("Homeversatz ") STR_V;
92
+  LSTR MSG_HOME_OFFSET_W                  = _UxGT("Homeversatz ") STR_W;
90 93
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Homeversatz aktiv");
91 94
   LSTR MSG_SET_ORIGIN                     = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in marlinui.cpp
92 95
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Assistent");
@@ -330,6 +333,14 @@ namespace Language_de {
330 333
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune fehlge. Falscher Extruder");
331 334
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune fehlge. Temperatur zu hoch.");
332 335
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune fehlge.! Timeout.");
336
+  LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("teste Wärmeverlust");
337
+  LSTR MSG_MPC_AUTOTUNE                   = _UxGT("Autotune MPC");
338
+  LSTR MSG_MPC_EDIT                       = _UxGT("MPC * bearbeiten");
339
+  LSTR MSG_MPC_POWER_E                    = _UxGT("* Leistung");
340
+  LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E      = _UxGT("Block C *");
341
+  LSTR MSG_SENSOR_RESPONSIVENESS_E        = _UxGT("Sensor res *");
342
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_E       = _UxGT("Ambient h *");
343
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E   = _UxGT("Amb. h fan *");
333 344
   LSTR MSG_SELECT                         = _UxGT("Auswählen");
334 345
   LSTR MSG_SELECT_E                       = _UxGT("Auswählen *");
335 346
   LSTR MSG_ACC                            = _UxGT("Beschleunigung");

+ 1
- 1
Marlin/src/lcd/language/language_en.h View File

@@ -357,7 +357,7 @@ namespace Language_en {
357 357
   LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E      = _UxGT("Block C *");
358 358
   LSTR MSG_SENSOR_RESPONSIVENESS_E        = _UxGT("Sensor res *");
359 359
   LSTR MSG_MPC_AMBIENT_XFER_COEFF_E       = _UxGT("Ambient h *");
360
-  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E= _UxGT("Amb. h fan *");
360
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E   = _UxGT("Amb. h fan *");
361 361
   LSTR MSG_SELECT                         = _UxGT("Select");
362 362
   LSTR MSG_SELECT_E                       = _UxGT("Select *");
363 363
   LSTR MSG_ACC                            = _UxGT("Accel");

+ 1
- 1
Marlin/src/lcd/language/language_it.h View File

@@ -354,7 +354,7 @@ namespace Language_it {
354 354
   LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E      = _UxGT("C blocco *");
355 355
   LSTR MSG_SENSOR_RESPONSIVENESS_E        = _UxGT("Reattiv.Sens. *");
356 356
   LSTR MSG_MPC_AMBIENT_XFER_COEFF_E       = _UxGT("H ambiente *");
357
-  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E= _UxGT("H Amb. vent. *");
357
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E   = _UxGT("H Amb. vent. *");
358 358
   LSTR MSG_SELECT                         = _UxGT("Seleziona");
359 359
   LSTR MSG_SELECT_E                       = _UxGT("Seleziona *");
360 360
   LSTR MSG_ACC                            = _UxGT("Accel");

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

@@ -351,7 +351,7 @@ void menu_backlash();
351 351
       #if ENABLED(MPC_INCLUDE_FAN)
352 352
         #define MPC_EDIT_ITEMS(N) \
353 353
           _MPC_EDIT_ITEMS(N); \
354
-          EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E, &editable.decimal, 0, 1, []{ \
354
+          EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_FAN_E, &editable.decimal, 0, 1, []{ \
355 355
             c.fan255_adjustment = editable.decimal - c.ambient_xfer_coeff_fan0; \
356 356
           })
357 357
       #else

Loading…
Cancel
Save