andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #4066 from thinkyhead/rc_M851_with_probe 

Make M851 standard with a bed probe
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
692a6e7c91 eab44b30d4
commit
bd4ec727e7
42 changed files with 155 additions and 366 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      Marlin/Conditionals.h
  2. 14
      Marlin/Configuration.h
  3. 9
      Marlin/Configuration_adv.h
  4. 2
      Marlin/Marlin.h
  5. 15
      Marlin/Marlin_main.cpp
  6. 25
      Marlin/configuration_store.cpp
  7. 14
      Marlin/example_configurations/Cartesio/Configuration.h
  8. 9
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  9. 14
      Marlin/example_configurations/Felix/Configuration.h
  10. 9
      Marlin/example_configurations/Felix/Configuration_adv.h
  11. 14
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  12. 14
      Marlin/example_configurations/Hephestos/Configuration.h
  13. 9
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  14. 15
      Marlin/example_configurations/Hephestos_2/Configuration.h
  15. 9
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  16. 14
      Marlin/example_configurations/K8200/Configuration.h
  17. 9
      Marlin/example_configurations/K8200/Configuration_adv.h
  18. 14
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  19. 14
      Marlin/example_configurations/RigidBot/Configuration.h
  20. 9
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  21. 14
      Marlin/example_configurations/SCARA/Configuration.h
  22. 9
      Marlin/example_configurations/SCARA/Configuration_adv.h
  23. 14
      Marlin/example_configurations/TAZ4/Configuration.h
  24. 9
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  25. 14
      Marlin/example_configurations/WITBOX/Configuration.h
  26. 9
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  27. 14
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  28. 14
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  29. 9
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  30. 14
      Marlin/example_configurations/delta/generic/Configuration.h
  31. 9
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  32. 14
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  33. 9
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  34. 15
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  35. 9
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  36. 14
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  37. 9
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  38. 14
      Marlin/example_configurations/makibox/Configuration.h
  39. 9
      Marlin/example_configurations/makibox/Configuration_adv.h
  40. 14
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  41. 9
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  42. 2
      Marlin/ultralcd.cpp

42
Marlin/Conditionals.h
View File

@ -383,24 +383,6 @@
#define Z_SAFE_HOMING
#endif
/**
* Z Safe Homing dependencies
*/
#if ENABLED(Z_SAFE_HOMING)
#ifndef X_PROBE_OFFSET_FROM_EXTRUDER
#define X_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Y_PROBE_OFFSET_FROM_EXTRUDER
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Z_PROBE_OFFSET_FROM_EXTRUDER
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef XY_TRAVEL_SPEED
#define XY_TRAVEL_SPEED 4000
#endif
#endif
/**
* Host keep alive
*/
@ -775,6 +757,30 @@
#define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED)
/**
* Probe dependencies
*/
#if HAS_BED_PROBE
#ifndef X_PROBE_OFFSET_FROM_EXTRUDER
#define X_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Y_PROBE_OFFSET_FROM_EXTRUDER
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Z_PROBE_OFFSET_FROM_EXTRUDER
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Z_PROBE_OFFSET_RANGE_MIN
#define Z_PROBE_OFFSET_RANGE_MIN -20
#endif
#ifndef Z_PROBE_OFFSET_RANGE_MAX
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#ifndef XY_TRAVEL_SPEED
#define XY_TRAVEL_SPEED 4000
#endif
#endif
/**
* Delta radius/rod trimmers
*/

14
Marlin/Configuration.h
View File

@ -691,7 +691,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -719,18 +719,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/Configuration_adv.h
View File

@ -417,9 +417,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

2
Marlin/Marlin.h
View File

@ -319,7 +319,7 @@ float code_value_temp_diff();
extern float z_endstop_adj;
#endif
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if HAS_BED_PROBE
extern float zprobe_zoffset;
#endif

15
Marlin/Marlin_main.cpp
View File

@ -364,9 +364,12 @@ static millis_t stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL
static uint8_t target_extruder;
#if HAS_BED_PROBE
float zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
#endif
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
int xy_travel_speed = XY_TRAVEL_SPEED;
float zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
bool bed_leveling_in_progress = false;
#endif
@ -1482,7 +1485,7 @@ static void set_axis_is_at_home(AxisEnum axis) {
current_position[axis] = base_home_pos(axis) + home_offset[axis];
update_software_endstops(axis);
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && Z_HOME_DIR < 0
#if HAS_BED_PROBE && Z_HOME_DIR < 0
if (axis == Z_AXIS) {
current_position[Z_AXIS] -= zprobe_zoffset;
#if ENABLED(DEBUG_LEVELING_FEATURE)
@ -6224,9 +6227,9 @@ inline void gcode_M503() {
#endif // ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
#ifdef CUSTOM_M_CODE_SET_Z_PROBE_OFFSET
#if HAS_BED_PROBE
inline void gcode_SET_Z_PROBE_OFFSET() {
inline void gcode_M851() {
SERIAL_ECHO_START;
SERIAL_ECHOPGM(MSG_ZPROBE_ZOFFSET);
@ -6252,7 +6255,7 @@ inline void gcode_M503() {
SERIAL_EOL;
}
#endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET
#endif // HAS_BED_PROBE
#if ENABLED(FILAMENTCHANGEENABLE)
@ -7361,7 +7364,7 @@ void process_next_command() {
#ifdef CUSTOM_M_CODE_SET_Z_PROBE_OFFSET
case CUSTOM_M_CODE_SET_Z_PROBE_OFFSET:
gcode_SET_Z_PROBE_OFFSET();
gcode_M851();
break;
#endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET

25
Marlin/configuration_store.cpp
View File

@ -210,7 +210,7 @@ void Config_StoreSettings() {
for (uint8_t q = 0; q < mesh_num_x * mesh_num_y; q++) EEPROM_WRITE_VAR(i, dummy);
#endif // MESH_BED_LEVELING
#if DISABLED(AUTO_BED_LEVELING_FEATURE)
#if !HAS_BED_PROBE
float zprobe_zoffset = 0;
#endif
EEPROM_WRITE_VAR(i, zprobe_zoffset);
@ -389,7 +389,7 @@ void Config_RetrieveSettings() {
for (uint8_t q = 0; q < mesh_num_x * mesh_num_y; q++) EEPROM_READ_VAR(i, dummy);
#endif // MESH_BED_LEVELING
#if DISABLED(AUTO_BED_LEVELING_FEATURE)
#if !HAS_BED_PROBE
float zprobe_zoffset = 0;
#endif
EEPROM_READ_VAR(i, zprobe_zoffset);
@ -554,7 +554,7 @@ void Config_ResetDefault() {
mbl.reset();
#endif
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if HAS_BED_PROBE
zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
#endif
@ -927,20 +927,13 @@ void Config_PrintSettings(bool forReplay) {
/**
* Auto Bed Leveling
*/
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if ENABLED(CUSTOM_M_CODES)
if (!forReplay) {
CONFIG_ECHO_START;
SERIAL_ECHOLNPGM("Z-Probe Offset (mm):");
}
#if HAS_BED_PROBE
if (!forReplay) {
CONFIG_ECHO_START;
SERIAL_ECHOPAIR(" M" STRINGIFY(CUSTOM_M_CODE_SET_Z_PROBE_OFFSET) " Z", zprobe_zoffset);
#else
if (!forReplay) {
CONFIG_ECHO_START;
SERIAL_ECHOPAIR("Z-Probe Offset (mm):", zprobe_zoffset);
}
#endif
SERIAL_ECHOLNPGM("Z-Probe Offset (mm):");
}
CONFIG_ECHO_START;
SERIAL_ECHOPAIR(" M851 Z", zprobe_zoffset);
SERIAL_EOL;
#endif
}

14
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -690,7 +690,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -718,18 +718,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/Cartesio/Configuration_adv.h
View File

@ -417,9 +417,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/Felix/Configuration.h
View File

@ -673,7 +673,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -702,18 +702,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/Felix/Configuration_adv.h
View File

@ -417,9 +417,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -671,7 +671,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -700,18 +700,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

14
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -683,7 +683,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -711,18 +711,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/Hephestos/Configuration_adv.h
View File

@ -417,9 +417,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

15
Marlin/example_configurations/Hephestos_2/Configuration.h
View File

@ -685,7 +685,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -713,17 +713,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// @section probes
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -5
#define Z_PROBE_OFFSET_RANGE_MAX 0
#endif
#endif
#define Z_PROBE_OFFSET_RANGE_MIN -5
#define Z_PROBE_OFFSET_RANGE_MAX 0
// @section extras

9
Marlin/example_configurations/Hephestos_2/Configuration_adv.h
View File

@ -417,9 +417,10 @@
#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/K8200/Configuration.h
View File

@ -708,7 +708,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -736,18 +736,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/K8200/Configuration_adv.h
View File

@ -423,9 +423,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -516,9 +517,9 @@ const unsigned int dropsegments = 2; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 32 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -691,7 +691,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -719,18 +719,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

14
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -685,7 +685,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -714,18 +714,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/RigidBot/Configuration_adv.h
View File

@ -417,9 +417,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 8

14
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -699,7 +699,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -727,18 +727,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
//#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/SCARA/Configuration_adv.h
View File

@ -417,9 +417,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/TAZ4/Configuration.h
View File

@ -712,7 +712,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -740,18 +740,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/TAZ4/Configuration_adv.h
View File

@ -425,9 +425,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -518,9 +519,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -683,7 +683,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -711,18 +711,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/WITBOX/Configuration_adv.h
View File

@ -417,9 +417,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -691,7 +691,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -719,18 +719,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

14
Marlin/example_configurations/delta/biv2.5/Configuration.h
View File

@ -777,7 +777,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -808,18 +808,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
View File

@ -419,9 +419,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -512,9 +513,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -771,7 +771,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -802,18 +802,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/delta/generic/Configuration_adv.h
View File

@ -419,9 +419,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -512,9 +513,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -774,7 +774,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -805,18 +805,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View File

@ -418,9 +418,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -511,9 +512,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

15
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -768,7 +768,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -805,17 +805,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// @section probes
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -15
#define Z_PROBE_OFFSET_RANGE_MAX -5
#endif
#endif
#define Z_PROBE_OFFSET_RANGE_MIN -15
#define Z_PROBE_OFFSET_RANGE_MAX 5
// @section extras

9
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
View File

@ -423,9 +423,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -516,9 +517,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

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

@ -769,7 +769,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -807,18 +807,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

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

@ -419,9 +419,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -512,9 +513,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/makibox/Configuration.h
View File

@ -694,7 +694,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -722,18 +722,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/makibox/Configuration_adv.h
View File

@ -417,9 +417,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

14
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -681,7 +681,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#endif
// @section movement
// @section motion
/**
* MOVEMENT SETTINGS
@ -713,18 +713,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//============================= Additional Features ===========================
//=============================================================================
// @section more
// Custom M code points
#define CUSTOM_M_CODES
#if ENABLED(CUSTOM_M_CODES)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#endif
// @section extras
//

9
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View File

@ -417,9 +417,10 @@
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
// @section more
// @section safety
// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
// The hardware watchdog should reset the microcontroller disabling all outputs,
// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
#if ENABLED(USE_WATCHDOG)
@ -510,9 +511,9 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section more
// @section serial
//The ASCII buffer for receiving from the serial:
// The ASCII buffer for serial input
#define MAX_CMD_SIZE 96
#define BUFSIZE 4

2
Marlin/ultralcd.cpp
View File

@ -1684,7 +1684,7 @@ static void lcd_status_screen() {
static void lcd_control_motion_menu() {
START_MENU();
MENU_ITEM(back, MSG_CONTROL);
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if HAS_BED_PROBE
MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif
// Manual bed leveling, Bed Z:

Write Preview
Loading…
Cancel
Save