Skip to content

Commit 2d5328c

Browse files
committed
Add axis settings navigation #189
1 parent 914a049 commit 2d5328c

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/AxisSettingsHandler.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,10 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
4848
// TODO: load settings for axis
4949
}
5050

51+
void AxisSettingsHandler::HandleBackNavigation(DGUS_VP_Variable &var, void *val_ptr) {
52+
// TODO: save settings for axis
53+
54+
ScreenHandler.PopToOldScreen();
55+
}
56+
5157
#endif

Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/AxisSettingsHandler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class AxisSettingsHandler {
99

1010
public:
1111
static void HandleNavigation(DGUS_VP_Variable &var, void *val_ptr);
12-
12+
static void HandleBackNavigation(DGUS_VP_Variable &var, void *val_ptr);
1313

1414
};
1515

Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,9 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
420420

421421
// Axis settings
422422
VPHELPER(VP_AXIS_SETTINGS_NAV_BUTTON, nullptr, AxisSettingsHandler::HandleNavigation, nullptr),
423-
VPHELPER(VP_AXIS_SETTINGS_TITLE_ICON, &AxisSettingsHandler::axis_settings_title_icon, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay);
423+
VPHELPER(VP_AXIS_SETTINGS_TITLE_ICON, &AxisSettingsHandler::axis_settings_title_icon, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
424+
425+
VPHELPER(VP_AXIS_SETTINGS_NAV_BACKBUTTON, nullptr, AxisSettingsHandler::HandleBackNavigation, nullptr),
424426

425427
// Preheat settings
426428
#ifdef PREHEAT_1_LABEL

Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.h

+2
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@ constexpr uint16_t ICON_AXIS_SETTINGS_TITLE_Y = 21;
306306
constexpr uint16_t ICON_AXIS_SETTINGS_TITLE_Z = 22;
307307
constexpr uint16_t ICON_AXIS_SETTINGS_TITLE_E = 23;
308308

309+
constexpr uint16_t VP_AXIS_SETTINGS_NAV_BACKBUTTON = 0x22DD;
310+
309311
// Mesh leveling
310312
constexpr uint16_t VP_MESH_SCREEN_MESSAGE_ICON = 0x22cb;
311313
constexpr uint16_t MESH_SCREEN_MESSAGE_ICON_LEVELING = 5;

0 commit comments

Comments
 (0)