瀏覽代碼

Followup to VORON

Scott Lahteine 6 年之前
父節點
當前提交
288340cb6c

+ 15
- 4
Marlin/src/config/examples/VORONDesign/Configuration.h 查看文件

678
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
678
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
679
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
679
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
680
 
680
 
681
+//
682
+// Use Junction Deviation instead of traditional Jerk Limiting
683
+//
684
+//#define JUNCTION_DEVIATION
685
+#if ENABLED(JUNCTION_DEVIATION)
686
+  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
687
+#endif
688
+
681
 /**
689
 /**
682
  * Default Jerk (mm/s)
690
  * Default Jerk (mm/s)
683
  * Override with M205 X Y Z E
691
  * Override with M205 X Y Z E
686
  * When changing speed and direction, if the difference is less than the
694
  * When changing speed and direction, if the difference is less than the
687
  * value set here, it may happen instantaneously.
695
  * value set here, it may happen instantaneously.
688
  */
696
  */
689
-#define DEFAULT_XJERK                 20.0
690
-#define DEFAULT_YJERK                 15.0
691
-#define DEFAULT_ZJERK                  0.4
692
-#define DEFAULT_EJERK                  5.0
697
+#if DISABLED(JUNCTION_DEVIATION)
698
+  #define DEFAULT_XJERK 20.0
699
+  #define DEFAULT_YJERK 15.0
700
+  #define DEFAULT_ZJERK  0.4
701
+#endif
702
+
703
+#define DEFAULT_EJERK    5.0  // May be used by Linear Advance
693
 
704
 
694
 /**
705
 /**
695
  * S-Curve Acceleration
706
  * S-Curve Acceleration

+ 1
- 9
Marlin/src/config/examples/VORONDesign/Configuration_adv.h 查看文件

483
 #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
483
 #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
484
 
484
 
485
 //
485
 //
486
-// Use Junction Deviation instead of traditional Jerk Limiting
487
-//
488
-//#define JUNCTION_DEVIATION
489
-#if ENABLED(JUNCTION_DEVIATION)
490
-  #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
491
-#endif
492
-
493
-//
494
 // Backlash Compensation
486
 // Backlash Compensation
495
 // Adds extra movement to axes on direction-changes to account for backlash.
487
 // Adds extra movement to axes on direction-changes to account for backlash.
496
 //
488
 //
849
   #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
841
   #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
850
   #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
842
   #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
851
   //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
843
   //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
852
-  //#define STATUS_ALT_FAN_BITMAP     // Use the alternate fan bitmap
844
+  //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
853
   //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
845
   //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
854
   //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar
846
   //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar
855
 
847
 

Loading…
取消
儲存