Merge pull request #8535 from thinkyhead/bf2_more_mesh_G26
[2.0.x] Adapt G26 to work for all meshes
This commit is contained in:
commit
4d517d169a
|
@ -72,7 +72,7 @@ script:
|
||||||
# Test a probeless build of AUTO_BED_LEVELING_UBL
|
# Test a probeless build of AUTO_BED_LEVELING_UBL
|
||||||
#
|
#
|
||||||
- restore_configs
|
- restore_configs
|
||||||
- opt_enable AUTO_BED_LEVELING_UBL UBL_G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT EEPROM_SETTINGS G3D_PANEL
|
- opt_enable AUTO_BED_LEVELING_UBL G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT EEPROM_SETTINGS G3D_PANEL
|
||||||
- opt_enable_adv CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING
|
- opt_enable_adv CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING
|
||||||
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
|
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
|
||||||
#
|
#
|
||||||
|
@ -101,7 +101,7 @@ script:
|
||||||
# Test MESH_BED_LEVELING feature, with LCD
|
# Test MESH_BED_LEVELING feature, with LCD
|
||||||
#
|
#
|
||||||
- restore_configs
|
- restore_configs
|
||||||
- opt_enable MESH_BED_LEVELING MESH_G28_REST_ORIGIN LCD_BED_LEVELING ULTIMAKERCONTROLLER
|
- opt_enable MESH_BED_LEVELING G26_MESH_EDITING MESH_G28_REST_ORIGIN LCD_BED_LEVELING ULTIMAKERCONTROLLER
|
||||||
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
|
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
|
||||||
#
|
#
|
||||||
# Test MINIRAMBO for PWM_MOTOR_CURRENT
|
# Test MINIRAMBO for PWM_MOTOR_CURRENT
|
||||||
|
@ -115,7 +115,7 @@ script:
|
||||||
#
|
#
|
||||||
- restore_configs
|
- restore_configs
|
||||||
- opt_set MOTHERBOARD BOARD_MINIRAMBO
|
- opt_set MOTHERBOARD BOARD_MINIRAMBO
|
||||||
- opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR LCD_BED_LEVELING ULTIMAKERCONTROLLER
|
- opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR G26_MESH_EDITING LCD_BED_LEVELING ULTIMAKERCONTROLLER
|
||||||
- opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
|
- opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
|
||||||
- opt_enable ULTIMAKERCONTROLLER SDSUPPORT
|
- opt_enable ULTIMAKERCONTROLLER SDSUPPORT
|
||||||
- opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632 USE_XMAX_PLUG
|
- opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632 USE_XMAX_PLUG
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -906,6 +906,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -972,14 +984,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -1005,6 +1005,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -1095,14 +1107,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -892,6 +892,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -958,14 +970,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -877,6 +877,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -943,14 +955,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -887,6 +887,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -953,14 +965,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -877,6 +877,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -943,14 +955,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -885,6 +885,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -951,14 +963,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -896,6 +896,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -962,14 +974,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -868,6 +868,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -934,14 +946,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -868,6 +868,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -934,14 +946,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -883,6 +883,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -949,14 +961,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 25
|
#define UBL_PROBE_PT_3_Y 25
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -901,6 +901,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -967,14 +979,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -890,6 +890,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -956,14 +968,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -914,6 +914,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -980,14 +992,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -890,6 +890,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -956,14 +968,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -890,6 +890,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -956,14 +968,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -887,6 +887,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -953,14 +965,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -884,6 +884,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -950,14 +962,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -898,6 +898,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -964,14 +976,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -889,6 +889,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -955,14 +967,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -917,6 +917,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -983,14 +995,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -942,6 +942,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -1008,14 +1020,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
//#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -916,6 +916,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -982,14 +994,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -886,6 +886,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -952,14 +964,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -1016,6 +1016,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
//#define ENABLE_LEVELING_FADE_HEIGHT
|
//#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -1086,14 +1098,6 @@
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -1016,6 +1016,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
//#define ENABLE_LEVELING_FADE_HEIGHT
|
//#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -1080,14 +1092,6 @@
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -1004,6 +1004,17 @@
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
//#define ENABLE_LEVELING_FADE_HEIGHT
|
//#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
||||||
|
|
||||||
|
@ -1075,14 +1086,6 @@
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -1007,6 +1007,17 @@
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
//#define ENABLE_LEVELING_FADE_HEIGHT
|
//#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
||||||
|
|
||||||
|
@ -1078,14 +1089,6 @@
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -1007,6 +1007,17 @@
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
//#define ENABLE_LEVELING_FADE_HEIGHT
|
//#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
||||||
|
|
||||||
|
@ -1078,14 +1089,6 @@
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -1016,6 +1016,17 @@
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
//#define ENABLE_LEVELING_FADE_HEIGHT
|
//#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
// Set the boundaries for probing (where the probe can reach).
|
// Set the boundaries for probing (where the probe can reach).
|
||||||
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
#define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
|
||||||
|
|
||||||
|
@ -1087,14 +1098,6 @@
|
||||||
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_X _PX(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
#define UBL_PROBE_PT_3_Y _PY(DELTA_PROBEABLE_RADIUS, 240)
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -900,6 +900,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -966,14 +978,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 348
|
#define UBL_PROBE_PT_3_X 348
|
||||||
#define UBL_PROBE_PT_3_Y 211
|
#define UBL_PROBE_PT_3_Y 211
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -889,6 +889,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -955,14 +967,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -881,6 +881,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -947,14 +959,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -891,6 +891,18 @@
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
|
*/
|
||||||
|
//#define G26_MESH_VALIDATION
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#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_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
|
||||||
|
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
@ -957,14 +969,6 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 20
|
#define UBL_PROBE_PT_3_Y 20
|
||||||
|
|
||||||
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
#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_HOTEND_TEMP 205.0 // (c) Default nozzle temperature for the G26 Mesh Validation Tool.
|
|
||||||
#define MESH_TEST_BED_TEMP 60.0 // (c) Default bed temperature for the G26 Mesh Validation Tool.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#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
|
||||||
|
|
||||||
|
|
|
@ -95,6 +95,9 @@
|
||||||
#define STRINGIFY(M) STRINGIFY_(M)
|
#define STRINGIFY(M) STRINGIFY_(M)
|
||||||
|
|
||||||
// Macros for bit masks
|
// Macros for bit masks
|
||||||
|
#ifndef _BV
|
||||||
|
#define _BV(B) (1UL<<(B))
|
||||||
|
#endif
|
||||||
#define TEST(n,b) (((n)&_BV(b))!=0)
|
#define TEST(n,b) (((n)&_BV(b))!=0)
|
||||||
#define SBI(n,b) (n |= _BV(b))
|
#define SBI(n,b) (n |= _BV(b))
|
||||||
#define CBI(n,b) (n &= ~_BV(b))
|
#define CBI(n,b) (n &= ~_BV(b))
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#ifndef __UTILITY_H__
|
#ifndef __UTILITY_H__
|
||||||
#define __UTILITY_H__
|
#define __UTILITY_H__
|
||||||
|
|
||||||
#include "../inc/MarlinConfig.h"
|
#include "../inc/MarlinConfigPre.h"
|
||||||
|
|
||||||
constexpr char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' };
|
constexpr char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' };
|
||||||
|
|
||||||
|
@ -33,6 +33,18 @@ void safe_delay(millis_t ms);
|
||||||
void crc16(uint16_t *crc, const void * const data, uint16_t cnt);
|
void crc16(uint16_t *crc, const void * const data, uint16_t cnt);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(G26_MESH_VALIDATION)
|
||||||
|
/**
|
||||||
|
* These support functions allow the use of large bit arrays of flags that take very
|
||||||
|
* little RAM. Currently they are limited to being 16x16 in size. Changing the declaration
|
||||||
|
* to unsigned long will allow us to go to 32x32 if higher resolution Mesh's are needed
|
||||||
|
* in the future.
|
||||||
|
*/
|
||||||
|
FORCE_INLINE void bit_clear(uint16_t bits[16], const uint8_t x, const uint8_t y) { CBI(bits[y], x); }
|
||||||
|
FORCE_INLINE void bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y) { SBI(bits[y], x); }
|
||||||
|
FORCE_INLINE bool is_bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y) { return TEST(bits[y], x); }
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(ULTRA_LCD)
|
#if ENABLED(ULTRA_LCD)
|
||||||
|
|
||||||
// Convert uint8_t to string with 123 format
|
// Convert uint8_t to string with 123 format
|
||||||
|
|
|
@ -41,6 +41,10 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if G26_MESH_VALIDATION
|
||||||
|
bool g26_debug_flag; // = false
|
||||||
|
#endif
|
||||||
|
|
||||||
bool leveling_is_valid() {
|
bool leveling_is_valid() {
|
||||||
return
|
return
|
||||||
#if ENABLED(MESH_BED_LEVELING)
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
|
|
@ -23,14 +23,17 @@
|
||||||
#ifndef __BEDLEVEL_H__
|
#ifndef __BEDLEVEL_H__
|
||||||
#define __BEDLEVEL_H__
|
#define __BEDLEVEL_H__
|
||||||
|
|
||||||
#include "../../inc/MarlinConfig.h"
|
#include "../../inc/MarlinConfigPre.h"
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING)
|
typedef struct {
|
||||||
#include "mbl/mesh_bed_leveling.h"
|
int8_t x_index, y_index;
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
float distance; // When populated, the distance from the search location
|
||||||
#include "ubl/ubl.h"
|
} mesh_index_pair;
|
||||||
#elif HAS_ABL
|
|
||||||
#include "abl/abl.h"
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
extern bool g26_debug_flag;
|
||||||
|
#else
|
||||||
|
constexpr bool g26_debug_flag = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(PROBE_MANUALLY)
|
#if ENABLED(PROBE_MANUALLY)
|
||||||
|
@ -68,4 +71,23 @@ void reset_bed_level();
|
||||||
void out_of_range_error(const char* p_edge);
|
void out_of_range_error(const char* p_edge);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
||||||
|
#define _GET_MESH_X(I) bilinear_start[X_AXIS] + I * bilinear_grid_spacing[X_AXIS]
|
||||||
|
#define _GET_MESH_Y(J) bilinear_start[Y_AXIS] + J * bilinear_grid_spacing[Y_AXIS]
|
||||||
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
#define _GET_MESH_X(I) ubl.mesh_index_to_xpos(I)
|
||||||
|
#define _GET_MESH_Y(J) ubl.mesh_index_to_ypos(J)
|
||||||
|
#elif ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define _GET_MESH_X(I) mbl.index_to_xpos[I]
|
||||||
|
#define _GET_MESH_Y(J) mbl.index_to_ypos[J]
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#include "mbl/mesh_bed_leveling.h"
|
||||||
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
#include "ubl/ubl.h"
|
||||||
|
#elif HAS_ABL
|
||||||
|
#include "abl/abl.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // __BEDLEVEL_H__
|
#endif // __BEDLEVEL_H__
|
||||||
|
|
|
@ -34,16 +34,6 @@
|
||||||
|
|
||||||
#include "math.h"
|
#include "math.h"
|
||||||
|
|
||||||
/**
|
|
||||||
* These support functions allow the use of large bit arrays of flags that take very
|
|
||||||
* little RAM. Currently they are limited to being 16x16 in size. Changing the declaration
|
|
||||||
* to unsigned long will allow us to go to 32x32 if higher resolution Mesh's are needed
|
|
||||||
* in the future.
|
|
||||||
*/
|
|
||||||
void bit_clear(uint16_t bits[16], const uint8_t x, const uint8_t y) { CBI(bits[y], x); }
|
|
||||||
void bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y) { SBI(bits[y], x); }
|
|
||||||
bool is_bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y) { return TEST(bits[y], x); }
|
|
||||||
|
|
||||||
uint8_t ubl_cnt = 0;
|
uint8_t ubl_cnt = 0;
|
||||||
|
|
||||||
void unified_bed_leveling::echo_name() { SERIAL_PROTOCOLPGM("Unified Bed Leveling"); }
|
void unified_bed_leveling::echo_name() { SERIAL_PROTOCOLPGM("Unified Bed Leveling"); }
|
||||||
|
@ -74,9 +64,6 @@
|
||||||
constexpr float unified_bed_leveling::_mesh_index_to_xpos[16],
|
constexpr float unified_bed_leveling::_mesh_index_to_xpos[16],
|
||||||
unified_bed_leveling::_mesh_index_to_ypos[16];
|
unified_bed_leveling::_mesh_index_to_ypos[16];
|
||||||
|
|
||||||
bool unified_bed_leveling::g26_debug_flag = false,
|
|
||||||
unified_bed_leveling::has_control_of_lcd_panel = false;
|
|
||||||
|
|
||||||
#if ENABLED(ULTRA_LCD)
|
#if ENABLED(ULTRA_LCD)
|
||||||
bool unified_bed_leveling::lcd_map_control = false;
|
bool unified_bed_leveling::lcd_map_control = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -23,9 +23,10 @@
|
||||||
#ifndef UNIFIED_BED_LEVELING_H
|
#ifndef UNIFIED_BED_LEVELING_H
|
||||||
#define UNIFIED_BED_LEVELING_H
|
#define UNIFIED_BED_LEVELING_H
|
||||||
|
|
||||||
#include "../../../Marlin.h"
|
#include "../bedlevel.h"
|
||||||
#include "../../../module/planner.h"
|
#include "../../../module/planner.h"
|
||||||
#include "../../../module/motion.h"
|
#include "../../../module/motion.h"
|
||||||
|
#include "../../../Marlin.h"
|
||||||
|
|
||||||
#define UBL_VERSION "1.01"
|
#define UBL_VERSION "1.01"
|
||||||
#define UBL_OK false
|
#define UBL_OK false
|
||||||
|
@ -34,17 +35,6 @@
|
||||||
#define USE_NOZZLE_AS_REFERENCE 0
|
#define USE_NOZZLE_AS_REFERENCE 0
|
||||||
#define USE_PROBE_AS_REFERENCE 1
|
#define USE_PROBE_AS_REFERENCE 1
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
int8_t x_index, y_index;
|
|
||||||
float distance; // When populated, the distance from the search location
|
|
||||||
} mesh_index_pair;
|
|
||||||
|
|
||||||
// ubl.cpp
|
|
||||||
|
|
||||||
void bit_clear(uint16_t bits[16], const uint8_t x, const uint8_t y);
|
|
||||||
void bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y);
|
|
||||||
bool is_bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y);
|
|
||||||
|
|
||||||
// ubl_motion.cpp
|
// ubl_motion.cpp
|
||||||
|
|
||||||
void debug_current_and_destination(const char * const title);
|
void debug_current_and_destination(const char * const title);
|
||||||
|
@ -56,7 +46,6 @@ enum MeshPointType { INVALID, REAL, SET_IN_BITMAP };
|
||||||
// External references
|
// External references
|
||||||
|
|
||||||
char *ftostr43sign(const float&, char);
|
char *ftostr43sign(const float&, char);
|
||||||
bool ubl_lcd_clicked();
|
|
||||||
|
|
||||||
extern uint8_t ubl_cnt;
|
extern uint8_t ubl_cnt;
|
||||||
|
|
||||||
|
@ -87,22 +76,6 @@ class unified_bed_leveling {
|
||||||
static int g29_grid_size;
|
static int g29_grid_size;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
static float g26_extrusion_multiplier,
|
|
||||||
g26_retraction_multiplier,
|
|
||||||
g26_nozzle,
|
|
||||||
g26_filament_diameter,
|
|
||||||
g26_prime_length,
|
|
||||||
g26_x_pos, g26_y_pos,
|
|
||||||
g26_ooze_amount,
|
|
||||||
g26_layer_height;
|
|
||||||
static int16_t g26_bed_temp,
|
|
||||||
g26_hotend_temp,
|
|
||||||
g26_repeats;
|
|
||||||
static int8_t g26_prime_flag;
|
|
||||||
static bool g26_continue_with_closest, g26_keep_heaters_on;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static float measure_point_with_encoder();
|
static float measure_point_with_encoder();
|
||||||
static float measure_business_card_thickness(float);
|
static float measure_business_card_thickness(float);
|
||||||
static bool g29_parameter_parsing();
|
static bool g29_parameter_parsing();
|
||||||
|
@ -119,21 +92,6 @@ class unified_bed_leveling {
|
||||||
static bool smart_fill_one(const uint8_t x, const uint8_t y, const int8_t xdir, const int8_t ydir);
|
static bool smart_fill_one(const uint8_t x, const uint8_t y, const int8_t xdir, const int8_t ydir);
|
||||||
static void smart_fill_mesh();
|
static void smart_fill_mesh();
|
||||||
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
static bool exit_from_g26();
|
|
||||||
static bool parse_G26_parameters();
|
|
||||||
static void G26_line_to_destination(const float &feed_rate);
|
|
||||||
static mesh_index_pair find_closest_circle_to_print(const float&, const float&);
|
|
||||||
static bool look_for_lines_to_connect();
|
|
||||||
static bool turn_on_heaters();
|
|
||||||
static bool prime_nozzle();
|
|
||||||
static void retract_filament(const float where[XYZE]);
|
|
||||||
static void recover_filament(const float where[XYZE]);
|
|
||||||
static void print_line_from_here_to_there(const float&, const float&, const float&, const float&, const float&, const float&);
|
|
||||||
static void move_to(const float&, const float&, const float&, const float&);
|
|
||||||
inline static void move_to(const float where[XYZE], const float &de) { move_to(where[X_AXIS], where[Y_AXIS], where[Z_AXIS], de); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
static void echo_name();
|
static void echo_name();
|
||||||
|
@ -151,10 +109,6 @@ class unified_bed_leveling {
|
||||||
static void G29() _O0; // O0 for no optimization
|
static void G29() _O0; // O0 for no optimization
|
||||||
static void smart_fill_wlsf(const float &) _O2; // O2 gives smaller code than Os on A2560
|
static void smart_fill_wlsf(const float &) _O2; // O2 gives smaller code than Os on A2560
|
||||||
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
static void G26();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int8_t storage_slot;
|
static int8_t storage_slot;
|
||||||
|
|
||||||
static float z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
|
static float z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
|
||||||
|
@ -183,8 +137,6 @@ class unified_bed_leveling {
|
||||||
MESH_MIN_Y + 14 * (MESH_Y_DIST), MESH_MIN_Y + 15 * (MESH_Y_DIST)
|
MESH_MIN_Y + 14 * (MESH_Y_DIST), MESH_MIN_Y + 15 * (MESH_Y_DIST)
|
||||||
};
|
};
|
||||||
|
|
||||||
static bool g26_debug_flag, has_control_of_lcd_panel;
|
|
||||||
|
|
||||||
#if ENABLED(ULTRA_LCD)
|
#if ENABLED(ULTRA_LCD)
|
||||||
static bool lcd_map_control;
|
static bool lcd_map_control;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -677,8 +677,7 @@
|
||||||
lcd_reset_alert_level();
|
lcd_reset_alert_level();
|
||||||
LCD_MESSAGEPGM("");
|
LCD_MESSAGEPGM("");
|
||||||
lcd_quick_feedback();
|
lcd_quick_feedback();
|
||||||
|
lcd_external_control = false;
|
||||||
has_control_of_lcd_panel = false;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -738,7 +737,10 @@
|
||||||
void unified_bed_leveling::probe_entire_mesh(const float &rx, const float &ry, const bool do_ubl_mesh_map, const bool stow_probe, bool close_or_far) {
|
void unified_bed_leveling::probe_entire_mesh(const float &rx, const float &ry, const bool do_ubl_mesh_map, const bool stow_probe, bool close_or_far) {
|
||||||
mesh_index_pair location;
|
mesh_index_pair location;
|
||||||
|
|
||||||
has_control_of_lcd_panel = true;
|
#if ENABLED(NEWPANEL)
|
||||||
|
lcd_external_control = true;
|
||||||
|
#endif
|
||||||
|
|
||||||
save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
||||||
DEPLOY_PROBE();
|
DEPLOY_PROBE();
|
||||||
|
|
||||||
|
@ -748,12 +750,12 @@
|
||||||
if (do_ubl_mesh_map) display_map(g29_map_type);
|
if (do_ubl_mesh_map) display_map(g29_map_type);
|
||||||
|
|
||||||
#if ENABLED(NEWPANEL)
|
#if ENABLED(NEWPANEL)
|
||||||
if (ubl_lcd_clicked()) {
|
if (is_lcd_clicked()) {
|
||||||
SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.\n");
|
SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.\n");
|
||||||
lcd_quick_feedback();
|
lcd_quick_feedback();
|
||||||
STOW_PROBE();
|
STOW_PROBE();
|
||||||
while (ubl_lcd_clicked()) idle();
|
while (is_lcd_clicked()) idle();
|
||||||
has_control_of_lcd_panel = false;
|
lcd_external_control = false;
|
||||||
restore_ubl_active_state_and_leave();
|
restore_ubl_active_state_and_leave();
|
||||||
safe_delay(50); // Debounce the Encoder wheel
|
safe_delay(50); // Debounce the Encoder wheel
|
||||||
return;
|
return;
|
||||||
|
@ -894,11 +896,11 @@
|
||||||
|
|
||||||
float unified_bed_leveling::measure_point_with_encoder() {
|
float unified_bed_leveling::measure_point_with_encoder() {
|
||||||
|
|
||||||
while (ubl_lcd_clicked()) delay(50); // wait for user to release encoder wheel
|
while (is_lcd_clicked()) delay(50); // wait for user to release encoder wheel
|
||||||
delay(50); // debounce
|
delay(50); // debounce
|
||||||
|
|
||||||
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
||||||
while (!ubl_lcd_clicked()) { // we need the loop to move the nozzle based on the encoder wheel here!
|
while (!is_lcd_clicked()) { // we need the loop to move the nozzle based on the encoder wheel here!
|
||||||
idle();
|
idle();
|
||||||
if (encoder_diff) {
|
if (encoder_diff) {
|
||||||
do_blocking_move_to_z(current_position[Z_AXIS] + 0.01 * float(encoder_diff));
|
do_blocking_move_to_z(current_position[Z_AXIS] + 0.01 * float(encoder_diff));
|
||||||
|
@ -912,7 +914,7 @@
|
||||||
static void echo_and_take_a_measurement() { SERIAL_PROTOCOLLNPGM(" and take a measurement."); }
|
static void echo_and_take_a_measurement() { SERIAL_PROTOCOLLNPGM(" and take a measurement."); }
|
||||||
|
|
||||||
float unified_bed_leveling::measure_business_card_thickness(const float in_height) {
|
float unified_bed_leveling::measure_business_card_thickness(const float in_height) {
|
||||||
has_control_of_lcd_panel = true;
|
lcd_external_control = true;
|
||||||
save_ubl_active_state_and_disable(); // Disable bed level correction for probing
|
save_ubl_active_state_and_disable(); // Disable bed level correction for probing
|
||||||
|
|
||||||
do_blocking_move_to(0.5 * (MESH_MAX_X - (MESH_MIN_X)), 0.5 * (MESH_MAX_Y - (MESH_MIN_Y)), in_height);
|
do_blocking_move_to(0.5 * (MESH_MAX_X - (MESH_MIN_X)), 0.5 * (MESH_MAX_Y - (MESH_MIN_Y)), in_height);
|
||||||
|
@ -944,7 +946,7 @@
|
||||||
SERIAL_PROTOCOLLNPGM("mm thick.");
|
SERIAL_PROTOCOLLNPGM("mm thick.");
|
||||||
}
|
}
|
||||||
|
|
||||||
has_control_of_lcd_panel = false;
|
lcd_external_control = false;
|
||||||
|
|
||||||
restore_ubl_active_state_and_leave();
|
restore_ubl_active_state_and_leave();
|
||||||
|
|
||||||
|
@ -953,7 +955,7 @@
|
||||||
|
|
||||||
void unified_bed_leveling::manually_probe_remaining_mesh(const float &rx, const float &ry, const float &z_clearance, const float &thick, const bool do_ubl_mesh_map) {
|
void unified_bed_leveling::manually_probe_remaining_mesh(const float &rx, const float &ry, const float &z_clearance, const float &thick, const bool do_ubl_mesh_map) {
|
||||||
|
|
||||||
has_control_of_lcd_panel = true;
|
lcd_external_control = true;
|
||||||
|
|
||||||
save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
||||||
|
|
||||||
|
@ -978,7 +980,7 @@
|
||||||
do_blocking_move_to_z(z_clearance);
|
do_blocking_move_to_z(z_clearance);
|
||||||
|
|
||||||
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
||||||
has_control_of_lcd_panel = true;
|
lcd_external_control = true;
|
||||||
|
|
||||||
if (do_ubl_mesh_map) display_map(g29_map_type); // show user where we're probing
|
if (do_ubl_mesh_map) display_map(g29_map_type); // show user where we're probing
|
||||||
|
|
||||||
|
@ -987,9 +989,9 @@
|
||||||
const float z_step = 0.01; // existing behavior: 0.01mm per click, occasionally step
|
const float z_step = 0.01; // existing behavior: 0.01mm per click, occasionally step
|
||||||
//const float z_step = 1.0 / planner.axis_steps_per_mm[Z_AXIS]; // approx one step each click
|
//const float z_step = 1.0 / planner.axis_steps_per_mm[Z_AXIS]; // approx one step each click
|
||||||
|
|
||||||
while (ubl_lcd_clicked()) delay(50); // wait for user to release encoder wheel
|
while (is_lcd_clicked()) delay(50); // wait for user to release encoder wheel
|
||||||
delay(50); // debounce
|
delay(50); // debounce
|
||||||
while (!ubl_lcd_clicked()) { // we need the loop to move the nozzle based on the encoder wheel here!
|
while (!is_lcd_clicked()) { // we need the loop to move the nozzle based on the encoder wheel here!
|
||||||
idle();
|
idle();
|
||||||
if (encoder_diff) {
|
if (encoder_diff) {
|
||||||
do_blocking_move_to_z(current_position[Z_AXIS] + float(encoder_diff) * z_step);
|
do_blocking_move_to_z(current_position[Z_AXIS] + float(encoder_diff) * z_step);
|
||||||
|
@ -997,11 +999,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// this sequence to detect an ubl_lcd_clicked() debounce it and leave if it is
|
// this sequence to detect an is_lcd_clicked() debounce it and leave if it is
|
||||||
// a Press and Hold is repeated in a lot of places (including G26_Mesh_Validation.cpp). This
|
// a Press and Hold is repeated in a lot of places (including G26_Mesh_Validation.cpp). This
|
||||||
// should be redone and compressed.
|
// should be redone and compressed.
|
||||||
const millis_t nxt = millis() + 1500L;
|
const millis_t nxt = millis() + 1500L;
|
||||||
while (ubl_lcd_clicked()) { // debounce and watch for abort
|
while (is_lcd_clicked()) { // debounce and watch for abort
|
||||||
idle();
|
idle();
|
||||||
if (ELAPSED(millis(), nxt)) {
|
if (ELAPSED(millis(), nxt)) {
|
||||||
SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.");
|
SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.");
|
||||||
|
@ -1009,8 +1011,8 @@
|
||||||
|
|
||||||
#if ENABLED(NEWPANEL)
|
#if ENABLED(NEWPANEL)
|
||||||
lcd_quick_feedback();
|
lcd_quick_feedback();
|
||||||
while (ubl_lcd_clicked()) idle();
|
while (is_lcd_clicked()) idle();
|
||||||
has_control_of_lcd_panel = false;
|
lcd_external_control = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
KEEPALIVE_STATE(IN_HANDLER);
|
KEEPALIVE_STATE(IN_HANDLER);
|
||||||
|
@ -1509,7 +1511,7 @@
|
||||||
new_z = FLOOR(new_z * 1000.0) * 0.001; // Chop off digits after the 1000ths place
|
new_z = FLOOR(new_z * 1000.0) * 0.001; // Chop off digits after the 1000ths place
|
||||||
|
|
||||||
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
||||||
has_control_of_lcd_panel = true;
|
lcd_external_control = true;
|
||||||
|
|
||||||
if (do_ubl_mesh_map) display_map(g29_map_type); // show the user which point is being adjusted
|
if (do_ubl_mesh_map) display_map(g29_map_type); // show the user which point is being adjusted
|
||||||
|
|
||||||
|
@ -1523,27 +1525,27 @@
|
||||||
do_blocking_move_to_z(h_offset + new_z); // Move the nozzle as the point is edited
|
do_blocking_move_to_z(h_offset + new_z); // Move the nozzle as the point is edited
|
||||||
#endif
|
#endif
|
||||||
idle();
|
idle();
|
||||||
} while (!ubl_lcd_clicked());
|
} while (!is_lcd_clicked());
|
||||||
|
|
||||||
if (!lcd_map_control) lcd_return_to_status();
|
if (!lcd_map_control) lcd_return_to_status();
|
||||||
|
|
||||||
// The technique used here generates a race condition for the encoder click.
|
// The technique used here generates a race condition for the encoder click.
|
||||||
// It could get detected in lcd_mesh_edit (actually _lcd_mesh_fine_tune) or here.
|
// It could get detected in lcd_mesh_edit (actually _lcd_mesh_fine_tune) or here.
|
||||||
// Let's work on specifying a proper API for the LCD ASAP, OK?
|
// Let's work on specifying a proper API for the LCD ASAP, OK?
|
||||||
has_control_of_lcd_panel = true;
|
lcd_external_control = true;
|
||||||
|
|
||||||
// this sequence to detect an ubl_lcd_clicked() debounce it and leave if it is
|
// this sequence to detect an is_lcd_clicked() debounce it and leave if it is
|
||||||
// a Press and Hold is repeated in a lot of places (including G26_Mesh_Validation.cpp). This
|
// a Press and Hold is repeated in a lot of places (including G26_Mesh_Validation.cpp). This
|
||||||
// should be redone and compressed.
|
// should be redone and compressed.
|
||||||
const millis_t nxt = millis() + 1500UL;
|
const millis_t nxt = millis() + 1500UL;
|
||||||
while (ubl_lcd_clicked()) { // debounce and watch for abort
|
while (is_lcd_clicked()) { // debounce and watch for abort
|
||||||
idle();
|
idle();
|
||||||
if (ELAPSED(millis(), nxt)) {
|
if (ELAPSED(millis(), nxt)) {
|
||||||
lcd_return_to_status();
|
lcd_return_to_status();
|
||||||
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
|
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
|
||||||
LCD_MESSAGEPGM(MSG_EDITING_STOPPED);
|
LCD_MESSAGEPGM(MSG_EDITING_STOPPED);
|
||||||
|
|
||||||
while (ubl_lcd_clicked()) idle();
|
while (is_lcd_clicked()) idle();
|
||||||
|
|
||||||
goto FINE_TUNE_EXIT;
|
goto FINE_TUNE_EXIT;
|
||||||
}
|
}
|
||||||
|
@ -1559,7 +1561,7 @@
|
||||||
|
|
||||||
FINE_TUNE_EXIT:
|
FINE_TUNE_EXIT:
|
||||||
|
|
||||||
has_control_of_lcd_panel = false;
|
lcd_external_control = false;
|
||||||
KEEPALIVE_STATE(IN_HANDLER);
|
KEEPALIVE_STATE(IN_HANDLER);
|
||||||
|
|
||||||
if (do_ubl_mesh_map) display_map(g29_map_type);
|
if (do_ubl_mesh_map) display_map(g29_map_type);
|
||||||
|
|
|
@ -23,9 +23,7 @@
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
#include "ubl.h"
|
#include "../bedlevel.h"
|
||||||
|
|
||||||
#include "../../../Marlin.h"
|
|
||||||
#include "../../../module/planner.h"
|
#include "../../../module/planner.h"
|
||||||
#include "../../../module/stepper.h"
|
#include "../../../module/stepper.h"
|
||||||
#include "../../../module/motion.h"
|
#include "../../../module/motion.h"
|
||||||
|
@ -34,6 +32,7 @@
|
||||||
#include "../../../module/delta.h"
|
#include "../../../module/delta.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "../../../Marlin.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
extern float destination[XYZE];
|
extern float destination[XYZE];
|
||||||
|
@ -55,7 +54,7 @@
|
||||||
|
|
||||||
// if the title message starts with a '!' it is so important, we are going to
|
// if the title message starts with a '!' it is so important, we are going to
|
||||||
// ignore the status of the g26_debug_flag
|
// ignore the status of the g26_debug_flag
|
||||||
if (*title != '!' && !ubl.g26_debug_flag) return;
|
if (*title != '!' && !g26_debug_flag) return;
|
||||||
|
|
||||||
const float de = destination[E_AXIS] - current_position[E_AXIS];
|
const float de = destination[E_AXIS] - current_position[E_AXIS];
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -44,17 +44,6 @@ void GcodeSuite::G42() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
|
||||||
#define _GET_MESH_X(I) bilinear_start[X_AXIS] + I * bilinear_grid_spacing[X_AXIS]
|
|
||||||
#define _GET_MESH_Y(J) bilinear_start[Y_AXIS] + J * bilinear_grid_spacing[Y_AXIS]
|
|
||||||
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
|
||||||
#define _GET_MESH_X(I) ubl.mesh_index_to_xpos(I)
|
|
||||||
#define _GET_MESH_Y(J) ubl.mesh_index_to_ypos(J)
|
|
||||||
#elif ENABLED(MESH_BED_LEVELING)
|
|
||||||
#define _GET_MESH_X(I) mbl.index_to_xpos[I]
|
|
||||||
#define _GET_MESH_Y(J) mbl.index_to_ypos[J]
|
|
||||||
#endif
|
|
||||||
|
|
||||||
set_destination_from_current();
|
set_destination_from_current();
|
||||||
if (hasI) destination[X_AXIS] = _GET_MESH_X(ix);
|
if (hasI) destination[X_AXIS] = _GET_MESH_X(ix);
|
||||||
if (hasJ) destination[Y_AXIS] = _GET_MESH_Y(iy);
|
if (hasJ) destination[Y_AXIS] = _GET_MESH_Y(iy);
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
/**
|
|
||||||
* Marlin 3D Printer Firmware
|
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|
||||||
*
|
|
||||||
* Based on Sprinter and grbl.
|
|
||||||
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* G26.cpp - Unified Bed Leveling
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "../../../inc/MarlinConfig.h"
|
|
||||||
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
|
||||||
|
|
||||||
#include "../../gcode.h"
|
|
||||||
#include "../../../feature/bedlevel/ubl/ubl.h"
|
|
||||||
|
|
||||||
void GcodeSuite::G26() { ubl.G26(); }
|
|
||||||
|
|
||||||
#endif // UBL_G26_MESH_VALIDATION
|
|
|
@ -29,7 +29,7 @@
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
#include "../../gcode.h"
|
#include "../../gcode.h"
|
||||||
#include "../../../feature/bedlevel/ubl/ubl.h"
|
#include "../../../feature/bedlevel/bedlevel.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* M421: Set a single Mesh Bed Leveling Z coordinate
|
* M421: Set a single Mesh Bed Leveling Z coordinate
|
||||||
|
|
|
@ -21,20 +21,20 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* M49.cpp - Unified Bed Leveling
|
* M49.cpp - Toggle the G26 debug flag
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "../../../inc/MarlinConfig.h"
|
#include "../../../inc/MarlinConfig.h"
|
||||||
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
|
||||||
#include "../../gcode.h"
|
#include "../../gcode.h"
|
||||||
#include "../../../feature/bedlevel/bedlevel.h"
|
#include "../../../feature/bedlevel/bedlevel.h"
|
||||||
|
|
||||||
void GcodeSuite::M49() {
|
void GcodeSuite::M49() {
|
||||||
ubl.g26_debug_flag ^= true;
|
g26_debug_flag ^= true;
|
||||||
SERIAL_PROTOCOLPGM("UBL Debug Flag turned ");
|
SERIAL_PROTOCOLPGM("G26 Debug ");
|
||||||
serialprintPGM(ubl.g26_debug_flag ? PSTR("on.") : PSTR("off."));
|
serialprintPGM(g26_debug_flag ? PSTR("on.") : PSTR("off."));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // UBL_G26_MESH_VALIDATION
|
#endif // G26_MESH_VALIDATION
|
||||||
|
|
|
@ -207,7 +207,7 @@ void GcodeSuite::process_parsed_command() {
|
||||||
break;
|
break;
|
||||||
#endif // INCH_MODE_SUPPORT
|
#endif // INCH_MODE_SUPPORT
|
||||||
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
case 26: // G26: Mesh Validation Pattern generation
|
case 26: // G26: Mesh Validation Pattern generation
|
||||||
G26();
|
G26();
|
||||||
break;
|
break;
|
||||||
|
@ -342,7 +342,7 @@ void GcodeSuite::process_parsed_command() {
|
||||||
case 48: M48(); break; // M48: Z probe repeatability test
|
case 48: M48(); break; // M48: Z probe repeatability test
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
case 49: M49(); break; // M49: Turn on or off G26 debug flag for verbose output
|
case 49: M49(); break; // M49: Turn on or off G26 debug flag for verbose output
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
* G19 - Select Plane YZ (Requires CNC_WORKSPACE_PLANES)
|
* G19 - Select Plane YZ (Requires CNC_WORKSPACE_PLANES)
|
||||||
* G20 - Set input units to inches (Requires INCH_MODE_SUPPORT)
|
* G20 - Set input units to inches (Requires INCH_MODE_SUPPORT)
|
||||||
* G21 - Set input units to millimeters (Requires INCH_MODE_SUPPORT)
|
* G21 - Set input units to millimeters (Requires INCH_MODE_SUPPORT)
|
||||||
* G26 - Mesh Validation Pattern (Requires UBL_G26_MESH_VALIDATION)
|
* G26 - Mesh Validation Pattern (Requires G26_MESH_VALIDATION)
|
||||||
* G27 - Park Nozzle (Requires NOZZLE_PARK_FEATURE)
|
* G27 - Park Nozzle (Requires NOZZLE_PARK_FEATURE)
|
||||||
* G28 - Home one or more axes
|
* G28 - Home one or more axes
|
||||||
* G29 - Start or continue the bed leveling probe procedure (Requires bed leveling)
|
* G29 - Start or continue the bed leveling probe procedure (Requires bed leveling)
|
||||||
|
@ -357,7 +357,7 @@ private:
|
||||||
static void G21();
|
static void G21();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
static void G26();
|
static void G26();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -453,7 +453,7 @@ private:
|
||||||
static void M48();
|
static void M48();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(UBL_G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
static void M49();
|
static void M49();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MARLIN_CONFIG_H
|
#ifndef _MARLIN_CONFIG_H_
|
||||||
#define MARLIN_CONFIG_H
|
#define _MARLIN_CONFIG_H_
|
||||||
|
|
||||||
#include "MarlinConfigPre.h"
|
#include "MarlinConfigPre.h"
|
||||||
|
|
||||||
|
@ -36,8 +36,7 @@
|
||||||
// Include all core headers
|
// Include all core headers
|
||||||
#include "../core/enum.h"
|
#include "../core/enum.h"
|
||||||
#include "../core/language.h"
|
#include "../core/language.h"
|
||||||
#include "../core/types.h"
|
|
||||||
#include "../core/utility.h"
|
#include "../core/utility.h"
|
||||||
#include "../core/serial.h"
|
#include "../core/serial.h"
|
||||||
|
|
||||||
#endif // MARLIN_CONFIG_H
|
#endif // _MARLIN_CONFIG_H_
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MARLIN_CONFIGPRE_H
|
#ifndef _MARLIN_CONFIGPRE_H_
|
||||||
#define MARLIN_CONFIGPRE_H
|
#define _MARLIN_CONFIGPRE_H_
|
||||||
|
|
||||||
#include "../core/boards.h"
|
#include "../core/boards.h"
|
||||||
#include "../core/macros.h"
|
#include "../core/macros.h"
|
||||||
|
@ -31,4 +31,6 @@
|
||||||
#include "../../Configuration_adv.h"
|
#include "../../Configuration_adv.h"
|
||||||
#include "Conditionals_adv.h"
|
#include "Conditionals_adv.h"
|
||||||
|
|
||||||
#endif // MARLIN_CONFIGPRE_H
|
#include "../core/types.h"
|
||||||
|
|
||||||
|
#endif // _MARLIN_CONFIGPRE_H_
|
||||||
|
|
|
@ -183,10 +183,12 @@
|
||||||
#error "MESH_NUM_[XY]_POINTS is now GRID_MAX_POINTS_[XY]. Please update your configuration."
|
#error "MESH_NUM_[XY]_POINTS is now GRID_MAX_POINTS_[XY]. Please update your configuration."
|
||||||
#elif defined(UBL_MESH_NUM_X_POINTS) || defined(UBL_MESH_NUM_Y_POINTS)
|
#elif defined(UBL_MESH_NUM_X_POINTS) || defined(UBL_MESH_NUM_Y_POINTS)
|
||||||
#error "UBL_MESH_NUM_[XY]_POINTS is now GRID_MAX_POINTS_[XY]. Please update your configuration."
|
#error "UBL_MESH_NUM_[XY]_POINTS is now GRID_MAX_POINTS_[XY]. Please update your configuration."
|
||||||
|
#elif defined(UBL_G26_MESH_VALIDATION)
|
||||||
|
#error "UBL_G26_MESH_VALIDATION is now G26_MESH_VALIDATION. Please update your configuration."
|
||||||
#elif defined(UBL_MESH_EDIT_ENABLED)
|
#elif defined(UBL_MESH_EDIT_ENABLED)
|
||||||
#error "UBL_MESH_EDIT_ENABLED is now UBL_G26_MESH_VALIDATION. Please update your configuration."
|
#error "UBL_MESH_EDIT_ENABLED is now G26_MESH_VALIDATION. Please update your configuration."
|
||||||
#elif defined(UBL_MESH_EDITING)
|
#elif defined(UBL_MESH_EDITING)
|
||||||
#error "UBL_MESH_EDITING is now UBL_G26_MESH_VALIDATION. Please update your configuration."
|
#error "UBL_MESH_EDITING is now G26_MESH_VALIDATION. Please update your configuration."
|
||||||
#elif defined(BLTOUCH_HEATERS_OFF)
|
#elif defined(BLTOUCH_HEATERS_OFF)
|
||||||
#error "BLTOUCH_HEATERS_OFF is now PROBING_HEATERS_OFF. Please update your configuration."
|
#error "BLTOUCH_HEATERS_OFF is now PROBING_HEATERS_OFF. Please update your configuration."
|
||||||
#elif defined(BEEPER)
|
#elif defined(BEEPER)
|
||||||
|
@ -826,6 +828,10 @@ static_assert(1 >= 0
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if !HAS_MESH && ENABLED(G26_MESH_VALIDATION)
|
||||||
|
#error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* LCD_BED_LEVELING requirements
|
* LCD_BED_LEVELING requirements
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -60,6 +60,10 @@
|
||||||
#include "../libs/buzzer.h"
|
#include "../libs/buzzer.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(G26_MESH_VALIDATION)
|
||||||
|
bool lcd_external_control; // = false
|
||||||
|
#endif
|
||||||
|
|
||||||
// Initialized by settings.load()
|
// Initialized by settings.load()
|
||||||
int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
|
int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
|
||||||
|
|
||||||
|
@ -4599,7 +4603,7 @@ void lcd_update() {
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
// Don't run the debouncer if UBL owns the display
|
// Don't run the debouncer if UBL owns the display
|
||||||
#define UBL_CONDITION !ubl.has_control_of_lcd_panel
|
#define UBL_CONDITION !lcd_external_control
|
||||||
#else
|
#else
|
||||||
#define UBL_CONDITION true
|
#define UBL_CONDITION true
|
||||||
#endif
|
#endif
|
||||||
|
@ -5070,7 +5074,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
|
||||||
case encrot3: ENCODER_SPIN(encrot2, encrot0); break;
|
case encrot3: ENCODER_SPIN(encrot2, encrot0); break;
|
||||||
}
|
}
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
if (ubl.has_control_of_lcd_panel) {
|
if (lcd_external_control) {
|
||||||
ubl.encoder_diff = encoderDiff; // Make the encoder's rotation available to G29's Mesh Editor
|
ubl.encoder_diff = encoderDiff; // Make the encoder's rotation available to G29's Mesh Editor
|
||||||
encoderDiff = 0; // We are going to lie to the LCD Panel and claim the encoder
|
encoderDiff = 0; // We are going to lie to the LCD Panel and claim the encoder
|
||||||
// knob has not turned.
|
// knob has not turned.
|
||||||
|
@ -5086,14 +5090,14 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
|
||||||
bool lcd_detected() { return true; }
|
bool lcd_detected() { return true; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
void lcd_chirp() {
|
||||||
void chirp_at_user() {
|
|
||||||
lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
|
lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
bool ubl_lcd_clicked() { return LCD_CLICKED; }
|
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(G26_MESH_VALIDATION)
|
||||||
|
bool is_lcd_clicked() { return LCD_CLICKED; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // ULTIPANEL
|
#endif // ULTIPANEL
|
||||||
|
|
|
@ -29,6 +29,12 @@
|
||||||
|
|
||||||
#include "../Marlin.h"
|
#include "../Marlin.h"
|
||||||
|
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(G26_MESH_VALIDATION)
|
||||||
|
extern bool lcd_external_control;
|
||||||
|
#else
|
||||||
|
constexpr bool lcd_external_control = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
#define BUTTON_EXISTS(BN) (defined(BTN_## BN) && BTN_## BN >= 0)
|
#define BUTTON_EXISTS(BN) (defined(BTN_## BN) && BTN_## BN >= 0)
|
||||||
#define BUTTON_PRESSED(BN) !READ(BTN_## BN)
|
#define BUTTON_PRESSED(BN) !READ(BTN_## BN)
|
||||||
|
|
||||||
|
@ -123,6 +129,10 @@
|
||||||
void lcd_advanced_pause_show_message(const AdvancedPauseMessage message);
|
void lcd_advanced_pause_show_message(const AdvancedPauseMessage message);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
|
void lcd_chirp();
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
void lcd_mesh_edit_setup(float initial);
|
void lcd_mesh_edit_setup(float initial);
|
||||||
float lcd_mesh_edit();
|
float lcd_mesh_edit();
|
||||||
|
@ -208,6 +218,10 @@
|
||||||
#define LCD_CLICKED false
|
#define LCD_CLICKED false
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(G26_MESH_VALIDATION)
|
||||||
|
bool is_lcd_clicked();
|
||||||
|
#endif
|
||||||
|
|
||||||
#else // no LCD
|
#else // no LCD
|
||||||
|
|
||||||
inline void lcd_update() {}
|
inline void lcd_update() {}
|
||||||
|
|
Loading…
Reference in a new issue