zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Ludy 2022-04-18 11:43:34 +02:00 committed by Scott Lahteine
parent ce0af56d0a
commit 4ae54a6229
43 changed files with 155 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View file

@ -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

62
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
View file

@ -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;
@ -39,57 +42,29 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
CommandProcessor cmd;
cmd.colors(normal_btn)
.font(Theme::font_medium)
#define GRID_ROWS 9
#define GRID_COLS 2
.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)
.tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
#undef GRID_COLS
#undef GRID_ROWS
}
}
@ -107,17 +82,10 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
#if HAS_MULTI_HOTEND
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;
#endif
@ -126,9 +94,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
#endif
case 13: GOTO_SCREEN(InterfaceSettingsScreen); break;
case 14: GOTO_SCREEN(RestoreFailsafeDialogBox); break;
default:
return false;
default: return false;
}
return true;
}

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
View file

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

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
View file

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

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
View file

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

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
View file

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

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
View file

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

14
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
View file

@ -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;
void MainMenu::onRedraw(draw_mode_t what) {
#define GRID_ROWS 10
#define GRID_COLS 2
#define GRID_ROWS 10
void MainMenu::onRedraw(draw_mode_t what) {
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) {

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
View file

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

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
View file

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

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
View file

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

14
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h
View file

@ -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"

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
View file

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

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
View file

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

12
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
View file

@ -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_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) {

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
View file

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

3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
View file

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

3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
View file

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

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
View file

@ -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)

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
View file

@ -33,8 +33,8 @@ using namespace FTDI;
using namespace ExtUI;
using namespace Theme;
#define GRID_ROWS 5
#define GRID_COLS 3
#define GRID_ROWS 5
#define BED_MESH_TITLE_POS BTN_POS(1,1), BTN_SIZE(3,1)
#define PROBE_BED_POS BTN_POS(1,2), BTN_SIZE(1,1)
#define SHOW_MESH_POS BTN_POS(2,2), BTN_SIZE(1,1)

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
View file

@ -29,8 +29,8 @@
using namespace FTDI;
using namespace Theme;
#define GRID_ROWS 6
#define GRID_COLS 2
#define GRID_ROWS 6
#define ZPROBE_ZOFFSET_POS BTN_POS(1,1), BTN_SIZE(1,1)
#define MOVE_XYZ_POS BTN_POS(1,2), BTN_SIZE(1,1)
@ -64,7 +64,7 @@ void MainMenu::onRedraw(draw_mode_t what) {
.tag( 7).button(FLOW_POS, GET_TEXT_F(MSG_FLOW))
.tag( 8).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
.tag( 9).button(DISABLE_STEPPERS_POS, GET_TEXT_F(MSG_DISABLE_STEPPERS))
.enabled(HAS_LEVELING)
.enabled(ENABLED(HAS_LEVELING))
.tag(10).button(LEVELING_POS, GET_TEXT_F(MSG_LEVELING))
.tag(11).button(ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU))
.colors(action_btn)

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
View file

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

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
View file

@ -74,7 +74,7 @@
return val;
}
utf8_char_t FTDI::get_utf8_char_and_inc(char *&c) {
utf8_char_t FTDI::get_utf8_char_and_inc(const char *&c) {
utf8_char_t val = *(uint8_t*)c++;
if ((val & 0xC0) == 0xC0)
while ((*c & 0xC0) == 0x80)

2
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) {
#define BACK_POS BTN_POS(1,8), BTN_SIZE(2,1)
#endif
#else
#define GRID_ROWS 6
#define GRID_COLS 3
#define GRID_ROWS 6
#define ZPROBE_ZOFFSET_POS BTN_POS(1,1), BTN_SIZE(1,1)
#define CASE_LIGHT_POS BTN_POS(1,4), BTN_SIZE(1,1)
#define STEPS_PER_MM_POS BTN_POS(2,1), BTN_SIZE(1,1)

4
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) {
#endif
#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_ROWS 11
#define GRID_COLS (1 + _MORE_THAN_TEN)
#define GRID_ROWS 11
#define USER_ITEM_POS(N) BTN_POS((1+((N-1)/10)), ((N-1) % 10 + 1)), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(1,11), BTN_SIZE(1,1)
#else
@ -64,8 +64,8 @@ void CustomUserMenus::onRedraw(draw_mode_t what) {
#else
#define _MORE_THAN_FIVE 0
#endif
#define GRID_ROWS 6
#define GRID_COLS (1 + _MORE_THAN_FIVE + _MORE_THAN_TEN + _MORE_THAN_FIFTEEN)
#define GRID_ROWS 6
#define USER_ITEM_POS(N) BTN_POS((1+((N-1)/5)), ((N-1) % 5 + 1)), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(1,6), BTN_SIZE(GRID_COLS,1)
#endif

4
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) {
cmd.cmd(COLOR_RGB(bg_text_enabled));
#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_ROWS 10
#define GRID_COLS 1
#define GRID_ROWS 10
cmd.font(font_large) .text ( BTN_POS(1,1), BTN_SIZE(1,1), F("Developer Menu"))
.colors(normal_btn)
.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) {
.tag(1).colors(action_btn)
.button(BTN_POS(1,10), BTN_SIZE(1,1), F("Back"));
#else
#define GRID_ROWS 6
#define GRID_COLS 2
#define GRID_ROWS 6
cmd.font(font_medium) .text ( BTN_POS(1,1), BTN_SIZE(2,1), F("Developer Menu"))
.colors(normal_btn)
.tag(2).font(font_small) .button(BTN_POS(1,2), BTN_SIZE(1,1), F("Show All Widgets"))

24
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
View file

@ -37,6 +37,13 @@ void EndstopStatesScreen::onExit() {
BaseScreen::onExit();
}
#define GRID_COLS 6
#define GRID_ROWS 7
#define PIN_BTN(X,Y,PIN,LABEL) button(BTN_POS(X,Y), BTN_SIZE(2,1), LABEL)
#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);
#define PIN_DISABLED(X,Y,LABEL,PIN) cmd.enabled(0).PIN_BTN(X,Y,PIN,LABEL);
void EndstopStatesScreen::onRedraw(draw_mode_t) {
CommandProcessor cmd;
cmd.cmd(CLEAR_COLOR_RGB(bg_color))
@ -44,20 +51,7 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
.cmd(CLEAR(true,true,true))
.tag(0);
#define GRID_ROWS 7
#define GRID_COLS 6
#define PIN_BTN(X,Y,PIN,LABEL) button(BTN_POS(X,Y), BTN_SIZE(2,1), LABEL)
#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);
#define PIN_DISABLED(X,Y,LABEL,PIN) cmd.enabled(0).PIN_BTN(X,Y,PIN,LABEL);
cmd.font(
#if ENABLED(TOUCH_UI_PORTRAIT)
font_large
#else
font_medium
#endif
)
cmd.font(TERN(TOUCH_UI_PORTRAIT, font_large, font_medium))
.text(BTN_POS(1,1), BTN_SIZE(6,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
.font(font_tiny);
#if HAS_X_MAX
@ -121,8 +115,6 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
cmd.font(font_medium)
.colors(action_btn)
.tag(1).button(BTN_POS(1,7), BTN_SIZE(6,1), GET_TEXT_F(MSG_BUTTON_DONE));
#undef GRID_COLS
#undef GRID_ROWS
}
bool EndstopStatesScreen::onTouchEnd(uint8_t tag) {

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
View file

@ -30,15 +30,15 @@ using namespace ExtUI;
using namespace Theme;
#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_ROWS 9
#define GRID_COLS 2
#define GRID_ROWS 9
#define TITLE_POS BTN_POS(1,1), BTN_SIZE(2,1)
#define RUNOUT_SENSOR_POS BTN_POS(1,2), BTN_SIZE(2,1)
#define LIN_ADVANCE_POS BTN_POS(1,3), BTN_SIZE(2,1)
#define BACK_POS BTN_POS(1,9), BTN_SIZE(2,1)
#else
#define GRID_ROWS 6
#define GRID_COLS 2
#define GRID_ROWS 6
#define TITLE_POS BTN_POS(1,1), BTN_SIZE(2,1)
#define RUNOUT_SENSOR_POS BTN_POS(1,2), BTN_SIZE(2,1)
#define LIN_ADVANCE_POS BTN_POS(1,3), BTN_SIZE(2,1)

11
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
View file

@ -52,14 +52,13 @@ void InterfaceSettingsScreen::onEntry() {
BaseScreen::onEntry();
}
#define GRID_COLS 4
#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 7, 6)
void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
CommandProcessor cmd;
if (what & BACKGROUND) {
#define GRID_COLS 4
#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 7, 6)
cmd.cmd(CLEAR_COLOR_RGB(bg_color))
.cmd(CLEAR(true,true,true))
.cmd(COLOR_RGB(bg_text_enabled))
@ -128,7 +127,7 @@ bool InterfaceSettingsScreen::onTouchEnd(uint8_t tag) {
LockScreen::disable();
break;
#endif
case 5: UIData::enable_animations(!UIData::animations_enabled());; break;
case 5: UIData::enable_animations(!UIData::animations_enabled()); break;
case 6: GOTO_SCREEN(InterfaceSoundsScreen); return true;
default:
return false;
@ -148,8 +147,6 @@ bool InterfaceSettingsScreen::onTouchStart(uint8_t tag) {
}
#undef EDGE_R
#define EDGE_R 0
#undef GRID_COLS
#undef GRID_ROWS
return true;
}

9
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
View file

@ -27,6 +27,9 @@
using namespace FTDI;
#define GRID_COLS 4
#define GRID_ROWS 8
// The kill screen is an oddball that happens after Marlin has killed the events
// loop. So we only have a show() method rather than onRedraw(). The KillScreen
// 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) {
.cmd(CLEAR(true,true,true))
.tag(0);
#define GRID_COLS 4
#define GRID_ROWS 8
cmd.font(Theme::font_large)
.cmd(COLOR_RGB(Theme::bg_text_enabled))
.text(BTN_POS(1,2), BTN_SIZE(4,1), message)
.text(BTN_POS(1,3), BTN_SIZE(4,1), GET_TEXT_F(MSG_HALTED))
.text(BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_PLEASE_RESET));
#undef GRID_COLS
#undef GRID_ROWS
cmd.cmd(DL::DL_DISPLAY)
.cmd(CMD_SWAP)
.execute();

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
View file

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

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
View file

@ -34,8 +34,8 @@ using namespace ExtUI;
using namespace Theme;
#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_ROWS 8
#define GRID_COLS 2
#define GRID_ROWS 8
#define LEVELING_TITLE_POS BTN_POS(1,1), BTN_SIZE(2,1)
#define LEVEL_AXIS_POS BTN_POS(1,2), BTN_SIZE(2,1)
#define BED_MESH_TITLE_POS BTN_POS(1,3), BTN_SIZE(2,1)
@ -48,8 +48,8 @@ using namespace Theme;
#define BLTOUCH_TEST_POS BTN_POS(2,7), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(1,8), BTN_SIZE(2,1)
#else
#define GRID_ROWS 6
#define GRID_COLS 3
#define GRID_ROWS 6
#define LEVELING_TITLE_POS BTN_POS(1,1), BTN_SIZE(3,1)
#define LEVEL_AXIS_POS BTN_POS(1,2), BTN_SIZE(3,1)
#define BED_MESH_TITLE_POS BTN_POS(1,3), BTN_SIZE(2,1)

14
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
View file

@ -39,6 +39,9 @@ void LockScreen::onEntry() {
BaseScreen::onEntry();
}
#define GRID_COLS 1
#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 10, 7)
void LockScreen::onRedraw(draw_mode_t what) {
CommandProcessor cmd;
@ -50,14 +53,6 @@ void LockScreen::onRedraw(draw_mode_t what) {
}
if (what & FOREGROUND) {
#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_COLS 1
#define GRID_ROWS 10
#else
#define GRID_COLS 1
#define GRID_ROWS 7
#endif
#undef MARGIN_T
#undef MARGIN_B
#define MARGIN_T 3
@ -108,9 +103,6 @@ void LockScreen::onRedraw(draw_mode_t what) {
#undef MARGIN_B
#define MARGIN_T MARGIN_DEFAULT
#define MARGIN_B MARGIN_DEFAULT
#undef GRID_COLS
#undef GRID_ROWS
}
}

8
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) {
}
#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_ROWS 8
#define GRID_COLS 2
#define GRID_ROWS 8
#define ABOUT_PRINTER_POS BTN_POS(1,1), BTN_SIZE(2,1)
#define ADVANCED_SETTINGS_POS BTN_POS(1,2), BTN_SIZE(2,1)
#if ENABLED(CUSTOM_MENU_MAIN)
@ -55,8 +55,8 @@ void MainMenu::onRedraw(draw_mode_t what) {
#define CLEAN_NOZZLE_POS BTN_POS(2,7), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(1,8), BTN_SIZE(2,1)
#else
#define GRID_ROWS 5
#define GRID_COLS 6
#define GRID_ROWS 5
#define ADVANCED_SETTINGS_POS BTN_POS(1,1), BTN_SIZE(3,1)
#define ABOUT_PRINTER_POS BTN_POS(4,1), BTN_SIZE(3,1)
#define AUTO_HOME_POS BTN_POS(1,2), BTN_SIZE(3,1)
@ -85,10 +85,10 @@ void MainMenu::onRedraw(draw_mode_t what) {
.tag( 4).button(MOVE_AXIS_POS, GET_TEXT_F(MSG_MOVE_AXIS))
.tag( 5).button(DISABLE_STEPPERS_POS,GET_TEXT_F(MSG_DISABLE_STEPPERS))
.tag( 6).button(TEMPERATURE_POS, GET_TEXT_F(MSG_TEMPERATURE))
.enabled(IF_DISABLED(TOUCH_UI_LULZBOT_BIO, 1))
.enabled(DISABLED(TOUCH_UI_LULZBOT_BIO))
.tag( 7).button(FILAMENTCHANGE_POS, GET_TEXT_F(MSG_FILAMENTCHANGE))
.tag( 8).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
.enabled(TERN_(HAS_LEVELING, 1))
.enabled(ENABLED(HAS_LEVELING))
.tag( 9).button(LEVELING_POS, GET_TEXT_F(MSG_LEVELING))
.tag(10).button(ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU))
#if ENABLED(CUSTOM_MENU_MAIN)

22
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
View file

@ -31,17 +31,12 @@
using namespace FTDI;
using namespace Theme;
#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_COLS 3
#define GRID_ROWS 16
#else
#define GRID_ROWS 16
#endif
void StatusScreen::draw_axis_position(draw_mode_t what) {
CommandProcessor cmd;
#define GRID_COLS 3
#if ENABLED(TOUCH_UI_PORTRAIT)
#define X_LBL_POS BTN_POS(1, 9), BTN_SIZE(1,2)
#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) {
.text(Y_VAL_POS, y_str)
.text(Z_VAL_POS, z_str);
}
#undef GRID_COLS
}
#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_COLS 8
#else
#define GRID_COLS 12
#endif
#undef GRID_COLS
#define GRID_COLS TERN(TOUCH_UI_PORTRAIT, 8, 12)
void StatusScreen::draw_temperature(draw_mode_t what) {
using namespace Theme;
@ -293,11 +283,10 @@ void StatusScreen::draw_progress(draw_mode_t what) {
.text(PROGRESS_POS, progress_str);
#endif
}
#undef GRID_COLS
}
void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
#undef GRID_COLS
#define GRID_COLS 4
if (what & FOREGROUND) {
using namespace ExtUI;
@ -321,10 +310,10 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
.colors(!has_media ? action_btn : normal_btn)
.tag(4).button(MENU_BTN_POS, GET_TEXT_F(MSG_BUTTON_MENU));
}
#undef GRID_COLS
}
void StatusScreen::draw_status_message(draw_mode_t what, const char *message) {
#undef GRID_COLS
#define GRID_COLS 1
#if ENABLED(TOUCH_UI_PORTRAIT)
@ -341,7 +330,6 @@ void StatusScreen::draw_status_message(draw_mode_t what, const char *message) {
draw_text_box(cmd, STATUS_POS, message, OPT_CENTER, font_large);
}
#undef GRID_COLS
}
void StatusScreen::setStatusMessage(FSTR_P message) {

7
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
View file

@ -28,6 +28,9 @@
using namespace FTDI;
using namespace Theme;
#define GRID_COLS 2
#define GRID_ROWS 7
void TouchRegistersScreen::onRedraw(draw_mode_t) {
const uint32_t T_Transform_A = CLCD::mem_read_32(CLCD::REG::TOUCH_TRANSFORM_A);
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) {
.cmd(CLEAR(true,true,true))
.tag(0);
#define GRID_ROWS 7
#define GRID_COLS 2
cmd.tag(0)
.font(font_xsmall)
.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) {
cmd.colors(action_btn).font(font_medium)
.tag(1).button(BTN_POS(2,7), BTN_SIZE(1,1), F("Back"));
#undef GRID_COLS
#undef GRID_ROWS
}
bool TouchRegistersScreen::onTouchEnd(uint8_t tag) {

9
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
View file

@ -30,6 +30,9 @@
using namespace FTDI;
using namespace Theme;
#define GRID_COLS 2
#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 9, 5)
void TuneMenu::onRedraw(draw_mode_t what) {
if (what & BACKGROUND) {
CommandProcessor cmd;
@ -38,8 +41,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
}
#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_ROWS 9
#define GRID_COLS 2
#define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(2,1)
#define FIL_CHANGE_POS BTN_POS(1,2), BTN_SIZE(2,1)
#define FILAMENT_POS BTN_POS(1,3), BTN_SIZE(2,1)
@ -51,8 +52,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
#define ADVANCED_SETTINGS_POS BTN_POS(1,9), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(2,9), BTN_SIZE(1,1)
#else
#define GRID_ROWS 5
#define GRID_COLS 2
#define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(1,1)
#define NUDGE_NOZ_POS BTN_POS(2,1), BTN_SIZE(1,1)
#define FIL_CHANGE_POS BTN_POS(1,2), BTN_SIZE(1,1)
@ -94,8 +93,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
.tag(1).colors(action_btn)
.button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
}
#undef GRID_COLS
#undef GRID_ROWS
}
bool TuneMenu::onTouchEnd(uint8_t tag) {

11
Marlin/src/lcd/language/language_de.h
View file

@ -87,6 +87,9 @@ namespace Language_de {
LSTR MSG_HOME_OFFSET_I = _UxGT("Homeversatz ") STR_I;
LSTR MSG_HOME_OFFSET_J = _UxGT("Homeversatz ") STR_J;
LSTR MSG_HOME_OFFSET_K = _UxGT("Homeversatz ") STR_K;
LSTR MSG_HOME_OFFSET_U = _UxGT("Homeversatz ") STR_U;
LSTR MSG_HOME_OFFSET_V = _UxGT("Homeversatz ") STR_V;
LSTR MSG_HOME_OFFSET_W = _UxGT("Homeversatz ") STR_W;
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Tramming Assistent");
LSTR MSG_SELECT_ORIGIN = _UxGT("Wählen Sie Ursprung");
@ -329,6 +332,14 @@ namespace Language_de {
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Autotune fehlge.! Falscher Extruder");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Autotune fehlge.! Temperatur zu hoch.");
LSTR MSG_PID_TIMEOUT = _UxGT("Autotune fehlge.! Timeout.");
LSTR MSG_MPC_MEASURING_AMBIENT = _UxGT("teste Wärmeverlust");
LSTR MSG_MPC_AUTOTUNE = _UxGT("Autotune MPC");
LSTR MSG_MPC_EDIT = _UxGT("MPC * bearbeiten");
LSTR MSG_MPC_POWER_E = _UxGT("* Leistung");
LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E = _UxGT("Block C *");
LSTR MSG_SENSOR_RESPONSIVENESS_E = _UxGT("Sensor res *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_E = _UxGT("Ambient h *");
LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E = _UxGT("Amb. h fan *");
LSTR MSG_SELECT = _UxGT("Auswählen");
LSTR MSG_SELECT_E = _UxGT("Auswählen *");
LSTR MSG_ACC = _UxGT("Beschleunigung");

2
Marlin/src/lcd/language/language_en.h
View file

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

2
Marlin/src/lcd/language/language_it.h
View file

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

2
Marlin/src/lcd/menu/menu_advanced.cpp
View file

@ -352,7 +352,7 @@ void menu_backlash();
#if ENABLED(MPC_INCLUDE_FAN)
#define MPC_EDIT_ITEMS(N) \
_MPC_EDIT_ITEMS(N); \
EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E, &editable.decimal, 0, 1, []{ \
EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_FAN_E, &editable.decimal, 0, 1, []{ \
MPC_t &c = thermalManager.temp_hotend[MenuItemBase::itemIndex].constants; \
c.fan255_adjustment = editable.decimal - c.ambient_xfer_coeff_fan0; \
})

2
Marlin/src/pins/rambo/pins_EINSY_RETRO.h
View file

@ -84,7 +84,7 @@
#endif
#define Z_MAX_PIN 7
#ifndef Z_MIN_PIN 7
#ifndef Z_MIN_PIN
#define Z_MIN_PIN 10 // Z-
#endif