Browse Source

Change Junction Deviation to Classic Jerk (#15505)

Robby Candra 5 years ago
parent
commit
ac466ecf74
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      Marlin/src/module/configuration_store.cpp

+ 5
- 5
Marlin/src/module/configuration_store.cpp View File

525
         EEPROM_WRITE(planner_max_jerk);
525
         EEPROM_WRITE(planner_max_jerk);
526
       #endif
526
       #endif
527
 
527
 
528
-      #if ENABLED(JUNCTION_DEVIATION)
528
+      #if DISABLED(CLASSIC_JERK)
529
         EEPROM_WRITE(planner.junction_deviation_mm);
529
         EEPROM_WRITE(planner.junction_deviation_mm);
530
       #else
530
       #else
531
         dummy = 0.02f;
531
         dummy = 0.02f;
1323
           for (uint8_t q = 4; q--;) EEPROM_READ(dummy);
1323
           for (uint8_t q = 4; q--;) EEPROM_READ(dummy);
1324
         #endif
1324
         #endif
1325
 
1325
 
1326
-        #if ENABLED(JUNCTION_DEVIATION)
1326
+        #if DISABLED(CLASSIC_JERK)
1327
           EEPROM_READ(planner.junction_deviation_mm);
1327
           EEPROM_READ(planner.junction_deviation_mm);
1328
         #else
1328
         #else
1329
           EEPROM_READ(dummy);
1329
           EEPROM_READ(dummy);
2235
     #endif
2235
     #endif
2236
   #endif
2236
   #endif
2237
 
2237
 
2238
-  #if ENABLED(JUNCTION_DEVIATION)
2238
+  #if DISABLED(CLASSIC_JERK)
2239
     planner.junction_deviation_mm = float(JUNCTION_DEVIATION_MM);
2239
     planner.junction_deviation_mm = float(JUNCTION_DEVIATION_MM);
2240
   #endif
2240
   #endif
2241
 
2241
 
2744
     if (!forReplay) {
2744
     if (!forReplay) {
2745
       CONFIG_ECHO_START();
2745
       CONFIG_ECHO_START();
2746
       SERIAL_ECHOPGM("Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>");
2746
       SERIAL_ECHOPGM("Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>");
2747
-      #if ENABLED(JUNCTION_DEVIATION)
2747
+      #if DISABLED(CLASSIC_JERK)
2748
         SERIAL_ECHOPGM(" J<junc_dev>");
2748
         SERIAL_ECHOPGM(" J<junc_dev>");
2749
       #endif
2749
       #endif
2750
       #if HAS_CLASSIC_JERK
2750
       #if HAS_CLASSIC_JERK
2760
         "  M205 B", LINEAR_UNIT(planner.settings.min_segment_time_us)
2760
         "  M205 B", LINEAR_UNIT(planner.settings.min_segment_time_us)
2761
       , " S", LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
2761
       , " S", LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
2762
       , " T", LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
2762
       , " T", LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
2763
-      #if ENABLED(JUNCTION_DEVIATION)
2763
+      #if DISABLED(CLASSIC_JERK)
2764
         , " J", LINEAR_UNIT(planner.junction_deviation_mm)
2764
         , " J", LINEAR_UNIT(planner.junction_deviation_mm)
2765
       #endif
2765
       #endif
2766
       #if HAS_CLASSIC_JERK
2766
       #if HAS_CLASSIC_JERK

Loading…
Cancel
Save