From ff91016e8163fdf16e2bbd199ac3b2941b71bf1a Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sun, 29 May 2022 17:23:13 -0400 Subject: [PATCH] Config improvements --- Marlin/Configuration.h | 14 +++++++------- Marlin/Configuration_adv.h | 15 +++++++++++---- platformio.ini | 14 ++++++++++++++ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 4665609205..e09ef049c8 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -897,8 +897,8 @@ #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. - //#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of flash) - //#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash) + #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of flash) + #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash) #endif // @section extruder @@ -1562,9 +1562,9 @@ //#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors // Require minimum nozzle and/or bed temperature for probing -//#define PREHEAT_BEFORE_PROBING +#define PREHEAT_BEFORE_PROBING #if ENABLED(PREHEAT_BEFORE_PROBING) - #define PROBING_NOZZLE_TEMP 120 // (°C) Only applies to E0 at this time + #define PROBING_NOZZLE_TEMP 150 // (°C) Only applies to E0 at this time #define PROBING_BED_TEMP 50 #endif @@ -1937,7 +1937,7 @@ // The height can be set with M420 Z #define ENABLE_LEVELING_FADE_HEIGHT #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) - #define DEFAULT_LEVELING_FADE_HEIGHT 10.0 // (mm) Default fade height. + #define DEFAULT_LEVELING_FADE_HEIGHT 0.0 // (mm) Default fade height. #endif // For Cartesian machines, instead of dividing moves on mesh boundaries, @@ -1949,7 +1949,7 @@ /** * Enable the G26 Mesh Validation Pattern tool. */ - //#define G26_MESH_VALIDATION + #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 G26. @@ -2109,7 +2109,7 @@ #if ENABLED(Z_SAFE_HOMING) #define Z_SAFE_HOMING_X_POINT -19 // X point for Z homing - #define Z_SAFE_HOMING_Y_POINT 258 // Y point for Z homing + #define Z_SAFE_HOMING_Y_POINT 262 // Y point for Z homing #endif // Homing speeds (mm/m) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index bb1374c0e3..6c02943ba0 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1161,7 +1161,14 @@ //#define CALIBRATION_SCRIPT_PRE "M117 Starting Auto-Calibration\nT0\nG28\nG12\nM117 Calibrating..." //#define CALIBRATION_SCRIPT_POST "M500\nM117 Calibration data saved" - #define CALIBRATION_MEASUREMENT_RESOLUTION 0.01 // mm + // Calculate single step resolution + #if ENABLED(Mini) + #define CALIBRATION_MEASUREMENT_RESOLUTION (1.0f/833.0f) // mm + #elif ENABLED(Taz6) + #define CALIBRATION_MEASUREMENT_RESOLUTION (1.0f/830.0f) // mm + #elif ANY(Workhorse, TazPro, MiniV2) + #define CALIBRATION_MEASUREMENT_RESOLUTION (1.0f/420.0f) // mm + #endif #define CALIBRATION_FEEDRATE_SLOW 60 // mm/m #define CALIBRATION_FEEDRATE_FAST 1200 // mm/m @@ -1249,7 +1256,7 @@ * vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the * lowest stepping frequencies. */ -//#define ADAPTIVE_STEP_SMOOTHING +#define ADAPTIVE_STEP_SMOOTHING /** * Custom Microstepping @@ -1520,7 +1527,7 @@ //#define MEDIA_MENU_AT_TOP // Force the media menu to be listed on the top of the main menu - #define EVENT_GCODE_SD_ABORT "G28XY" // G-code to run on SD Abort Print (e.g., "G28XY" or "G27") + #define EVENT_GCODE_SD_ABORT "G91\nG1Z5\nG90\nM84\nM104S0\nM140S0" // G-code to run on SD Abort Print (e.g., "G28XY" or "G27") #if ENABLED(PRINTER_EVENT_LEDS) #define PE_LEDS_COMPLETED_TIME (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination @@ -4141,7 +4148,7 @@ #endif #define MAIN_MENU_ITEM_4_DESC "Mosquito BMG-M" - #define USER_GCOMAIN_MENU_ITEM_4_GCODEDE_4 "M92E415\nM206X-5Y-12\nM301P148.07I26.58D206.21\nM907E" E_CURRENT_BMG "\nM500" + #define MAIN_MENU_ITEM_4_GCODE "M92E415\nM206X-5Y-12\nM301P148.07I26.58D206.21\nM907E" E_CURRENT_BMG "\nM500" #define MAIN_MENU_ITEM_4_CONFIRM #endif diff --git a/platformio.ini b/platformio.ini index 422c882a9b..b9b8973899 100644 --- a/platformio.ini +++ b/platformio.ini @@ -16,7 +16,9 @@ boards_dir = buildroot/share/PlatformIO/boards default_envs = Mini MiniV2 Taz6 + Taz6DualZ Workhorse + WorkhorseDualZ TazPro include_dir = Marlin extra_configs = @@ -322,6 +324,12 @@ extends = common_avr8 build_flags = ${common.build_flags} -DTaz6 board = megaatmega2560 +[env:Taz6DualZ] +platform = atmelavr +extends = common_avr8 +build_flags = ${common.build_flags} -DTaz6 -DTazDualZ +board = megaatmega2560 + # # Taz Workhorse # @@ -331,6 +339,12 @@ extends = common_avr8 build_flags = ${common.build_flags} -DWorkhorse board = megaatmega2560 +[env:WorkhorseDualZ] +platform = atmelavr +extends = common_avr8 +build_flags = ${common.build_flags} -DWorkhorse -DTazDualZ +board = megaatmega2560 + [env:TazPro] platform = atmelsam extends = env:DUE