Skip to content

Commit

Permalink
Updates - 1/18 Couple fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@classicrocker883
classicrocker883 committed Jan 18, 2023
1 parent 9f549da commit cc048c8
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Marlin/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1565,7 +1565,7 @@
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
*/
#define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
//#define Z_AFTER_PROBING 5 // Z position after probing is done
Expand Down
30 changes: 15 additions & 15 deletions Marlin/src/lcd/e3v2/proui/dwin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ void update_variable() {

bool DWIN_lcd_sd_status = false;

void SetMediaAutoMount() { Toogle_Chkb_Line(HMI_data.MediaAutoMount); }
void SetMediaAutoMount() { Toggle_Chkb_Line(HMI_data.MediaAutoMount); }

inline uint16_t nr_sd_menu_items() {
return _MIN(card.get_num_Files() + !card.flag.workDirIsRoot, MENU_MAX_ITEMS);
Expand Down Expand Up @@ -2205,7 +2205,7 @@ void DoCoolDown() { thermalManager.cooldown(); }


bool EnableLiveMove = false;
void SetLiveMove() { Toogle_Chkb_Line(EnableLiveMove); }
void SetLiveMove() { Toggle_Chkb_Line(EnableLiveMove); }
void LiveMove() {
planner.synchronize();
if (!EnableLiveMove) return;
Expand Down Expand Up @@ -2249,14 +2249,14 @@ void SetPID(celsius_t t, heater_id_t h) {

#if ENABLED(POWER_LOSS_RECOVERY)
void SetPwrLossr() {
Toogle_Chkb_Line(recovery.enabled);
Toggle_Chkb_Line(recovery.enabled);
recovery.changed();
}
#endif

#if ENABLED(BAUD_RATE_GCODE)
void SetBaudRate() {
Toogle_Chkb_Line(HMI_data.Baud250K);
Toggle_Chkb_Line(HMI_data.Baud250K);
if (HMI_data.Baud250K) SetBaud250K(); else SetBaud115K();
}
void SetBaud115K() { queue.inject(F("M575B115")); }
Expand All @@ -2272,7 +2272,7 @@ void SetPID(celsius_t t, heater_id_t h) {

#if ENABLED(CASE_LIGHT_MENU)
void SetCaseLight() {
Toogle_Chkb_Line(caselight.on);
Toggle_Chkb_Line(caselight.on);
caselight.update_enabled();
}
#if ENABLED(CASELIGHT_USES_BRIGHTNESS)
Expand Down Expand Up @@ -2306,17 +2306,17 @@ void SetPID(celsius_t t, heater_id_t h) {

#if ENABLED(SOUND_MENU_ITEM)
void SetEnableSound() {
Toogle_Chkb_Line(ui.sound_on);
Toggle_Chkb_Line(ui.sound_on);
}
//changed
void SetEnableTick() {
Toogle_Chkb_Line(ui.no_tick);
Toggle_Chkb_Line(ui.no_tick);
}
#endif

#if ENABLED(USE_UBL_VIEWER) //changed
void SetViewMesh() {
Toogle_Chkb_Line(BedLevelTools.view_mesh);
Toggle_Chkb_Line(BedLevelTools.view_mesh);
}
#endif

Expand Down Expand Up @@ -2347,7 +2347,7 @@ void SetPID(celsius_t t, heater_id_t h) {

#if ENABLED(BLTOUCH_HS_MODE)
void SetHSMode() {
Toogle_Chkb_Line(bltouch.high_speed_mode);
Toggle_Chkb_Line(bltouch.high_speed_mode);
}
#endif

Expand All @@ -2367,7 +2367,7 @@ void SetPID(celsius_t t, heater_id_t h) {
#if HAS_FILAMENT_SENSOR
void SetRunoutEnable() {
runout.reset();
Toogle_Chkb_Line(runout.enabled);
Toggle_Chkb_Line(runout.enabled);
}

#if ProUIex
Expand Down Expand Up @@ -2651,11 +2651,11 @@ void TramC () { Tram(4); }
}

void SetManualTramming() {
Toogle_Chkb_Line(HMI_data.FullManualTramming);
Toggle_Chkb_Line(HMI_data.FullManualTramming);
}

void SetCalcAvg() {
Toogle_Chkb_Line(HMI_data.CalcAvg);
Toggle_Chkb_Line(HMI_data.CalcAvg);
}

#endif // HAS_BED_PROBE
Expand Down Expand Up @@ -2786,7 +2786,7 @@ void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP
#if BOTH(ProUIex, HAS_EXTRUDERS)
void SetInvertE0() {
stepper.disable_e_steppers();
Toogle_Chkb_Line(PRO_data.Invert_E0);
Toggle_Chkb_Line(PRO_data.Invert_E0);
current_position.e = 0;
sync_plan_position_e();
}
Expand Down Expand Up @@ -3273,7 +3273,7 @@ void Draw_Tune_Menu() {

#if ENABLED(ADAPTIVE_STEP_SMOOTHING)
void SetAdaptiveStepSmoothing() {
Toogle_Chkb_Line(HMI_data.AdaptiveStepSmoothing);
Toggle_Chkb_Line(HMI_data.AdaptiveStepSmoothing);
}
#endif

Expand Down Expand Up @@ -3738,7 +3738,7 @@ void Draw_Steps_Menu() {
void SetEditZValue() { SetPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3, nullptr, LiveEditMeshZ); if (AutoMovToMesh) BedLevelTools.MoveToXYZ(); }

void SetAutoMovToMesh() {
Toogle_Chkb_Line(AutoMovToMesh);
Toggle_Chkb_Line(AutoMovToMesh);
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/proui/menus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void Show_Chkb_Line(const bool checked) {
DWIN_UpdateLCD();
}

void Toogle_Chkb_Line(bool &checked) {
void Toggle_Chkb_Line(bool &checked) {
checked = !checked;
Show_Chkb_Line(checked);
}
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/proui/menus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const
void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, FSTR_P label=nullptr, bool more=false, bool selected=false);
void Draw_Chkb_Line(const uint8_t line, const bool checked);
void Show_Chkb_Line(const bool checked);
void Toogle_Chkb_Line(bool &checked);
void Toggle_Chkb_Line(bool &checked);
void Draw_Menu_IntValue(uint16_t bcolor, const uint8_t line, uint8_t iNum, const int32_t value=0);
void onDrawMenuItem(MenuItemClass* menuitem, int8_t line);
void onDrawSubMenu(MenuItemClass* menuitem, int8_t line);
Expand Down
13 changes: 1 addition & 12 deletions Marlin/src/module/settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2894,23 +2894,12 @@ void MarlinSettings::postprocess() {
#endif

#if ENABLED(DWIN_LCD_PROUI)
/* if (!BedLevelTools.meshvalidate()) {
if (!BedLevelTools.meshvalidate()) {
status = true;
bedlevel.invalidate();
LCD_MESSAGE(MSG_UBL_MESH_INVALID);
DONE_BUZZ(false);
}
#endif */
if (BedLevelTools.meshvalidate()) {
ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), bedlevel.storage_slot);
}
else {
status = true;
bedlevel.invalidate();
LCD_MESSAGE(MSG_UBL_MESH_INVALID);
DONE_BUZZ(false);
}
//ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), bedlevel.storage_slot);
#endif

if (status) SERIAL_ECHOLNPGM("?Unable to load mesh data.");
Expand Down

0 comments on commit cc048c8

Please sign in to comment.