Browse Source

Patch type for max_acceleration_mm_per_s2 save/restore

Scott Lahteine 8 years ago
parent
commit
0d0aa6c20d
2 changed files with 5 additions and 5 deletions
  1. 3
    3
      Marlin/configuration_store.cpp
  2. 2
    2
      Marlin/planner.h

+ 3
- 3
Marlin/configuration_store.cpp View File

479
       // Get only the number of E stepper parameters previously stored
479
       // Get only the number of E stepper parameters previously stored
480
       // Any steppers added later are set to their defaults
480
       // Any steppers added later are set to their defaults
481
       const float def1[] = DEFAULT_AXIS_STEPS_PER_UNIT, def2[] = DEFAULT_MAX_FEEDRATE;
481
       const float def1[] = DEFAULT_AXIS_STEPS_PER_UNIT, def2[] = DEFAULT_MAX_FEEDRATE;
482
-      const long def3[] = DEFAULT_MAX_ACCELERATION;
482
+      const uint32_t def3[] = DEFAULT_MAX_ACCELERATION;
483
       float tmp1[XYZ + esteppers], tmp2[XYZ + esteppers];
483
       float tmp1[XYZ + esteppers], tmp2[XYZ + esteppers];
484
-      long tmp3[XYZ + esteppers];
484
+      uint32_t tmp3[XYZ + esteppers];
485
       EEPROM_READ(tmp1);
485
       EEPROM_READ(tmp1);
486
       EEPROM_READ(tmp2);
486
       EEPROM_READ(tmp2);
487
       EEPROM_READ(tmp3);
487
       EEPROM_READ(tmp3);
710
  */
710
  */
711
 void Config_ResetDefault() {
711
 void Config_ResetDefault() {
712
   const float tmp1[] = DEFAULT_AXIS_STEPS_PER_UNIT, tmp2[] = DEFAULT_MAX_FEEDRATE;
712
   const float tmp1[] = DEFAULT_AXIS_STEPS_PER_UNIT, tmp2[] = DEFAULT_MAX_FEEDRATE;
713
-  const long tmp3[] = DEFAULT_MAX_ACCELERATION;
713
+  const uint32_t tmp3[] = DEFAULT_MAX_ACCELERATION;
714
   LOOP_XYZE_N(i) {
714
   LOOP_XYZE_N(i) {
715
     planner.axis_steps_per_mm[i]          = tmp1[i < COUNT(tmp1) ? i : COUNT(tmp1) - 1];
715
     planner.axis_steps_per_mm[i]          = tmp1[i < COUNT(tmp1) ? i : COUNT(tmp1) - 1];
716
     planner.max_feedrate_mm_s[i]          = tmp2[i < COUNT(tmp2) ? i : COUNT(tmp2) - 1];
716
     planner.max_feedrate_mm_s[i]          = tmp2[i < COUNT(tmp2) ? i : COUNT(tmp2) - 1];

+ 2
- 2
Marlin/planner.h View File

148
     static float max_feedrate_mm_s[XYZE_N],     // Max speeds in mm per second
148
     static float max_feedrate_mm_s[XYZE_N],     // Max speeds in mm per second
149
                  axis_steps_per_mm[XYZE_N],
149
                  axis_steps_per_mm[XYZE_N],
150
                  steps_to_mm[XYZE_N];
150
                  steps_to_mm[XYZE_N];
151
-    static unsigned long max_acceleration_steps_per_s2[XYZE_N],
152
-                         max_acceleration_mm_per_s2[XYZE_N]; // Use M201 to override by software
151
+    static uint32_t max_acceleration_steps_per_s2[XYZE_N],
152
+                    max_acceleration_mm_per_s2[XYZE_N]; // Use M201 to override by software
153
 
153
 
154
     static millis_t min_segment_time;
154
     static millis_t min_segment_time;
155
     static float min_feedrate_mm_s,
155
     static float min_feedrate_mm_s,

Loading…
Cancel
Save