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

Bring configs up to date

Browse Source
This commit is contained in:
Scott Lahteine
2017-08-03 15:26:54 -05:00
parent dd841a3675
commit 804818b4d9
60 changed files with 710 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -161,7 +161,10 @@
//#define SWITCHING_EXTRUDER
#if ENABLED(SWITCHING_EXTRUDER)
#define SWITCHING_EXTRUDER_SERVO_NR 0
#define SWITCHING_EXTRUDER_SERVO_ANGLES { 0, 90 } // Angles for E0, E1
#define SWITCHING_EXTRUDER_SERVO_ANGLES { 0, 90 } // Angles for E0, E1[, E2, E3]
#if EXTRUDERS > 3
#define SWITCHING_EXTRUDER_E23_SERVO_NR 1
#endif
#endif
// A dual-nozzle that uses a servomotor to raise/lower one of the nozzles
@ -799,60 +802,6 @@
#endif // Z_PROBE_ALLEN_KEY
/**
* *** PLEASE READ ALL INSTRUCTIONS BELOW FOR SAFETY! ***
*
* - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
* - Use 5V for powered (usu. inductive) sensors.
* - Otherwise connect:
* - normally-closed switches to GND and D32.
* - normally-open switches to 5V and D32.
*
* Normally-closed switches are advised and are the default.
*
*
* PIN OPTIONS\SETUP FOR Z PROBES
*
*
* WARNING:
* Setting the wrong pin may have unexpected and potentially disastrous consequences.
* Use with caution and do your homework.
*
*
* All Z PROBE pin options are configured by defining (or not defining)
* the following five items:
* Z_MIN_PROBE_ENDSTOP – defined below
* Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN – defined below
* Z_MIN_PIN - defined in the pins_YOUR_BOARD.h file
* Z_MIN_PROBE_PIN - defined in the pins_YOUR_BOARD.h file
*
* If you're using a probe then you need to tell Marlin which pin to use as
* the Z MIN ENDSTOP. Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN determines if the
* Z_MIN_PIN or if the Z_MIN_PROBE_PIN is used.
*
* The pin selected for the probe is ONLY checked during probing operations.
* If you want to use the Z_MIN_PIN as an endstop AND you want to have a Z PROBE
* then you’ll need to use the Z_MIN_PROBE_PIN option.
*
* Z_MIN_PROBE_ENDSTOP also needs to be enabled if you want to use Z_MIN_PROBE_PIN.
*
* The settings needed to use the Z_MIN_PROBE_PIN are:
* 1. select the type of probe you're using
* 2. define Z_MIN_PROBE_PIN in your pins_YOUR_BOARD.h file
* 3. disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
* 4. enable Z_MIN_PROBE_ENDSTOP
* NOTE – if Z_MIN_PIN is defined then it’ll be checked during all moves in the
* negative Z direction.
*
* The settings needed to use the Z_MIN_PIN are:
* 1. select the type of probe you're using
* 2. enable Z_MIN _PIN in your pins_YOUR_BOARD.h file
* 3. enable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
* 4. disable Z_MIN_PROBE_ENDSTOP
* NOTES – if Z_MIN_PROBE_PIN is defined in the pins_YOUR_BOARD.h file then it’ll be
* ignored by Marlin
*/
/**
* Z probes require clearance when deploying, stowing, and moving between
* probe points to avoid hitting the bed and other hardware.
@ -1047,6 +996,11 @@
//#define PROBE_Y_FIRST
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Beyond the probed grid, continue the implied tilt?
// Default is to maintain the height of the nearest edge.
//#define EXTRAPOLATE_BEYOND_GRID
//
// Experimental Subdivision of the grid by Catmull-Rom method.
// Synthesizes intermediate points to produce a more detailed mesh.
@ -1147,8 +1101,8 @@
//#define Z_SAFE_HOMING
#if ENABLED(Z_SAFE_HOMING)
#define Z_SAFE_HOMING_X_POINT ((X_MIN_POS + X_MAX_POS) / 2) // X point for Z homing when homing all axis (G28).
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axis (G28).
#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axis (G28).
#endif
// Delta only homes to Z
@ -1634,11 +1588,6 @@
//
//#define U8GLIB_SSD1306
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//
// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
//
@ -1656,6 +1605,11 @@
//
//#define SAV_3DLCD
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

16
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
View File

@ -284,7 +284,7 @@
#if ENABLED(Z_DUAL_ENDSTOPS)
#define Z2_USE_ENDSTOP _XMAX_
#define Z_DUAL_ENDSTOPS_ADJUSTMENT 0 // use M666 command to determine this value
#define Z_DUAL_ENDSTOPS_ADJUSTMENT 0 // Use M666 to determine/test this value
#endif
#endif // Z_DUAL_STEPPER_DRIVERS
@ -337,7 +337,7 @@
//homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
#define X_HOME_BUMP_MM 2
#define Y_HOME_BUMP_MM 2
#define Z_HOME_BUMP_MM 2 // deltas need the same for all three axis
#define Z_HOME_BUMP_MM 2 // deltas need the same for all three axes
#define HOMING_BUMP_DIVISOR {2, 2, 4} // Re-Bump Speed Divisor (Divides the Homing Feedrate)
//#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
@ -396,7 +396,7 @@
// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end
// of the buffer and all stops. This should not be much greater than zero and should only be changed
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05// (mm/sec)
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/sec)
// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16]
@ -454,6 +454,9 @@
// On the Info Screen, display XY with one decimal place when possible
//#define LCD_DECIMAL_SMALL_XY
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
#if ENABLED(SDSUPPORT)
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
@ -647,7 +650,7 @@
*
* Set to 0 to auto-detect the ratio based on given Gcode G1 print moves.
*
* Slic3r (including Průša Slic3r) produces Gcode compatible with the automatic mode.
* Slic3r (including Průša Control) produces Gcode compatible with the automatic mode.
* Cura (as of this writing) may produce Gcode incompatible with the automatic mode.
*/
#define LIN_ADVANCE_E_D_RATIO 0 // The calculated ratio (or 0) according to the formula W * H / ((D / 2) ^ 2 * PI)
@ -669,6 +672,10 @@
#define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
#define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
#define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
// If this is defined, the currently active mesh will be saved in the
// current slot on M500.
#define UBL_SAVE_ACTIVE_ON_M500
#endif
// @section extras
@ -1285,6 +1292,7 @@
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
/**
* I2C position encoders for closed loop control.
* Developed by Chris Barr at Aus3D.