diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6e11b0aa9..422c1d13b 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -10,13 +10,13 @@ //#define TazDualZ /************** Uncomment a Tool Head Option From Below *********************/ -//#define LULZBOT_UNIVERSAL_TOOLHEAD +#define LULZBOT_UNIVERSAL_TOOLHEAD //#define TOOLHEAD_SL_SE_HE //#define TOOLHEAD_HS_HSPLUS //#define TOOLHEAD_H175 //#define TOOLHEAD_M175 //#define TOOLHEAD_SK175 -#define TOOLHEAD_SK285 +//#define TOOLHEAD_SK285 //#define TOOLHEAD_Quiver_DualExtruder // TAZ Pro Dual Extruder //#define TOOLHEAD_Albatross_Flexystruder // TAZ Legacy Flexystruder //#define TOOLHEAD_Finch_Aerostruder // TAZ Legacy Titan Aerostruder v1 0.50 mm @@ -97,7 +97,7 @@ // Author info of this build printed to the host during boot and M115 #define STRING_CONFIG_H_AUTHOR "Lulzbot" // Who made the changes. #define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) -#define LULZBOT_FW_VERSION "2.0.9.0.4" +#define LULZBOT_FW_VERSION "2.0.9.0.5" /** * *** VENDORS PLEASE READ *** @@ -1279,7 +1279,7 @@ #elif ENABLED(TAZ6) #define Z_FEEDRATE 5 #elif ANY(Workhorse, TAZPro, TAZProXT) - #define Z_FEEDRATE 30 + #define Z_FEEDRATE 29 #endif #define DEFAULT_MAX_FEEDRATE { 300, 300, Z_FEEDRATE, 40 } diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index c8c0593ca..5a2c7983d 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1257,7 +1257,7 @@ #if HAS_LCD_MENU // Add Probe Z Offset calibration to the Z Probe Offsets menu - #if HAS_BED_PROBE && NONE(TAZPro, TAZProXT) + #if HAS_BED_PROBE && ANY(Sidekick_289, Sidekick_747) #define PROBE_OFFSET_WIZARD #if ENABLED(PROBE_OFFSET_WIZARD) // diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp index 8d886c704..69ffafbcd 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp @@ -46,7 +46,7 @@ void ZOffsetScreen::onRedraw(draw_mode_t what) { w.heading( GET_TEXT_F(MSG_ZPROBE_ZOFFSET)); w.color(z_axis).adjuster(4, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), getZOffset_mm()); w.increments(); - w.button(2, GET_TEXT_F(MSG_PROBE_WIZARD), !isPrinting()); + //w.button(2, GET_TEXT_F(MSG_PROBE_WIZARD), !isPrinting()); } void ZOffsetScreen::move(float mm, int16_t steps) { @@ -88,7 +88,7 @@ bool ZOffsetScreen::onTouchHeld(uint8_t tag) { const int16_t steps = mmToWholeSteps(getIncrement(), Z); const float increment = mmFromWholeSteps(steps, Z); switch (tag) { - case 2: runWizard(); break; + //case 2: runWizard(); break; case 4: UI_DECREMENT(ZOffset_mm); move(-increment, -steps); break; case 5: UI_INCREMENT(ZOffset_mm); move( increment, steps); break; default: