CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making Probe wizard no longer apear for pro/proXT

Browse Source
This commit is contained in:
Brian Kahl 2021-09-01 11:48:09 -05:00
parent a754054099
commit 92e3ac651e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Configuration.h
View File

@ -10,13 +10,13 @@
//#define TazDualZ //#define TazDualZ
/************** Uncomment a Tool Head Option From Below *********************/ /************** Uncomment a Tool Head Option From Below *********************/
//#define LULZBOT_UNIVERSAL_TOOLHEAD #define LULZBOT_UNIVERSAL_TOOLHEAD
//#define TOOLHEAD_SL_SE_HE //#define TOOLHEAD_SL_SE_HE
//#define TOOLHEAD_HS_HSPLUS //#define TOOLHEAD_HS_HSPLUS
//#define TOOLHEAD_H175 //#define TOOLHEAD_H175
//#define TOOLHEAD_M175 //#define TOOLHEAD_M175
//#define TOOLHEAD_SK175 //#define TOOLHEAD_SK175
#define TOOLHEAD_SK285 //#define TOOLHEAD_SK285
//#define TOOLHEAD_Quiver_DualExtruder // TAZ Pro Dual Extruder //#define TOOLHEAD_Quiver_DualExtruder // TAZ Pro Dual Extruder
//#define TOOLHEAD_Albatross_Flexystruder // TAZ Legacy Flexystruder //#define TOOLHEAD_Albatross_Flexystruder // TAZ Legacy Flexystruder
//#define TOOLHEAD_Finch_Aerostruder // TAZ Legacy Titan Aerostruder v1 0.50 mm //#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 // Author info of this build printed to the host during boot and M115
#define STRING_CONFIG_H_AUTHOR "Lulzbot" // Who made the changes. #define STRING_CONFIG_H_AUTHOR "Lulzbot" // Who made the changes.
#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) #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 *** * *** VENDORS PLEASE READ ***
@ -1279,7 +1279,7 @@
#elif ENABLED(TAZ6) #elif ENABLED(TAZ6)
#define Z_FEEDRATE 5 #define Z_FEEDRATE 5
#elif ANY(Workhorse, TAZPro, TAZProXT) #elif ANY(Workhorse, TAZPro, TAZProXT)
#define Z_FEEDRATE 30 #define Z_FEEDRATE 29
#endif #endif
#define DEFAULT_MAX_FEEDRATE { 300, 300, Z_FEEDRATE, 40 } #define DEFAULT_MAX_FEEDRATE { 300, 300, Z_FEEDRATE, 40 }

2
Marlin/Configuration_adv.h
View File

@ -1257,7 +1257,7 @@
#if HAS_LCD_MENU #if HAS_LCD_MENU
// Add Probe Z Offset calibration to the Z Probe Offsets 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 #define PROBE_OFFSET_WIZARD
#if ENABLED(PROBE_OFFSET_WIZARD) #if ENABLED(PROBE_OFFSET_WIZARD)
// //

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
View File

@ -46,7 +46,7 @@ void ZOffsetScreen::onRedraw(draw_mode_t what) {
w.heading( GET_TEXT_F(MSG_ZPROBE_ZOFFSET)); w.heading( GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
w.color(z_axis).adjuster(4, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), getZOffset_mm()); w.color(z_axis).adjuster(4, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), getZOffset_mm());
w.increments(); 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) { 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 int16_t steps = mmToWholeSteps(getIncrement(), Z);
const float increment = mmFromWholeSteps(steps, Z); const float increment = mmFromWholeSteps(steps, Z);
switch (tag) { switch (tag) {
case 2: runWizard(); break; //case 2: runWizard(); break;
case 4: UI_DECREMENT(ZOffset_mm); move(-increment, -steps); break; case 4: UI_DECREMENT(ZOffset_mm); move(-increment, -steps); break;
case 5: UI_INCREMENT(ZOffset_mm); move( increment, steps); break; case 5: UI_INCREMENT(ZOffset_mm); move( increment, steps); break;
default: default: