Improve hybrid threshold data type #189

Author: Sebazzz

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

@@ -293,6 +293,23 @@ class DGUSScreenHandler {
     }
   }
 
+   static void DGUSLCD_SendULongToDisplay(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_ReceiveULongFromDisplay(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*)var.memadr = swap32(incomingValue); 
+    }
+  }
+
   // Toggle a boolean at the specified memory address
   static void DGUSLCD_ToggleBoolean(DGUS_VP_Variable &var, void *val_ptr) {
     if (var.memadr) {

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

@@ -38,7 +38,7 @@ bool AxisSettingsHandler::has_tmc_settings = false;
 
 uint16_t AxisSettingsHandler::tmc_current;
 bool AxisSettingsHandler::stealthchop;
-uint16_t AxisSettingsHandler::hybrid_threshold;
+uint32_t AxisSettingsHandler::hybrid_threshold;
 
 void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr) {
     switch (uInt16Value(val_ptr)) {
@@ -79,7 +79,7 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
             stealthchop = stepperX.get_stored_stealthChop();
 
             #if ENABLED(HYBRID_THRESHOLD)
-            hybrid_threshold = static_cast<uint16_t>(stepperX.get_pwm_thrs());
+            hybrid_threshold = static_cast<uint32_t>(stepperX.get_pwm_thrs());
             #endif
             #endif
             break;
@@ -93,7 +93,7 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
             stealthchop = stepperY.get_stored_stealthChop();
 
             #if ENABLED(HYBRID_THRESHOLD)
-            hybrid_threshold = static_cast<uint16_t>(stepperY.get_pwm_thrs());
+            hybrid_threshold = static_cast<uint32_t>(stepperY.get_pwm_thrs());
             #endif
             #endif
             break;
@@ -107,7 +107,7 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
             stealthchop = stepperZ.get_stored_stealthChop();
 
             #if ENABLED(HYBRID_THRESHOLD)
-            hybrid_threshold = static_cast<uint16_t>(stepperZ.get_pwm_thrs());
+            hybrid_threshold = static_cast<uint32_t>(stepperZ.get_pwm_thrs());
             #endif
             #endif
             break;
@@ -121,7 +121,7 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
             stealthchop = stepperE0.get_stored_stealthChop();
 
             #if ENABLED(HYBRID_THRESHOLD)
-            hybrid_threshold = static_cast<uint16_t>(stepperE0.get_pwm_thrs());
+            hybrid_threshold = static_cast<uint32_t>(stepperE0.get_pwm_thrs());
             #endif
             #endif
             break;

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

@@ -16,7 +16,7 @@ class AxisSettingsHandler {
         static bool has_tmc_settings;
         static uint16_t tmc_current;
         static bool stealthchop;
-        static uint16_t hybrid_threshold;
+        static uint32_t hybrid_threshold;
 
     public:
         static void HandleNavigation(DGUS_VP_Variable &var, void *val_ptr);

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

@@ -507,7 +507,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_AXIS_SETTINGS_AXIS_TMCCURRENT, &AxisSettingsHandler::tmc_current, ScreenHandler.DGUSLCD_SetValueDirectly<uint16_t>, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
   VPHELPER(VP_AXIS_SETTINGS_AXIS_TMCSTEALTHCHOP_BUTTON, &AxisSettingsHandler::stealthchop, ScreenHandler.DGUSLCD_ToggleBoolean, nullptr),
   VPHELPER(VP_AXIS_SETTINGS_AXIS_TMCSTEALTHCHOP_ICON, &AxisSettingsHandler::stealthchop, nullptr, (ScreenHandler.DGUSLCD_SendIconValue<ICON_TOGGLE_ON, ICON_TOGGLE_OFF>)),
-  VPHELPER(VP_AXIS_SETTINGS_AXIS_TMCHYBRIDTHRESHOLD, &AxisSettingsHandler::hybrid_threshold, ScreenHandler.DGUSLCD_SetValueDirectly<uint16_t>, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_AXIS_SETTINGS_AXIS_TMCHYBRIDTHRESHOLD, &AxisSettingsHandler::hybrid_threshold, ScreenHandler.DGUSLCD_ReceiveULongFromDisplay, ScreenHandler.DGUSLCD_SendULongToDisplay),
 
   VPHELPER(VP_AXIS_TMC_NAV_ICON, &AxisSettingsHandler::has_tmc_settings,  nullptr, (ScreenHandler.DGUSLCD_SendIconValue<AXIS_TMC_NAV_ICON_SHOWING, AXIS_TMC_NAV_ICON_HIDING>)),