bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 ExtUI "user click" and other tweaks (#22122)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
InsanityAutomation
2021-06-13 23:08:46 -04:00
committed by Scott Lahteine
parent 56355159c6
commit d84e2d6e29
8 changed files with 125 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/probe.cpp
View File

@ -384,7 +384,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
DEBUG_EOL();
TERN_(WAIT_FOR_NOZZLE_HEAT, if (hotend_temp > thermalManager.wholeDegHotend(0) + (TEMP_WINDOW)) thermalManager.wait_for_hotend(0));
TERN_(WAIT_FOR_BED_HEAT, if (bed_temp > thermalManager.wholeDegBed() + (TEMP_BED_WINDOW)) thermalManager.wait_for_bed_heating());
TERN_(WAIT_FOR_BED_HEAT, if (bed_temp > thermalManager.wholeDegBed() + (TEMP_BED_WINDOW)) thermalManager.wait_for_bed_heating());
}
#endif

4
Marlin/src/module/temperature.cpp
View File

@ -3621,7 +3621,7 @@ void Temperature::isr() {
#if G26_CLICK_CAN_CANCEL
if (click_to_cancel && ui.use_click()) {
wait_for_heatup = false;
ui.quick_feedback();
TERN_(HAS_LCD_MENU, ui.quick_feedback());
}
#endif
@ -3755,7 +3755,7 @@ void Temperature::isr() {
#if G26_CLICK_CAN_CANCEL
if (click_to_cancel && ui.use_click()) {
wait_for_heatup = false;
ui.quick_feedback();
TERN_(HAS_LCD_MENU, ui.quick_feedback());
}
#endif

2
Marlin/src/module/temperature.h
View File

@ -174,7 +174,7 @@ enum ADCSensorState : char {
#define unscalePID_d(d) ( float(d) * PID_dT )
#endif
#if BOTH(HAS_LCD_MENU, G26_MESH_VALIDATION)
#if ENABLED(G26_MESH_VALIDATION) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
#define G26_CLICK_CAN_CANCEL 1
#endif