Add max feedrate to axis settings #189

Author: Sebazzz

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

@@ -23,6 +23,7 @@ uint16_t AxisSettingsHandler::axis_settings_title_icon = ICON_AXIS_SETTINGS_TITL
 float AxisSettingsHandler::axis_steps_mm;
 uint32_t AxisSettingsHandler::max_acceleration_mm_per_s2;
 float AxisSettingsHandler::jerk;
+feedRate_t AxisSettingsHandler::max_feedrate;
 
 void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr) {
     switch (uInt16Value(val_ptr)) {
@@ -53,13 +54,15 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
     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];
     IF_ENABLED(CLASSIC_JERK, jerk = planner.max_jerk[current_axis]);
+    max_feedrate = planner.settings.max_feedrate_mm_s[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;
     IF_ENABLED(CLASSIC_JERK, planner.max_jerk[current_axis] = jerk);
+    planner.settings.max_feedrate_mm_s[current_axis] = max_feedrate;
 
     // Save and pop
     ScreenHandler.PopToOldScreen();

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

@@ -11,6 +11,7 @@ class AxisSettingsHandler {
         static uint32_t max_acceleration_mm_per_s2;
 
         static float jerk;
+        static feedRate_t max_feedrate;
 
     public:
         static void HandleNavigation(DGUS_VP_Variable &var, void *val_ptr);

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

@@ -298,6 +298,7 @@ const uint16_t VPList_AxisSettingsAxis[] PROGMEM = {
   VP_AXIS_SETTINGS_AXIS_STEPSMM,
   VP_AXIS_SETTINGS_AXIS_MAX_ACCEL,
   VP_AXIS_SETTINGS_AXIS_JERK,
+  VP_AXIS_SETTINGS_AXIS_FEEDRATE,
 
   0x0000
 };
@@ -430,6 +431,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_AXIS_SETTINGS_AXIS_MAX_ACCEL, &AxisSettingsHandler::max_acceleration_mm_per_s2, ScreenHandler.DGUSLCD_ReceiveUint32LongFromDisplay, ScreenHandler.DGUSLCD_SendUint32LongToDisplay),
 
   VPHELPER(VP_AXIS_SETTINGS_AXIS_JERK, &AxisSettingsHandler::jerk, ScreenHandler.DGUSLCD_SetFloatAsIntFromDisplay<1>, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
+  VPHELPER(VP_AXIS_SETTINGS_AXIS_FEEDRATE, &AxisSettingsHandler::max_feedrate, ScreenHandler.DGUSLCD_SetFloatAsIntFromDisplay<1>, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
 
   VPHELPER(VP_AXIS_SETTINGS_NAV_BACKBUTTON, nullptr, AxisSettingsHandler::HandleBackNavigation, nullptr),
 

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

@@ -311,6 +311,7 @@ constexpr uint16_t VP_AXIS_SETTINGS_NAV_BACKBUTTON = 0x22DD;
 constexpr uint16_t VP_AXIS_SETTINGS_AXIS_STEPSMM = 0x22DF; // 2-byte
 constexpr uint16_t VP_AXIS_SETTINGS_AXIS_MAX_ACCEL = 0x22E1; // 4-byte (!)
 constexpr uint16_t VP_AXIS_SETTINGS_AXIS_JERK = 0x22E5; // 2-byte
+constexpr uint16_t VP_AXIS_SETTINGS_AXIS_FEEDRATE = 0x22E7; // 2-byte
 
 
 // Mesh leveling