🐛 Update German language, Fix FTDI (#24047, #24048, #24227)

MarlinFirmware · Jun 4, 2022 · 4ae54a6 · 4ae54a6
1 parent ce0af56
commit 4ae54a6
Show file tree

Hide file tree

Showing 43 changed files with 155 additions and 214 deletions.
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -2882,7 +2882,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                   mesh_conf.goto_mesh_value = true;
                   mesh_conf.mesh_x = mesh_conf.mesh_y = 0;
                   Popup_Handler(MoveWait);
-                  mesh_conf.manual_move();;
+                  mesh_conf.manual_move();
                   Draw_Menu(UBLMesh);
                 #endif
               #elif HAS_BED_PROBE

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
@@ -1,6 +1,6 @@
-/*****************************
- * bio_advanced_settings.cpp *
- *****************************/
+/*************************
+ * advanced_settings.cpp *
+ *************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -28,6 +28,9 @@
 using namespace FTDI;
 using namespace Theme;
 
+#define GRID_COLS 2
+#define GRID_ROWS 9
+
 void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {
     CommandProcessor cmd;
@@ -38,58 +41,30 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
   if (what & FOREGROUND) {
     CommandProcessor cmd;
     cmd.colors(normal_btn)
-       .font(Theme::font_medium)
-    #define GRID_ROWS 9
-    #define GRID_COLS 2
+      .font(Theme::font_medium)
 
       .tag(2) .button(BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
-      .enabled(
-        #if HAS_TRINAMIC_CONFIG
-          1
-        #endif
-      )
+              .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
       .tag(3) .button(BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
-      .enabled(
-        #if HAS_TRINAMIC_CONFIG
-          1
-        #endif
-      )
+              .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
       .tag(4) .button(BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
       .tag(5) .button(BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
-      .enabled(
-        #if HAS_MULTI_HOTEND
-          1
-        #endif
-      )
+              .enabled(ENABLED(HAS_MULTI_HOTEND))
       .tag(6) .button(BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
 
 
       .tag(7) .button(BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
       .tag(8) .button(BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
       .tag(9) .button(BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
-      #if HAS_JUNCTION_DEVIATION
-        .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
-      #else
-        .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
-      #endif
-      .enabled(
-        #if ENABLED(BACKLASH_GCODE)
-          1
-        #endif
-      )
+      .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
+               .enabled(ENABLED(BACKLASH_GCODE))
       .tag(11) .button(BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
-      .enabled(
-        #if ENABLED(LIN_ADVANCE)
-          1
-        #endif
-      )
+               .enabled(ENABLED(LIN_ADVANCE))
       .tag(12) .button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
       .tag(13) .button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
       .tag(14) .button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
-      .colors(action_btn)
+               .colors(action_btn)
       .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
-    #undef GRID_COLS
-    #undef GRID_ROWS
   }
 }
 
@@ -100,35 +75,26 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
     case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
     case 2: GOTO_SCREEN(DisplayTuningScreen);              break;
     #if HAS_TRINAMIC_CONFIG
-    case 3: GOTO_SCREEN(StepperCurrentScreen);             break;
-    case 4: GOTO_SCREEN(StepperBumpSensitivityScreen);     break;
+      case 3: GOTO_SCREEN(StepperCurrentScreen);           break;
+      case 4: GOTO_SCREEN(StepperBumpSensitivityScreen);   break;
     #endif
     case 5: GOTO_SCREEN(EndstopStatesScreen);              break;
     #if HAS_MULTI_HOTEND
-    case 6: GOTO_SCREEN(NozzleOffsetScreen);               break;
+      case 6: GOTO_SCREEN(NozzleOffsetScreen);             break;
     #endif
-
     case 7: GOTO_SCREEN(StepsScreen);                      break;
     case 8: GOTO_SCREEN(MaxVelocityScreen);                break;
     case 9: GOTO_SCREEN(DefaultAccelerationScreen);        break;
-    case 10:
-      #if HAS_JUNCTION_DEVIATION
-        GOTO_SCREEN(JunctionDeviationScreen);
-      #else
-        GOTO_SCREEN(JerkScreen);
-      #endif
-      break;
+    case 10: GOTO_SCREEN(TERN(HAS_JUNCTION_DEVIATION, JunctionDeviationScreen, JerkScreen)); break;
     #if ENABLED(BACKLASH_GCODE)
-    case 11: GOTO_SCREEN(BacklashCompensationScreen);      break;
+      case 11: GOTO_SCREEN(BacklashCompensationScreen);    break;
     #endif
     #if ENABLED(LIN_ADVANCE)
-    case 12: GOTO_SCREEN(LinearAdvanceScreen);             break;
+      case 12: GOTO_SCREEN(LinearAdvanceScreen);           break;
     #endif
     case 13: GOTO_SCREEN(InterfaceSettingsScreen);         break;
     case 14: GOTO_SCREEN(RestoreFailsafeDialogBox);        break;
-
-    default:
-      return false;
+    default: return false;
   }
   return true;
 }

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
@@ -1,6 +1,6 @@
-/***************************
- * bio_advanced_settings.h *
- ***************************/
+/***********************
+ * advanced_settings.h *
+ ***********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
@@ -1,6 +1,6 @@
-/****************************
- * bio_confirm_home_xyz.cpp *
- ****************************/
+/************************
+ * confirm_home_xyz.cpp *
+ ************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
@@ -1,6 +1,6 @@
-/****************************
- * bio_confirm_home_e.h *
- ****************************/
+/********************
+ * confirm_home_e.h *
+ ********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
@@ -1,6 +1,6 @@
-/****************************
- * bio_confirm_home_xyz.cpp *
- ****************************/
+/************************
+ * confirm_home_xyz.cpp *
+ ************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
@@ -1,6 +1,6 @@
-/**************************
- * bio_confirm_home_xyz.h *
- **************************/
+/**********************
+ * confirm_home_xyz.h *
+ **********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
@@ -1,6 +1,6 @@
-/*********************
- * bio_main_menu.cpp *
- *********************/
+/*****************
+ * main_menu.cpp *
+ *****************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -28,9 +28,10 @@
 using namespace FTDI;
 using namespace Theme;
 
+#define GRID_COLS 2
+#define GRID_ROWS 10
+
 void MainMenu::onRedraw(draw_mode_t what) {
-  #define GRID_ROWS 10
-  #define GRID_COLS 2
 
   if (what & BACKGROUND) {
     CommandProcessor cmd;
@@ -56,9 +57,6 @@ void MainMenu::onRedraw(draw_mode_t what) {
        .colors(action_btn)
        .tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
-
-  #undef GRID_COLS
-  #undef GRID_ROWS
 }
 
 bool MainMenu::onTouchEnd(uint8_t tag) {

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
@@ -1,6 +1,6 @@
-/*********************
- * bio_main_menu.cpp *
- *********************/
+/*****************
+ * main_menu.cpp *
+ *****************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
@@ -1,6 +1,6 @@
-/*******************************
- * bio_printing_dialog_box.cpp *
- *******************************/
+/***************************
+ * printing_dialog_box.cpp *
+ ***************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
@@ -1,6 +1,6 @@
-/*****************************
- * bio_printing_dialog_box.h *
- *****************************/
+/*************************
+ * printing_dialog_box.h *
+ *************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h
@@ -96,10 +96,10 @@ enum {
 #include "../generic/z_offset_screen.h"
 #include "../generic/files_screen.h"
 
-#include "bio_status_screen.h"
-#include "bio_main_menu.h"
-#include "bio_tune_menu.h"
-#include "bio_advanced_settings.h"
-#include "bio_printing_dialog_box.h"
-#include "bio_confirm_home_xyz.h"
-#include "bio_confirm_home_e.h"
+#include "status_screen.h"
+#include "main_menu.h"
+#include "tune_menu.h"
+#include "advanced_settings.h"
+#include "printing_dialog_box.h"
+#include "confirm_home_xyz.h"
+#include "confirm_home_e.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -1,6 +1,6 @@
-/*************************
- * bio_status_screen.cpp *
- *************************/
+/*********************
+ * status_screen.cpp *
+ *********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
@@ -1,6 +1,6 @@
-/*************************
- * bio_status_screen.cpp *
- *************************/
+/*********************
+ * status_screen.cpp *
+ *********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
@@ -1,6 +1,6 @@
-/*********************
- * bio_tune_menu.cpp *
- *********************/
+/*****************
+ * tune_menu.cpp *
+ *****************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -29,10 +29,10 @@ using namespace FTDI;
 using namespace Theme;
 using namespace ExtUI;
 
-void TuneMenu::onRedraw(draw_mode_t what) {
-  #define GRID_ROWS 8
-  #define GRID_COLS 2
+#define GRID_COLS 2
+#define GRID_ROWS 8
 
+void TuneMenu::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {
     CommandProcessor cmd;
     cmd.cmd(CLEAR_COLOR_RGB(bg_color))
@@ -56,8 +56,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
        .enabled(!isPrinting()).tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
        .colors(action_btn)    .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
-  #undef GRID_COLS
-  #undef GRID_ROWS
 }
 
 bool TuneMenu::onTouchEnd(uint8_t tag) {

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
@@ -1,6 +1,6 @@
-/*******************
- * bio_tune_menu.h *
- *******************/
+/***************
+ * tune_menu.h *
+ ***************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
@@ -1,3 +1,6 @@
+/******************
+ * ui_landscape.h *
+ ******************/
 
 /****************************************************************************
  *   This program is free software: you can redistribute it and/or modify   *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
@@ -1,3 +1,6 @@
+/*****************
+ * ui_portrait.h *
+ *****************/
 
 /****************************************************************************
  *   This program is free software: you can redistribute it and/or modify   *

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
@@ -29,8 +29,8 @@ using namespace FTDI;
 using namespace ExtUI;
 using namespace Theme;
 
-#define GRID_ROWS 4
 #define GRID_COLS 3
+#define GRID_ROWS 4
 #define STEPS_PER_MM_POS        BTN_POS(1,1), BTN_SIZE(1,1)
 #define TMC_CURRENT_POS         BTN_POS(2,1), BTN_SIZE(1,1)
 #define LIN_ADVANCE_POS         BTN_POS(3,1), BTN_SIZE(1,1)
@@ -53,11 +53,11 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
   if (what & FOREGROUND) {
     CommandProcessor cmd;
     cmd.colors(normal_btn)
-       .font(Theme::font_medium)
+      .font(Theme::font_medium)
       .tag(2) .button(STEPS_PER_MM_POS,       GET_TEXT_F(MSG_STEPS_PER_MM))
-      .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
+              .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
       .tag(3) .button(TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
-      .enabled(ENABLED(LIN_ADVANCE))
+              .enabled(ENABLED(LIN_ADVANCE))
       .tag(4) .button(LIN_ADVANCE_POS,         GET_TEXT_F(MSG_LINEAR_ADVANCE))
       .tag(5) .button(VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
       .tag(6) .button(ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
@@ -66,7 +66,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .tag(9) .button(INTERFACE_POS,          GET_TEXT_F(MSG_INTERFACE))
       .tag(10).button(DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
       .tag(11).button(RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
-      .colors(action_btn)
+              .colors(action_btn)
       .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }