0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-02-19 23:54:19 +00:00

Bring some example configs up to date

This commit is contained in:
Scott Lahteine 2018-05-06 02:56:40 -05:00
parent fcb19823db
commit 675be8db7c
59 changed files with 98 additions and 136 deletions

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -992,17 +992,6 @@
#endif #endif
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
// 3 arbitrary points to probe.
// A simple cross-product is used to estimate the plane of the bed.
#define PROBE_PT_1_X 20
#define PROBE_PT_1_Y 160
#define PROBE_PT_2_X 20
#define PROBE_PT_2_Y 10
#define PROBE_PT_3_X 180
#define PROBE_PT_3_Y 10
#elif ENABLED(AUTO_BED_LEVELING_UBL) #elif ENABLED(AUTO_BED_LEVELING_UBL)
//=========================================================================== //===========================================================================
@ -1040,12 +1029,12 @@
* Override if the automatically selected points are inadequate. * Override if the automatically selected points are inadequate.
*/ */
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
//#define PROBE_PT_1_X 15 #define PROBE_PT_1_X 20
//#define PROBE_PT_1_Y 180 #define PROBE_PT_1_Y 160
//#define PROBE_PT_2_X 15 #define PROBE_PT_2_X 20
//#define PROBE_PT_2_Y 20 #define PROBE_PT_2_Y 10
//#define PROBE_PT_3_X 170 #define PROBE_PT_3_X 180
//#define PROBE_PT_3_Y 20 #define PROBE_PT_3_Y 10
#endif #endif
/** /**

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -182,10 +182,12 @@
// @section temperature // @section temperature
//These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
//The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
#define TEMP_SENSOR_AD595_OFFSET 3.0 #define TEMP_SENSOR_AD595_OFFSET 3.0
#define TEMP_SENSOR_AD595_GAIN 2.0 #define TEMP_SENSOR_AD595_GAIN 2.0
// Calibration for AD595 / AD8495 sensor to adjust temperature measurements.
// The final temperature is calculated as (measuredTemp * GAIN) + OFFSET.
#define TEMP_SENSOR_AD8495_OFFSET 0.0
#define TEMP_SENSOR_AD8495_GAIN 1.0
/** /**
* Controller Fan * Controller Fan
@ -1215,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

View file

View file

@ -937,6 +937,7 @@
#define FILAMENT_UNLOAD_RETRACT_LENGTH 4 // (mm) Unload initial retract length. #define FILAMENT_UNLOAD_RETRACT_LENGTH 4 // (mm) Unload initial retract length.
#define FILAMENT_UNLOAD_DELAY 5000 // (ms) Delay for the filament to cool after retract. #define FILAMENT_UNLOAD_DELAY 5000 // (ms) Delay for the filament to cool after retract.
#define FILAMENT_UNLOAD_PURGE_LENGTH 0 // (mm) An unretract is done, then this length is purged. #define FILAMENT_UNLOAD_PURGE_LENGTH 0 // (mm) An unretract is done, then this length is purged.
#define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety. #define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety.
#define FILAMENT_CHANGE_ALERT_BEEPS 6 // Number of alert beeps to play when a response is needed. #define FILAMENT_CHANGE_ALERT_BEEPS 6 // Number of alert beeps to play when a response is needed.
#define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change. #define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change.
@ -1216,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -232,6 +232,7 @@
#define E2_AUTO_FAN_PIN -1 #define E2_AUTO_FAN_PIN -1
#define E3_AUTO_FAN_PIN -1 #define E3_AUTO_FAN_PIN -1
#define E4_AUTO_FAN_PIN -1 #define E4_AUTO_FAN_PIN -1
#define CHAMBER_AUTO_FAN_PIN -1
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
@ -1216,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1035,8 +1035,8 @@
#endif #endif
/** /**
* Use the LCD controller for bed leveling * Add a bed leveling sub-menu for ABL or MBL.
* Requires MESH_BED_LEVELING or PROBE_MANUALLY * Include a guided procedure if manual probing is enabled.
*/ */
//#define LCD_BED_LEVELING //#define LCD_BED_LEVELING

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1012,14 +1012,7 @@
#define MESH_INSET 0 // Set Mesh bounds as an inset region of the bed #define MESH_INSET 0 // Set Mesh bounds as an inset region of the bed
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited. #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y 10 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
#define PROBE_PT_1_X 45 // Probing points for 3-Point leveling of the mesh
#define PROBE_PT_1_Y 170
#define PROBE_PT_2_X 45
#define PROBE_PT_2_Y 25
#define PROBE_PT_3_X 180
#define PROBE_PT_3_Y 25
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle #define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500 #define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@ -1046,12 +1039,12 @@
* Override if the automatically selected points are inadequate. * Override if the automatically selected points are inadequate.
*/ */
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
//#define PROBE_PT_1_X 15 #define PROBE_PT_1_X 45
//#define PROBE_PT_1_Y 180 #define PROBE_PT_1_Y 170
//#define PROBE_PT_2_X 15 #define PROBE_PT_2_X 45
//#define PROBE_PT_2_Y 20 #define PROBE_PT_2_Y 25
//#define PROBE_PT_3_X 170 #define PROBE_PT_3_X 180
//#define PROBE_PT_3_Y 20 #define PROBE_PT_3_Y 25
#endif #endif
/** /**

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1013,17 +1013,6 @@
#endif #endif
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
// 3 arbitrary points to probe.
// A simple cross-product is used to estimate the plane of the bed.
#define PROBE_PT_1_X 50
#define PROBE_PT_1_Y 150
#define PROBE_PT_2_X 50
#define PROBE_PT_2_Y 50
#define PROBE_PT_3_X 150
#define PROBE_PT_3_Y 50
#elif ENABLED(AUTO_BED_LEVELING_UBL) #elif ENABLED(AUTO_BED_LEVELING_UBL)
//=========================================================================== //===========================================================================
@ -1061,12 +1050,12 @@
* Override if the automatically selected points are inadequate. * Override if the automatically selected points are inadequate.
*/ */
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
//#define PROBE_PT_1_X 15 #define PROBE_PT_1_X 50
//#define PROBE_PT_1_Y 180 #define PROBE_PT_1_Y 150
//#define PROBE_PT_2_X 15 #define PROBE_PT_2_X 50
//#define PROBE_PT_2_Y 20 #define PROBE_PT_2_Y 50
//#define PROBE_PT_3_X 170 #define PROBE_PT_3_X 150
//#define PROBE_PT_3_Y 20 #define PROBE_PT_3_Y 50
#endif #endif
/** /**

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -713,6 +713,9 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
* readings with inductive probes and piezo sensors. * readings with inductive probes and piezo sensors.
*/ */
//#define PROBING_HEATERS_OFF // Turn heaters off when probing //#define PROBING_HEATERS_OFF // Turn heaters off when probing
#if ENABLED(PROBING_HEATERS_OFF)
//#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy)
#endif
//#define PROBING_FANS_OFF // Turn fans off when probing //#define PROBING_FANS_OFF // Turn fans off when probing
//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors //#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -358,7 +358,7 @@
#define PIDTEMP #define PIDTEMP
#define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current #define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current
#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current #define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
#define PID_K1 0.95 // Smoothing factor within the PID #define PID_K1 0.95 // Smoothing factor within any PID loop
#if ENABLED(PIDTEMP) #if ENABLED(PIDTEMP)
//#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result. //#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
//#define PID_DEBUG // Sends debug data to the serial port. //#define PID_DEBUG // Sends debug data to the serial port.
@ -942,7 +942,7 @@
/** /**
* Enable the G26 Mesh Validation Pattern tool. * Enable the G26 Mesh Validation Pattern tool.
*/ */
#define G26_MESH_VALIDATION // Enable G26 mesh validation #define G26_MESH_VALIDATION
#if ENABLED(G26_MESH_VALIDATION) #if ENABLED(G26_MESH_VALIDATION)
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool. #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.

View file

@ -1079,8 +1079,8 @@
#define Z_SAFE_HOMING #define Z_SAFE_HOMING
#if ENABLED(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_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (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_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28).
#endif #endif
// Homing speeds (mm/m) // Homing speeds (mm/m)

View file

@ -1230,7 +1230,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -883,7 +883,7 @@
//=========================================================================== //===========================================================================
//=============================== Bed Leveling ============================== //=============================== Bed Leveling ==============================
//=========================================================================== //===========================================================================
// @section bedlevel // @section calibrate
/** /**
* Choose one of the options below to enable G29 Bed Leveling. The parameters * Choose one of the options below to enable G29 Bed Leveling. The parameters
@ -1010,6 +1010,9 @@
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle #define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500 #define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
//#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
// as the Z-Height correction value.
#elif ENABLED(MESH_BED_LEVELING) #elif ENABLED(MESH_BED_LEVELING)
//=========================================================================== //===========================================================================

View file

@ -1219,7 +1219,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1219,7 +1219,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -839,8 +839,7 @@
#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED
#define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20
// Move the probe into position #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0
#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED

View file

@ -1219,7 +1219,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1087,6 +1087,7 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR) #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension. // Set the number of grid points per dimension.
// Works best with 5 or more points in each dimension.
#define GRID_MAX_POINTS_X 9 #define GRID_MAX_POINTS_X 9
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X

View file

@ -1219,7 +1219,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1120,17 +1120,6 @@
#endif #endif
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
// 3 arbitrary points to probe.
// A simple cross-product is used to estimate the plane of the bed.
#define PROBE_PT_1_X -116
#define PROBE_PT_1_Y -67.5
#define PROBE_PT_2_X 116
#define PROBE_PT_2_Y -67.5
#define PROBE_PT_3_X 0
#define PROBE_PT_3_Y 135
#elif ENABLED(AUTO_BED_LEVELING_UBL) #elif ENABLED(AUTO_BED_LEVELING_UBL)
//=========================================================================== //===========================================================================
@ -1168,12 +1157,12 @@
* Override if the automatically selected points are inadequate. * Override if the automatically selected points are inadequate.
*/ */
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
//#define PROBE_PT_1_X 15 #define PROBE_PT_1_X -116
//#define PROBE_PT_1_Y 180 #define PROBE_PT_1_Y -67.5
//#define PROBE_PT_2_X 15 #define PROBE_PT_2_X 116
//#define PROBE_PT_2_Y 20 #define PROBE_PT_2_Y -67.5
//#define PROBE_PT_3_X 170 #define PROBE_PT_3_X 0
//#define PROBE_PT_3_Y 20 #define PROBE_PT_3_Y 135
#endif #endif
/** /**

View file

@ -1219,7 +1219,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -829,8 +829,7 @@
#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED
#define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20
// Move the probe into position #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0
#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_SPEED

View file

@ -1219,7 +1219,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -864,6 +864,7 @@
#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -15 #define Z_PROBE_OFFSET_RANGE_MIN -15
#define Z_PROBE_OFFSET_RANGE_MAX 5 #define Z_PROBE_OFFSET_RANGE_MAX 5

View file

@ -1224,7 +1224,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1219,7 +1219,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1011,13 +1011,6 @@
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited. #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
#define PROBE_PT_1_X 53 // Probing points for 3-Point leveling of the mesh
#define PROBE_PT_1_Y 323
#define PROBE_PT_2_X 53
#define PROBE_PT_2_Y 63
#define PROBE_PT_3_X 348
#define PROBE_PT_3_Y 211
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle #define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500 #define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@ -1043,12 +1036,12 @@
* Override if the automatically selected points are inadequate. * Override if the automatically selected points are inadequate.
*/ */
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
//#define PROBE_PT_1_X 15 #define PROBE_PT_1_X 53
//#define PROBE_PT_1_Y 180 #define PROBE_PT_1_Y 323
//#define PROBE_PT_2_X 15 #define PROBE_PT_2_X 53
//#define PROBE_PT_2_Y 20 #define PROBE_PT_2_Y 63
//#define PROBE_PT_3_X 170 #define PROBE_PT_3_X 348
//#define PROBE_PT_3_Y 20 #define PROBE_PT_3_Y 211
#endif #endif
/** /**

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1217,7 +1217,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208

View file

@ -1031,8 +1031,7 @@
* You may also use software SPI if you wish to use general purpose IO pins. * You may also use software SPI if you wish to use general purpose IO pins.
*/ */
//#define HAVE_TMC2130 //#define HAVE_TMC2130
#if ENABLED(HAVE_TMC2130) #if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory!
// Choose your axes here. This is mandatory!
//#define X_IS_TMC2130 //#define X_IS_TMC2130
//#define X2_IS_TMC2130 //#define X2_IS_TMC2130
//#define Y_IS_TMC2130 //#define Y_IS_TMC2130
@ -1219,7 +1218,7 @@
* stepperY.interpolate(0); \ * stepperY.interpolate(0); \
* } * }
*/ */
#define TMC_ADV() { } #define TMC_ADV() { }
#endif // TMC2130 || TMC2208 #endif // TMC2130 || TMC2208