Browse Source

Bring Rostock 301 and ArmEd configs up to date

Scott Lahteine 6 years ago
parent
commit
aa74a900f5

+ 1
- 12
Marlin/src/config/examples/ArmEd/Configuration.h View File

154
 
154
 
155
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
155
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
156
 //#define SINGLENOZZLE
156
 //#define SINGLENOZZLE
157
-#if ENABLED(SINGLENOZZLE)
158
-  // Parameters for filament retract / prime on toolchange
159
-  #define SINGLENOZZLE_SWAP_LENGTH          12  // (mm)
160
-  #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600  // (mm/m)
161
-  #define SINGLENOZZLE_SWAP_PRIME_SPEED   3600  // (mm/m)
162
-  //#define SINGLENOZZLE_SWAP_PARK
163
-  #if ENABLED(SINGLENOZZLE_SWAP_PARK)
164
-    #define SINGLENOZZLE_TOOLCHANGE_XY    { X_MIN_POS + 10, Y_MIN_POS + 10 }
165
-    #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000  // (mm/m)
166
-  #endif
167
-#endif
168
 
157
 
169
 /**
158
 /**
170
  * Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants.
159
  * Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants.
2034
  *  - Change to green once print has finished
2023
  *  - Change to green once print has finished
2035
  *  - Turn off after the print has finished and the user has pushed a button
2024
  *  - Turn off after the print has finished and the user has pushed a button
2036
  */
2025
  */
2037
-#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED)
2026
+#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(PCA9533)|| ENABLED(NEOPIXEL_LED)
2038
   #define PRINTER_EVENT_LEDS
2027
   #define PRINTER_EVENT_LEDS
2039
 #endif
2028
 #endif
2040
 
2029
 

+ 32
- 1
Marlin/src/config/examples/ArmEd/Configuration_adv.h View File

414
 // Enable this if X or Y can't home without homing the other axis first.
414
 // Enable this if X or Y can't home without homing the other axis first.
415
 //#define CODEPENDENT_XY_HOMING
415
 //#define CODEPENDENT_XY_HOMING
416
 
416
 
417
+/**
418
+ * Z Steppers Auto-Alignment
419
+ * Add the G34 command to align multiple Z steppers using a bed probe.
420
+ */
421
+//#define Z_STEPPER_AUTO_ALIGN
422
+#if ENABLED(Z_STEPPER_AUTO_ALIGN)
423
+  // Define probe X and Y positions for Z1, Z2 [, Z3]
424
+  #define Z_STEPPER_ALIGN_X { 10, 150, 290 }
425
+  #define Z_STEPPER_ALIGN_Y { 290, 10, 290 }
426
+  // Set number of iterations to align
427
+  #define Z_STEPPER_ALIGN_ITERATIONS 3
428
+  // Enable to restore leveling setup after operation
429
+  #define RESTORE_LEVELING_AFTER_G34
430
+  // Use the amplification factor to de-/increase correction step.
431
+  // In case the stepper (spindle) position is further out than the test point
432
+  // Use a value > 1. NOTE: This may cause instability
433
+  #define Z_STEPPER_ALIGN_AMP 1.0
434
+  // Stop criterion. If the accuracy is better than this stop iterating early
435
+  #define Z_STEPPER_ALIGN_ACC 0.02
436
+#endif
437
+
417
 // @section machine
438
 // @section machine
418
 
439
 
419
 #define AXIS_RELATIVE_MODES {false, false, false, false}
440
 #define AXIS_RELATIVE_MODES {false, false, false, false}
508
  */
529
  */
509
 //#define ADAPTIVE_STEP_SMOOTHING
530
 //#define ADAPTIVE_STEP_SMOOTHING
510
 
531
 
532
+/**
533
+ * Custom Microstepping
534
+ * Override as-needed for your setup. Up to 3 MS pins are supported.
535
+ */
536
+//#define MICROSTEP1 LOW,LOW,LOW
537
+//#define MICROSTEP2 HIGH,LOW,LOW
538
+//#define MICROSTEP4 LOW,HIGH,LOW
539
+//#define MICROSTEP8 HIGH,HIGH,LOW
540
+//#define MICROSTEP16 LOW,LOW,HIGH
541
+//#define MICROSTEP32 HIGH,LOW,HIGH
542
+
511
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
543
 // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
512
 #define MICROSTEP_MODES { 16, 16, 16, 16, 16, 16 } // [1,2,4,8,16]
544
 #define MICROSTEP_MODES { 16, 16, 16, 16, 16, 16 } // [1,2,4,8,16]
513
 
545
 
1196
   //#define HOME_BEFORE_FILAMENT_CHANGE           // Ensure homing has been completed prior to parking for filament change
1228
   //#define HOME_BEFORE_FILAMENT_CHANGE           // Ensure homing has been completed prior to parking for filament change
1197
 
1229
 
1198
   //#define FILAMENT_LOAD_UNLOAD_GCODES           // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
1230
   //#define FILAMENT_LOAD_UNLOAD_GCODES           // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
1199
-
1200
   //#define FILAMENT_UNLOAD_ALL_EXTRUDERS         // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
1231
   //#define FILAMENT_UNLOAD_ALL_EXTRUDERS         // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
1201
 #endif
1232
 #endif
1202
 
1233
 

+ 1
- 12
Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h View File

154
 
154
 
155
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
155
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
156
 #define SINGLENOZZLE
156
 #define SINGLENOZZLE
157
-#if ENABLED(SINGLENOZZLE)
158
-  // Parameters for filament retract / prime on toolchange
159
-  #define SINGLENOZZLE_SWAP_LENGTH          12  // (mm)
160
-  #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600  // (mm/m)
161
-  #define SINGLENOZZLE_SWAP_PRIME_SPEED   3600  // (mm/m)
162
-  //#define SINGLENOZZLE_SWAP_PARK
163
-  #if ENABLED(SINGLENOZZLE_SWAP_PARK)
164
-    #define SINGLENOZZLE_TOOLCHANGE_XY    { X_MIN_POS + 10, Y_MIN_POS + 10 }
165
-    #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000  // (mm/m)
166
-  #endif
167
-#endif
168
 
157
 
169
 /**
158
 /**
170
  * Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants.
159
  * Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants.
2151
  *  - Change to green once print has finished
2140
  *  - Change to green once print has finished
2152
  *  - Turn off after the print has finished and the user has pushed a button
2141
  *  - Turn off after the print has finished and the user has pushed a button
2153
  */
2142
  */
2154
-#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED)
2143
+#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(PCA9533)|| ENABLED(NEOPIXEL_LED)
2155
   #define PRINTER_EVENT_LEDS
2144
   #define PRINTER_EVENT_LEDS
2156
 #endif
2145
 #endif
2157
 
2146
 

+ 28
- 0
Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h View File

896
   #if ENABLED(MOVE_Z_WHEN_IDLE)
896
   #if ENABLED(MOVE_Z_WHEN_IDLE)
897
     #define MOVE_Z_IDLE_MULTIPLICATOR 1     // Multiply 1mm by this factor for the move step size.
897
     #define MOVE_Z_IDLE_MULTIPLICATOR 1     // Multiply 1mm by this factor for the move step size.
898
   #endif
898
   #endif
899
+
899
   //#define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
900
   //#define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
900
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
901
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
901
     //#define BABYSTEP_HOTEND_Z_OFFSET      // For multiple hotends, babystep relative Z offsets
902
     //#define BABYSTEP_HOTEND_Z_OFFSET      // For multiple hotends, babystep relative Z offsets
1150
 #endif
1151
 #endif
1151
 
1152
 
1152
 /**
1153
 /**
1154
+ * Universal tool change settings.
1155
+ * Applies to all types of extruders except where explicitly noted.
1156
+ */
1157
+#if EXTRUDERS > 1
1158
+  // Z raise distance for tool-change, as needed for some extruders
1159
+  #define TOOLCHANGE_ZRAISE     2  // (mm)
1160
+
1161
+  // Retract and prime filament on tool-change
1162
+  //#define TOOLCHANGE_FILAMENT_SWAP
1163
+  #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
1164
+    #define TOOLCHANGE_FIL_SWAP_LENGTH          12  // (mm)
1165
+    #define TOOLCHANGE_FIL_SWAP_RETRACT_SPEED 3600  // (mm/m)
1166
+    #define TOOLCHANGE_FIL_SWAP_PRIME_SPEED   3600  // (mm/m)
1167
+  #endif
1168
+
1169
+  /**
1170
+   * Position to park head during tool change.
1171
+   * Doesn't apply to SWITCHING_TOOLHEAD, DUAL_X_CARRIAGE, or PARKING_EXTRUDER
1172
+   */
1173
+  //#define TOOLCHANGE_PARK
1174
+  #if ENABLED(TOOLCHANGE_PARK)
1175
+    #define TOOLCHANGE_PARK_XY    { X_MIN_POS + 10, Y_MIN_POS + 10 }
1176
+    #define TOOLCHANGE_PARK_XY_FEEDRATE 6000  // (mm/m)
1177
+  #endif
1178
+#endif
1179
+
1180
+/**
1153
  * Advanced Pause
1181
  * Advanced Pause
1154
  * Experimental feature for filament change support and for parking the nozzle when paused.
1182
  * Experimental feature for filament change support and for parking the nozzle when paused.
1155
  * Adds the GCode M600 for initiating filament change.
1183
  * Adds the GCode M600 for initiating filament change.

Loading…
Cancel
Save