bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Bring Rostock 301 and ArmEd configs up to date

Browse Source
This commit is contained in:
Scott Lahteine
2019-01-23 23:18:30 -06:00
parent a073293b6a
commit aa74a900f5
4 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/src/config/examples/ArmEd/Configuration.h
View File

@@ -154,17 +154,6 @@
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
#if ENABLED(SINGLENOZZLE)
// Parameters for filament retract / prime on toolchange
#define SINGLENOZZLE_SWAP_LENGTH 12 // (mm)
#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m)
#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m)
//#define SINGLENOZZLE_SWAP_PARK
#if ENABLED(SINGLENOZZLE_SWAP_PARK)
#define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 }
#define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m)
#endif
#endif
/**
* Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants.
@@ -2034,7 +2023,7 @@
* - Change to green once print has finished
* - Turn off after the print has finished and the user has pushed a button
*/
#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED)
#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(PCA9533)|| ENABLED(NEOPIXEL_LED)
#define PRINTER_EVENT_LEDS
#endif

33
Marlin/src/config/examples/ArmEd/Configuration_adv.h
View File

@@ -414,6 +414,27 @@
// Enable this if X or Y can't home without homing the other axis first.
//#define CODEPENDENT_XY_HOMING
/**
* Z Steppers Auto-Alignment
* Add the G34 command to align multiple Z steppers using a bed probe.
*/
//#define Z_STEPPER_AUTO_ALIGN
#if ENABLED(Z_STEPPER_AUTO_ALIGN)
// Define probe X and Y positions for Z1, Z2 [, Z3]
#define Z_STEPPER_ALIGN_X { 10, 150, 290 }
#define Z_STEPPER_ALIGN_Y { 290, 10, 290 }
// Set number of iterations to align
#define Z_STEPPER_ALIGN_ITERATIONS 3
// Enable to restore leveling setup after operation
#define RESTORE_LEVELING_AFTER_G34
// Use the amplification factor to de-/increase correction step.
// In case the stepper (spindle) position is further out than the test point
// Use a value > 1. NOTE: This may cause instability
#define Z_STEPPER_ALIGN_AMP 1.0
// Stop criterion. If the accuracy is better than this stop iterating early
#define Z_STEPPER_ALIGN_ACC 0.02
#endif
// @section machine
#define AXIS_RELATIVE_MODES {false, false, false, false}
@@ -508,6 +529,17 @@
*/
//#define ADAPTIVE_STEP_SMOOTHING
/**
* Custom Microstepping
* Override as-needed for your setup. Up to 3 MS pins are supported.
*/
//#define MICROSTEP1 LOW,LOW,LOW
//#define MICROSTEP2 HIGH,LOW,LOW
//#define MICROSTEP4 LOW,HIGH,LOW
//#define MICROSTEP8 HIGH,HIGH,LOW
//#define MICROSTEP16 LOW,LOW,HIGH
//#define MICROSTEP32 HIGH,LOW,HIGH
// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
#define MICROSTEP_MODES { 16, 16, 16, 16, 16, 16 } // [1,2,4,8,16]
@@ -1196,7 +1228,6 @@
//#define HOME_BEFORE_FILAMENT_CHANGE // Ensure homing has been completed prior to parking for filament change
//#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
#endif

13
Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration.h
View File

@@ -154,17 +154,6 @@
// For Cyclops or any "multi-extruder" that shares a single nozzle.
#define SINGLENOZZLE
#if ENABLED(SINGLENOZZLE)
// Parameters for filament retract / prime on toolchange
#define SINGLENOZZLE_SWAP_LENGTH 12 // (mm)
#define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600 // (mm/m)
#define SINGLENOZZLE_SWAP_PRIME_SPEED 3600 // (mm/m)
//#define SINGLENOZZLE_SWAP_PARK
#if ENABLED(SINGLENOZZLE_SWAP_PARK)
#define SINGLENOZZLE_TOOLCHANGE_XY { X_MIN_POS + 10, Y_MIN_POS + 10 }
#define SINGLENOZZLE_PARK_XY_FEEDRATE 6000 // (mm/m)
#endif
#endif
/**
* Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants.
@@ -2151,7 +2140,7 @@
* - Change to green once print has finished
* - Turn off after the print has finished and the user has pushed a button
*/
#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED)
#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(PCA9533)|| ENABLED(NEOPIXEL_LED)
#define PRINTER_EVENT_LEDS
#endif

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

@@ -896,6 +896,7 @@
#if ENABLED(MOVE_Z_WHEN_IDLE)
#define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size.
#endif
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
@@ -1149,6 +1150,33 @@
#endif
#endif
/**
* Universal tool change settings.
* Applies to all types of extruders except where explicitly noted.
*/
#if EXTRUDERS > 1
// Z raise distance for tool-change, as needed for some extruders
#define TOOLCHANGE_ZRAISE 2 // (mm)
// Retract and prime filament on tool-change
//#define TOOLCHANGE_FILAMENT_SWAP
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
#define TOOLCHANGE_FIL_SWAP_LENGTH 12 // (mm)
#define TOOLCHANGE_FIL_SWAP_RETRACT_SPEED 3600 // (mm/m)
#define TOOLCHANGE_FIL_SWAP_PRIME_SPEED 3600 // (mm/m)
#endif
/**
* Position to park head during tool change.
* Doesn't apply to SWITCHING_TOOLHEAD, DUAL_X_CARRIAGE, or PARKING_EXTRUDER
*/
//#define TOOLCHANGE_PARK
#if ENABLED(TOOLCHANGE_PARK)
#define TOOLCHANGE_PARK_XY { X_MIN_POS + 10, Y_MIN_POS + 10 }
#define TOOLCHANGE_PARK_XY_FEEDRATE 6000 // (mm/m)
#endif
#endif
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.