Add max accelerations to axis screen #189

Author: Sebazzz

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

@@ -321,6 +321,22 @@ class DGUSScreenHandler {
     //dgusdisplay.SetVariableAppendText(var.VP, suffix);
   }
 
+  static void DGUSLCD_SendUint32LongToDisplay(DGUS_VP_Variable &var) {
+    if (var.memadr) {
+      // Round - truncated values look like skipped numbers
+      long roundedValue = *(uint32_t *) var.memadr;
+      dgusdisplay.WriteVariable(var.VP, roundedValue);
+    }
+  }
+
+  static void DGUSLCD_ReceiveUint32LongFromDisplay(DGUS_VP_Variable &var, void* val_ptr) {
+    if (var.memadr) {
+      // Round - truncated values look like skipped numbers
+      uint32_t incomingValue = *(uint32_t *) val_ptr;
+
+      *(uint32_t*)val_ptr = swap32(incomingValue); 
+    }
+  }
 
   /// Force an update of all VP on the current screen.
   static inline void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }

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

@@ -51,4 +51,6 @@ struct DGUS_VP_Variable {
 // endianness swap
 FORCE_INLINE uint16_t swap16(const uint16_t value) { return (value & 0xffU) << 8U | (value >> 8U); }
 
+FORCE_INLINE uint32_t swap32(const uint32_t value) { return ((value>>24)&0xff) |  ((value<<8)&0xff0000) | ((value>>8)&0xff00) | ((value<<24)&0xff000000); }
+
 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

@@ -21,6 +21,7 @@ AxisEnum AxisSettingsHandler::current_axis;
 uint16_t AxisSettingsHandler::axis_settings_title_icon = ICON_AXIS_SETTINGS_TITLE_X;
 
 float AxisSettingsHandler::axis_steps_mm;
+uint32_t AxisSettingsHandler::max_acceleration_mm_per_s2;
 
 void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr) {
     switch (uInt16Value(val_ptr)) {
@@ -49,13 +50,18 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
 
     // Load settings for axis
     axis_steps_mm = planner.settings.axis_steps_per_mm[current_axis];
+    max_acceleration_mm_per_s2 = planner.settings.max_acceleration_mm_per_s2[current_axis];
 }
 
 void AxisSettingsHandler::HandleBackNavigation(DGUS_VP_Variable &var, void *val_ptr) {
     // Save settings for axis
     planner.settings.axis_steps_per_mm[current_axis] = axis_steps_mm;
+    planner.settings.max_acceleration_mm_per_s2[current_axis] = max_acceleration_mm_per_s2;
 
+    // Save and pop
     ScreenHandler.PopToOldScreen();
+
+    settings.save();
 }
 
 #endif

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

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

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

@@ -296,6 +296,7 @@ const uint16_t VPList_AxisSettingsAxis[] PROGMEM = {
   VP_AXIS_SETTINGS_TITLE_ICON,
 
   VP_AXIS_SETTINGS_AXIS_STEPSMM,
+  VP_AXIS_SETTINGS_AXIS_MAX_ACCEL,
 
   0x0000
 };
@@ -425,6 +426,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   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_AXIS_MAX_ACCEL, &AxisSettingsHandler::max_acceleration_mm_per_s2, ScreenHandler.DGUSLCD_ReceiveUint32LongFromDisplay, ScreenHandler.DGUSLCD_SendUint32LongToDisplay),
 
 
   VPHELPER(VP_AXIS_SETTINGS_NAV_BACKBUTTON, nullptr, AxisSettingsHandler::HandleBackNavigation, nullptr),

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

@@ -308,7 +308,8 @@ 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;
+constexpr uint16_t VP_AXIS_SETTINGS_AXIS_STEPSMM = 0x22DF; // 2-byte
+constexpr uint16_t VP_AXIS_SETTINGS_AXIS_MAX_ACCEL = 0x22E1; // 4-byte (!)
 
 
 // Mesh leveling