Browse Source

Bring some configs up to date

Scott Lahteine 6 years ago
parent
commit
e349b1c920

+ 9
- 3
config/examples/Creality/CR-20 Pro/Configuration.h View File

749
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
749
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
750
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
750
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
751
 
751
 
752
-//
753
-// Use Junction Deviation instead of traditional Jerk Limiting
754
-//
752
+/**
753
+ * Junction Deviation
754
+ *
755
+ * Use Junction Deviation instead of traditional Jerk Limiting
756
+ *
757
+ * See:
758
+ *   https://reprap.org/forum/read.php?1,739819
759
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
760
+ */
755
 //#define JUNCTION_DEVIATION
761
 //#define JUNCTION_DEVIATION
756
 #if ENABLED(JUNCTION_DEVIATION)
762
 #if ENABLED(JUNCTION_DEVIATION)
757
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
763
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge

+ 9
- 3
config/examples/Creality/CR-20/Configuration.h View File

749
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
749
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
750
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
750
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
751
 
751
 
752
-//
753
-// Use Junction Deviation instead of traditional Jerk Limiting
754
-//
752
+/**
753
+ * Junction Deviation
754
+ *
755
+ * Use Junction Deviation instead of traditional Jerk Limiting
756
+ *
757
+ * See:
758
+ *   https://reprap.org/forum/read.php?1,739819
759
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
760
+ */
755
 //#define JUNCTION_DEVIATION
761
 //#define JUNCTION_DEVIATION
756
 #if ENABLED(JUNCTION_DEVIATION)
762
 #if ENABLED(JUNCTION_DEVIATION)
757
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
763
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge

+ 9
- 3
config/examples/Creality/Ender-5/Configuration.h View File

749
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
749
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
750
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
750
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
751
 
751
 
752
-//
753
-// Use Junction Deviation instead of traditional Jerk Limiting
754
-//
752
+/**
753
+ * Junction Deviation
754
+ *
755
+ * Use Junction Deviation instead of traditional Jerk Limiting
756
+ *
757
+ * See:
758
+ *   https://reprap.org/forum/read.php?1,739819
759
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
760
+ */
755
 //#define JUNCTION_DEVIATION
761
 //#define JUNCTION_DEVIATION
756
 #if ENABLED(JUNCTION_DEVIATION)
762
 #if ENABLED(JUNCTION_DEVIATION)
757
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
763
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge

+ 9
- 3
config/examples/FYSETC/AIO_II/Configuration.h View File

750
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
750
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
751
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
751
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
752
 
752
 
753
-//
754
-// Use Junction Deviation instead of traditional Jerk Limiting
755
-//
753
+/**
754
+ * Junction Deviation
755
+ *
756
+ * Use Junction Deviation instead of traditional Jerk Limiting
757
+ *
758
+ * See:
759
+ *   https://reprap.org/forum/read.php?1,739819
760
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
761
+ */
756
 //#define JUNCTION_DEVIATION
762
 //#define JUNCTION_DEVIATION
757
 #if ENABLED(JUNCTION_DEVIATION)
763
 #if ENABLED(JUNCTION_DEVIATION)
758
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
764
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge

+ 18
- 4
config/examples/FYSETC/Cheetah/BLTouch/Configuration.h View File

745
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
745
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
746
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
746
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
747
 
747
 
748
-//
749
-// Use Junction Deviation instead of traditional Jerk Limiting
750
-//
748
+/**
749
+ * Junction Deviation
750
+ *
751
+ * Use Junction Deviation instead of traditional Jerk Limiting
752
+ *
753
+ * See:
754
+ *   https://reprap.org/forum/read.php?1,739819
755
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
756
+ */
751
 //#define JUNCTION_DEVIATION
757
 //#define JUNCTION_DEVIATION
752
 #if ENABLED(JUNCTION_DEVIATION)
758
 #if ENABLED(JUNCTION_DEVIATION)
753
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
759
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
2021
 //=============================================================================
2027
 //=============================================================================
2022
 
2028
 
2023
 //
2029
 //
2024
-// CONTROLLER TYPE: Keypad / Add-on
2030
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
2031
+// (Blue PCB on the back of touchscreen)
2025
 //
2032
 //
2033
+//#define TOUCH_BUTTONS
2034
+#if ENABLED(TOUCH_BUTTONS)
2035
+  #define XPT2046_X_CALIBRATION   12316
2036
+  #define XPT2046_Y_CALIBRATION  -8981
2037
+  #define XPT2046_X_OFFSET       -43
2038
+  #define XPT2046_Y_OFFSET        257
2039
+#endif
2026
 
2040
 
2027
 //
2041
 //
2028
 // RepRapWorld REPRAPWORLD_KEYPAD v1.1
2042
 // RepRapWorld REPRAPWORLD_KEYPAD v1.1

+ 9
- 3
config/examples/FYSETC/Cheetah/base/Configuration.h View File

750
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
750
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
751
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
751
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
752
 
752
 
753
-//
754
-// Use Junction Deviation instead of traditional Jerk Limiting
755
-//
753
+/**
754
+ * Junction Deviation
755
+ *
756
+ * Use Junction Deviation instead of traditional Jerk Limiting
757
+ *
758
+ * See:
759
+ *   https://reprap.org/forum/read.php?1,739819
760
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
761
+ */
756
 //#define JUNCTION_DEVIATION
762
 //#define JUNCTION_DEVIATION
757
 #if ENABLED(JUNCTION_DEVIATION)
763
 #if ENABLED(JUNCTION_DEVIATION)
758
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
764
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge

+ 9
- 3
config/examples/FYSETC/F6_13/Configuration.h View File

747
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
747
 #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
748
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
748
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
749
 
749
 
750
-//
751
-// Use Junction Deviation instead of traditional Jerk Limiting
752
-//
750
+/**
751
+ * Junction Deviation
752
+ *
753
+ * Use Junction Deviation instead of traditional Jerk Limiting
754
+ *
755
+ * See:
756
+ *   https://reprap.org/forum/read.php?1,739819
757
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
758
+ */
753
 //#define JUNCTION_DEVIATION
759
 //#define JUNCTION_DEVIATION
754
 #if ENABLED(JUNCTION_DEVIATION)
760
 #if ENABLED(JUNCTION_DEVIATION)
755
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
761
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge

+ 1
- 1
config/examples/Formbot/Raptor/Configuration_adv.h View File

1173
   //#define BABYSTEP_WITHOUT_HOMING
1173
   //#define BABYSTEP_WITHOUT_HOMING
1174
   //#define BABYSTEP_XY                     // Also enable X/Y Babystepping. Not supported on DELTA!
1174
   //#define BABYSTEP_XY                     // Also enable X/Y Babystepping. Not supported on DELTA!
1175
   #define BABYSTEP_INVERT_Z false           // Change if Z babysteps should go the other way
1175
   #define BABYSTEP_INVERT_Z false           // Change if Z babysteps should go the other way
1176
-  #define BABYSTEP_MULTIPLICATOR 25         // Babysteps are very small. Increase for faster motion.
1176
+  #define BABYSTEP_MULTIPLICATOR  25        // Babysteps are very small. Increase for faster motion.
1177
 
1177
 
1178
   #define DOUBLECLICK_FOR_Z_BABYSTEPPING    // Double-click on the Status Screen for Z Babystepping.
1178
   #define DOUBLECLICK_FOR_Z_BABYSTEPPING    // Double-click on the Status Screen for Z Babystepping.
1179
   #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
1179
   #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)

+ 9
- 3
config/examples/JGAurora/A1/Configuration.h View File

747
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
747
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
748
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
748
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
749
 
749
 
750
-//
751
-// Use Junction Deviation instead of traditional Jerk Limiting
752
-//
750
+/**
751
+ * Junction Deviation
752
+ *
753
+ * Use Junction Deviation instead of traditional Jerk Limiting
754
+ *
755
+ * See:
756
+ *   https://reprap.org/forum/read.php?1,739819
757
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
758
+ */
753
 #define JUNCTION_DEVIATION
759
 #define JUNCTION_DEVIATION
754
 #if ENABLED(JUNCTION_DEVIATION)
760
 #if ENABLED(JUNCTION_DEVIATION)
755
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
761
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge

+ 9
- 3
config/examples/JGAurora/A5S/Configuration.h View File

747
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
747
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
748
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
748
 #define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
749
 
749
 
750
-//
751
-// Use Junction Deviation instead of traditional Jerk Limiting
752
-//
750
+/**
751
+ * Junction Deviation
752
+ *
753
+ * Use Junction Deviation instead of traditional Jerk Limiting
754
+ *
755
+ * See:
756
+ *   https://reprap.org/forum/read.php?1,739819
757
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
758
+ */
753
 #define JUNCTION_DEVIATION
759
 #define JUNCTION_DEVIATION
754
 #if ENABLED(JUNCTION_DEVIATION)
760
 #if ENABLED(JUNCTION_DEVIATION)
755
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
761
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge

+ 9
- 3
config/examples/Tevo/Tarantula Pro/Configuration.h View File

750
 #define DEFAULT_RETRACT_ACCELERATION  10000    // E acceleration for retracts
750
 #define DEFAULT_RETRACT_ACCELERATION  10000    // E acceleration for retracts
751
 #define DEFAULT_TRAVEL_ACCELERATION   1500    // X, Y, Z acceleration for travel (non printing) moves
751
 #define DEFAULT_TRAVEL_ACCELERATION   1500    // X, Y, Z acceleration for travel (non printing) moves
752
 
752
 
753
-//
754
-// Use Junction Deviation instead of traditional Jerk Limiting
755
-//
753
+/**
754
+ * Junction Deviation
755
+ *
756
+ * Use Junction Deviation instead of traditional Jerk Limiting
757
+ *
758
+ * See:
759
+ *   https://reprap.org/forum/read.php?1,739819
760
+ *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
761
+ */
756
 //#define JUNCTION_DEVIATION
762
 //#define JUNCTION_DEVIATION
757
 #if ENABLED(JUNCTION_DEVIATION)
763
 #if ENABLED(JUNCTION_DEVIATION)
758
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge
764
   #define JUNCTION_DEVIATION_MM 0.02  // (mm) Distance from real junction edge

Loading…
Cancel
Save