Add basic infrastructure and navigation for axis settings #189

Author: Sebazzz

Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.h

@@ -36,9 +36,6 @@ struct creality_dwin_settings_t {
   int16_t standby_screen_brightness;
 };
 
-// endianness swap
-inline uint16_t swap16(const uint16_t value) { return (value & 0xffU) << 8U | (value >> 8U); }
-
 class DGUSScreenHandler {
 public:
   DGUSScreenHandler() = default;

Marlin/src/lcd/extui/lib/dgus_creality/DGUSVPVariable.h

@@ -47,3 +47,8 @@ struct DGUS_VP_Variable {
     return *this;
   }
 };
+
+// endianness swap
+FORCE_INLINE uint16_t swap16(const uint16_t value) { return (value & 0xffU) << 8U | (value >> 8U); }
+
+FORCE_INLINE uint16_t uInt16Value(void *val_ptr) { return swap16(*static_cast<uint16_t*>(val_ptr)); }

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

@@ -0,0 +1,51 @@
+
+#include "../../../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DGUS_LCD_UI_CREALITY_TOUCH)
+
+#include "../DGUSDisplayDef.h"
+#include "../DGUSDisplay.h"
+#include "../DGUSScreenHandler.h"
+
+#include "AxisSettingsHandler.h"
+
+#include "../../../ui_api.h"
+#include "../../../../marlinui.h"
+
+#include "../../../../../module/temperature.h"
+#include "../../../../../module/settings.h"
+#include "../../../../../module/planner.h"
+#include "../../../../../gcode/gcode.h"
+
+AxisEnum AxisSettingsHandler::current_axis;
+uint16_t AxisSettingsHandler::axis_settings_title_icon = ICON_AXIS_SETTINGS_TITLE_X;
+
+void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr) {
+    switch (uInt16Value(val_ptr)) {
+        case AXIS_SETTINGS_NAV_BUTTON_VAL_X:
+            current_axis = X_AXIS;
+            axis_settings_title_icon = ICON_AXIS_SETTINGS_TITLE_X;
+            break;
+
+        case AXIS_SETTINGS_NAV_BUTTON_VAL_Y:
+            current_axis = Y_AXIS;
+            axis_settings_title_icon = ICON_AXIS_SETTINGS_TITLE_Y;
+            break;
+
+        case AXIS_SETTINGS_NAV_BUTTON_VAL_Z:
+            current_axis = Z_AXIS;
+            axis_settings_title_icon = ICON_AXIS_SETTINGS_TITLE_Z;
+            break;
+
+        case AXIS_SETTINGS_NAV_BUTTON_VAL_E:
+            current_axis = E_AXIS;
+            axis_settings_title_icon = ICON_AXIS_SETTINGS_TITLE_E;
+            break;
+    }
+
+    ScreenHandler.GotoScreen(DGUSLCD_SCREEN_AXIS_SETTINGS_AXIS);
+
+    // TODO: load settings for axis
+}
+
+#endif

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

@@ -0,0 +1,15 @@
+#include <cstdint>
+
+class AxisSettingsHandler {
+    private:
+        static AxisEnum current_axis;
+
+    public:
+        static uint16_t axis_settings_title_icon;
+
+    public:
+        static void HandleNavigation(DGUS_VP_Variable &var, void *val_ptr);
+
+
+};
+

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

@@ -29,6 +29,7 @@
 #include "../DGUSDisplayDef.h"
 #include "../DGUSDisplay.h"
 #include "../DGUSScreenHandler.h"
+#include "../creality_touch/AxisSettingsHandler.h"
 #include "../creality_touch/EstepsHandler.h"
 #include "../creality_touch/PIDHandler.h"
 
@@ -283,6 +284,21 @@ const uint16_t VPList_LevelingSettings[] PROGMEM = {
   0x0000
 };
 
+const uint16_t VPList_AxisSettingsNav[] PROGMEM = {
+  VPList_CommonWithHeatOnly,
+
+  0x0000
+};
+
+const uint16_t VPList_AxisSettingsAxis[] PROGMEM = {
+  VPList_CommonWithHeatOnly,
+
+  VP_AXIS_SETTINGS_TITLE_ICON,
+
+  0x0000
+};
+
+
 // -- Mapping from screen to variable list
 const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_BOOT, VPList_None },
@@ -338,6 +354,9 @@ const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_ESTEPS_CALIBRATION_RESULTS, VPList_EstepsCalibration },
   { DGUSLCD_SCREEN_LEVELING_SETTINGS, VPList_LevelingSettings },
 
+  { DGUSLCD_SCREEN_AXIS_SETTINGS_NAV, VPList_AxisSettingsNav },
+  { DGUSLCD_SCREEN_AXIS_SETTINGS_AXIS , VPList_AxisSettingsAxis },
+
   { 0 , nullptr } // List is terminated with an nullptr as table entry.
 };
 
@@ -399,6 +418,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   VPHELPER(VP_GENERIC_BACK_BUTTON, nullptr, ScreenHandler.OnBackButton, nullptr),
 
+  // Axis settings
+  VPHELPER(VP_AXIS_SETTINGS_NAV_BUTTON, nullptr, AxisSettingsHandler::HandleNavigation, nullptr),
+  VPHELPER(VP_AXIS_SETTINGS_TITLE_ICON, &AxisSettingsHandler::axis_settings_title_icon, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay);
+
   // Preheat settings
   #ifdef PREHEAT_1_LABEL
   VPHELPER(VP_PREHEAT_PLA_HOTEND_TEMP, &ui.material_preset[0].hotend_temp, ScreenHandler.DGUSLCD_SetValueDirectly<int16_t>, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),

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

@@ -76,7 +76,10 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_TUNEFWRETRACT = 70,
 
   DGUSLCD_SCREEN_ESTEPS_CALIBRATION_RESULTS = 71,
-  DGUSLCD_SCREEN_LEVELING_SETTINGS = 72
+  DGUSLCD_SCREEN_LEVELING_SETTINGS = 72,
+
+  DGUSLCD_SCREEN_AXIS_SETTINGS_NAV = 73,
+  DGUSLCD_SCREEN_AXIS_SETTINGS_AXIS = 74
 };
 
 // Version checks
@@ -290,6 +293,19 @@ constexpr uint16_t VP_LED_TOGGLE = 0x101F;
 constexpr uint16_t VP_FEED_AMOUNT = 0x1054;
 constexpr uint16_t VP_FEED_PROGRESS = 0x108e;
 
+// Axis settings
+constexpr uint16_t VP_AXIS_SETTINGS_NAV_BUTTON = 0x22D9;
+constexpr uint16_t AXIS_SETTINGS_NAV_BUTTON_VAL_X = 1;
+constexpr uint16_t AXIS_SETTINGS_NAV_BUTTON_VAL_Y = 2;
+constexpr uint16_t AXIS_SETTINGS_NAV_BUTTON_VAL_Z = 3;
+constexpr uint16_t AXIS_SETTINGS_NAV_BUTTON_VAL_E = 4;
+
+constexpr uint16_t VP_AXIS_SETTINGS_TITLE_ICON = 0x22DB;
+constexpr uint16_t ICON_AXIS_SETTINGS_TITLE_X = 20;
+constexpr uint16_t ICON_AXIS_SETTINGS_TITLE_Y = 21;
+constexpr uint16_t ICON_AXIS_SETTINGS_TITLE_Z = 22;
+constexpr uint16_t ICON_AXIS_SETTINGS_TITLE_E = 23;
+
 // Mesh leveling
 constexpr uint16_t VP_MESH_SCREEN_MESSAGE_ICON = 0x22cb;
 constexpr uint16_t MESH_SCREEN_MESSAGE_ICON_LEVELING = 5;

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

@@ -477,9 +477,8 @@ void DGUSCrealityDisplay_HandleReturnKeyEvent(DGUS_VP_Variable &var, void *val_p
 
   while ((ret = (uint16_t*) pgm_read_ptr(&(map->Handler)))) {
     if ((map->ScreenID) == current_screen) {
-        unsigned short button_value = *static_cast<unsigned short*>(val_ptr);
-        button_value = (button_value & 0xffU) << 8U | (button_value >> 8U);
-
+        uint16_t button_value = uInt16Value(val_ptr);
+        
         SERIAL_ECHOPAIR("Invoking handler for screen ", current_screen);
         SERIAL_ECHOLNPAIR("with VP=", var.VP, " value=", button_value);