Add steps/mm to axis screen #189

Author: Sebazzz

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

@@ -20,6 +20,8 @@
 AxisEnum AxisSettingsHandler::current_axis;
 uint16_t AxisSettingsHandler::axis_settings_title_icon = ICON_AXIS_SETTINGS_TITLE_X;
 
+float AxisSettingsHandler::axis_steps_mm;
+
 void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr) {
     switch (uInt16Value(val_ptr)) {
         case AXIS_SETTINGS_NAV_BUTTON_VAL_X:
@@ -45,11 +47,13 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
 
     ScreenHandler.GotoScreen(DGUSLCD_SCREEN_AXIS_SETTINGS_AXIS);
 
-    // TODO: load settings for axis
+    // Load settings for axis
+    axis_steps_mm = planner.settings.axis_steps_per_mm[current_axis];
 }
 
 void AxisSettingsHandler::HandleBackNavigation(DGUS_VP_Variable &var, void *val_ptr) {
-    // TODO: save settings for axis
+    // Save settings for axis
+    planner.settings.axis_steps_per_mm[current_axis] = axis_steps_mm;
 
     ScreenHandler.PopToOldScreen();
 }

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

@@ -7,6 +7,8 @@ class AxisSettingsHandler {
     public:
         static uint16_t axis_settings_title_icon;
 
+        static float axis_steps_mm;
+
     public:
         static void HandleNavigation(DGUS_VP_Variable &var, void *val_ptr);
         static void HandleBackNavigation(DGUS_VP_Variable &var, void *val_ptr);

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

@@ -285,7 +285,7 @@ const uint16_t VPList_LevelingSettings[] PROGMEM = {
 };
 
 const uint16_t VPList_AxisSettingsNav[] PROGMEM = {
-  VPList_CommonWithHeatOnly,
+  VPList_CommonWithStatus,
 
   0x0000
 };
@@ -295,6 +295,8 @@ const uint16_t VPList_AxisSettingsAxis[] PROGMEM = {
 
   VP_AXIS_SETTINGS_TITLE_ICON,
 
+  VP_AXIS_SETTINGS_AXIS_STEPSMM,
+
   0x0000
 };
 
@@ -422,6 +424,9 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   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),
 
+  VPHELPER(VP_AXIS_SETTINGS_AXIS_STEPSMM, &AxisSettingsHandler::axis_steps_mm, ScreenHandler.DGUSLCD_SetFloatAsIntFromDisplay<1>, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
+  
+
   VPHELPER(VP_AXIS_SETTINGS_NAV_BACKBUTTON, nullptr, AxisSettingsHandler::HandleBackNavigation, nullptr),
 
   // Preheat settings

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

@@ -308,6 +308,9 @@ constexpr uint16_t ICON_AXIS_SETTINGS_TITLE_E = 23;
 
 constexpr uint16_t VP_AXIS_SETTINGS_NAV_BACKBUTTON = 0x22DD;
 
+constexpr uint16_t VP_AXIS_SETTINGS_AXIS_STEPSMM = 0x22DF;
+
+
 // Mesh leveling
 constexpr uint16_t VP_MESH_SCREEN_MESSAGE_ICON = 0x22cb;
 constexpr uint16_t MESH_SCREEN_MESSAGE_ICON_LEVELING = 5;