Skip to content

Commit 021c31e

Browse files
Ludy87thinkyhead
authored and
LCh-77
committed
🌐 Update German language, FTDI cleanup (MarlinFirmware#24047)
Co-authored-by: Scott Lahteine <[email protected]>
1 parent 97dcd80 commit 021c31e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+155
-210
lines changed

‎Marlin/src/lcd/e3v2/jyersui/dwin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3845,7 +3845,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
38453845
mesh_conf.goto_mesh_value = true;
38463846
mesh_conf.mesh_x = mesh_conf.mesh_y = 0;
38473847
Popup_Handler(MoveWait);
3848-
mesh_conf.manual_move();;
3848+
mesh_conf.manual_move();
38493849
Draw_Menu(UBLMesh);
38503850
#endif
38513851
#elif HAS_BED_PROBE

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp

+21-55
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*****************************
2-
* bio_advanced_settings.cpp *
3-
*****************************/
1+
/*************************
2+
* advanced_settings.cpp *
3+
*************************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *
@@ -28,6 +28,9 @@
2828
using namespace FTDI;
2929
using namespace Theme;
3030

31+
#define GRID_COLS 2
32+
#define GRID_ROWS 9
33+
3134
void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
3235
if (what & BACKGROUND) {
3336
CommandProcessor cmd;
@@ -38,58 +41,30 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
3841
if (what & FOREGROUND) {
3942
CommandProcessor cmd;
4043
cmd.colors(normal_btn)
41-
.font(Theme::font_medium)
42-
#define GRID_ROWS 9
43-
#define GRID_COLS 2
44+
.font(Theme::font_medium)
4445

4546
.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))
5148
.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))
5750
.tag(4) .button(BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
5851
.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))
6453
.tag(6) .button(BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU))
6554

6655

6756
.tag(7) .button(BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
6857
.tag(8) .button(BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
6958
.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))
8061
.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))
8663
.tag(12) .button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE))
8764
.tag(13) .button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE))
8865
.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)
9067
.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
9368
}
9469
}
9570

@@ -100,35 +75,26 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
10075
case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
10176
case 2: GOTO_SCREEN(DisplayTuningScreen); break;
10277
#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;
10580
#endif
10681
case 5: GOTO_SCREEN(EndstopStatesScreen); break;
10782
#if HAS_MULTI_HOTEND
108-
case 6: GOTO_SCREEN(NozzleOffsetScreen); break;
83+
case 6: GOTO_SCREEN(NozzleOffsetScreen); break;
10984
#endif
110-
11185
case 7: GOTO_SCREEN(StepsScreen); break;
11286
case 8: GOTO_SCREEN(MaxVelocityScreen); break;
11387
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;
12189
#if ENABLED(BACKLASH_GCODE)
122-
case 11: GOTO_SCREEN(BacklashCompensationScreen); break;
90+
case 11: GOTO_SCREEN(BacklashCompensationScreen); break;
12391
#endif
12492
#if ENABLED(LIN_ADVANCE)
125-
case 12: GOTO_SCREEN(LinearAdvanceScreen); break;
93+
case 12: GOTO_SCREEN(LinearAdvanceScreen); break;
12694
#endif
12795
case 13: GOTO_SCREEN(InterfaceSettingsScreen); break;
12896
case 14: GOTO_SCREEN(RestoreFailsafeDialogBox); break;
129-
130-
default:
131-
return false;
97+
default: return false;
13298
}
13399
return true;
134100
}

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/***************************
2-
* bio_advanced_settings.h *
3-
***************************/
1+
/***********************
2+
* advanced_settings.h *
3+
***********************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/****************************
2-
* bio_confirm_home_xyz.cpp *
3-
****************************/
1+
/************************
2+
* confirm_home_xyz.cpp *
3+
************************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/****************************
2-
* bio_confirm_home_e.h *
3-
****************************/
1+
/********************
2+
* confirm_home_e.h *
3+
********************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/****************************
2-
* bio_confirm_home_xyz.cpp *
3-
****************************/
1+
/************************
2+
* confirm_home_xyz.cpp *
3+
************************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/**************************
2-
* bio_confirm_home_xyz.h *
3-
**************************/
1+
/**********************
2+
* confirm_home_xyz.h *
3+
**********************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*********************
2-
* bio_main_menu.cpp *
3-
*********************/
1+
/*****************
2+
* main_menu.cpp *
3+
*****************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *
@@ -28,9 +28,10 @@
2828
using namespace FTDI;
2929
using namespace Theme;
3030

31+
#define GRID_COLS 2
32+
#define GRID_ROWS 10
33+
3134
void MainMenu::onRedraw(draw_mode_t what) {
32-
#define GRID_ROWS 10
33-
#define GRID_COLS 2
3435

3536
if (what & BACKGROUND) {
3637
CommandProcessor cmd;
@@ -56,9 +57,6 @@ void MainMenu::onRedraw(draw_mode_t what) {
5657
.colors(action_btn)
5758
.tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
5859
}
59-
60-
#undef GRID_COLS
61-
#undef GRID_ROWS
6260
}
6361

6462
bool MainMenu::onTouchEnd(uint8_t tag) {

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*********************
2-
* bio_main_menu.cpp *
3-
*********************/
1+
/*****************
2+
* main_menu.cpp *
3+
*****************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*******************************
2-
* bio_printing_dialog_box.cpp *
3-
*******************************/
1+
/***************************
2+
* printing_dialog_box.cpp *
3+
***************************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*****************************
2-
* bio_printing_dialog_box.h *
3-
*****************************/
1+
/*************************
2+
* printing_dialog_box.h *
3+
*************************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ enum {
9696
#include "../generic/z_offset_screen.h"
9797
#include "../generic/files_screen.h"
9898

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"

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*************************
2-
* bio_status_screen.cpp *
3-
*************************/
1+
/*********************
2+
* status_screen.cpp *
3+
*********************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*************************
2-
* bio_status_screen.cpp *
3-
*************************/
1+
/*********************
2+
* status_screen.cpp *
3+
*********************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*********************
2-
* bio_tune_menu.cpp *
3-
*********************/
1+
/*****************
2+
* tune_menu.cpp *
3+
*****************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *
@@ -29,10 +29,10 @@ using namespace FTDI;
2929
using namespace Theme;
3030
using namespace ExtUI;
3131

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
3534

35+
void TuneMenu::onRedraw(draw_mode_t what) {
3636
if (what & BACKGROUND) {
3737
CommandProcessor cmd;
3838
cmd.cmd(CLEAR_COLOR_RGB(bg_color))
@@ -56,8 +56,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
5656
.enabled(!isPrinting()).tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
5757
.colors(action_btn) .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
5858
}
59-
#undef GRID_COLS
60-
#undef GRID_ROWS
6159
}
6260

6361
bool TuneMenu::onTouchEnd(uint8_t tag) {

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*******************
2-
* bio_tune_menu.h *
3-
*******************/
1+
/***************
2+
* tune_menu.h *
3+
***************/
44

55
/****************************************************************************
66
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/******************
2+
* ui_landscape.h *
3+
******************/
14

25
/****************************************************************************
36
* This program is free software: you can redistribute it and/or modify *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/*****************
2+
* ui_portrait.h *
3+
*****************/
14

25
/****************************************************************************
36
* This program is free software: you can redistribute it and/or modify *

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ using namespace FTDI;
2929
using namespace ExtUI;
3030
using namespace Theme;
3131

32-
#define GRID_ROWS 4
3332
#define GRID_COLS 3
33+
#define GRID_ROWS 4
3434
#define STEPS_PER_MM_POS BTN_POS(1,1), BTN_SIZE(1,1)
3535
#define TMC_CURRENT_POS BTN_POS(2,1), BTN_SIZE(1,1)
3636
#define LIN_ADVANCE_POS BTN_POS(3,1), BTN_SIZE(1,1)
@@ -53,11 +53,11 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
5353
if (what & FOREGROUND) {
5454
CommandProcessor cmd;
5555
cmd.colors(normal_btn)
56-
.font(Theme::font_medium)
56+
.font(Theme::font_medium)
5757
.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))
5959
.tag(3) .button(TMC_CURRENT_POS, GET_TEXT_F(MSG_TMC_CURRENT))
60-
.enabled(ENABLED(LIN_ADVANCE))
60+
.enabled(ENABLED(LIN_ADVANCE))
6161
.tag(4) .button(LIN_ADVANCE_POS, GET_TEXT_F(MSG_LINEAR_ADVANCE))
6262
.tag(5) .button(VELOCITY_POS, GET_TEXT_F(MSG_VELOCITY))
6363
.tag(6) .button(ACCELERATION_POS, GET_TEXT_F(MSG_ACCELERATION))
@@ -66,7 +66,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
6666
.tag(9) .button(INTERFACE_POS, GET_TEXT_F(MSG_INTERFACE))
6767
.tag(10).button(DISPLAY_POS, GET_TEXT_F(MSG_DISPLAY_MENU))
6868
.tag(11).button(RESTORE_DEFAULTS_POS, GET_TEXT_F(MSG_RESTORE_DEFAULTS))
69-
.colors(action_btn)
69+
.colors(action_btn)
7070
.tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
7171
}
7272
}

0 commit comments

Comments
 (0)