George Fu
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
20 additions and
12 deletions
-
Marlin/Configuration.h
-
Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
-
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
-
Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
|
|
|
@ -2077,6 +2077,8 @@ |
|
|
|
|
|
|
|
//
|
|
|
|
// DGUS Touch Display with DWIN OS. (Choose one.)
|
|
|
|
// ORIGIN : https://www.aliexpress.com/item/32993409517.html
|
|
|
|
// FYSETC : https://www.aliexpress.com/item/32961471929.html
|
|
|
|
//
|
|
|
|
//#define DGUS_LCD_UI_ORIGIN
|
|
|
|
//#define DGUS_LCD_UI_FYSETC
|
|
|
|
|
|
|
|
@ -734,10 +734,10 @@ void DGUSScreenVariableHandler::HandleSettings(DGUS_VP_Variable &var, void *val_ |
|
|
|
default: break; |
|
|
|
case 1: |
|
|
|
TERN_(PRINTCOUNTER, print_job_timer.initStats()); |
|
|
|
queue.enqueue_now_P(PSTR("M502\nM500")); |
|
|
|
queue.inject_P(PSTR("M502\nM500")); |
|
|
|
break; |
|
|
|
case 2: queue.enqueue_now_P(PSTR("M501")); break; |
|
|
|
case 3: queue.enqueue_now_P(PSTR("M500")); break; |
|
|
|
case 2: queue.inject_P(PSTR("M501")); break; |
|
|
|
case 3: queue.inject_P(PSTR("M500")); break; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -851,14 +851,16 @@ void DGUSScreenVariableHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable |
|
|
|
} |
|
|
|
#endif |
|
|
|
|
|
|
|
void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) { |
|
|
|
#if HAS_BED_PROBE |
|
|
|
void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) { |
|
|
|
DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged"); |
|
|
|
|
|
|
|
const float offset = float(int16_t(swap16(*(uint16_t*)val_ptr))) / 100.0f; |
|
|
|
ExtUI::setZOffset_mm(offset); |
|
|
|
ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
|
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
#endif |
|
|
|
|
|
|
|
#if ENABLED(BABYSTEPPING) |
|
|
|
void DGUSScreenVariableHandler::HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr) { |
|
|
|
|
|
|
|
@ -327,7 +327,9 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = { |
|
|
|
// Helper to detect touch events
|
|
|
|
VPHELPER(VP_SCREENCHANGE, nullptr, DGUSScreenVariableHandler::ScreenChangeHook, nullptr), |
|
|
|
VPHELPER(VP_SCREENCHANGE_ASK, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfIdle, nullptr), |
|
|
|
#if ENABLED(SDSUPPORT) |
|
|
|
VPHELPER(VP_SCREENCHANGE_WHENSD, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfSD, nullptr), |
|
|
|
#endif |
|
|
|
VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr), |
|
|
|
|
|
|
|
VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr), |
|
|
|
|
|
|
|
@ -330,7 +330,9 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = { |
|
|
|
// Helper to detect touch events
|
|
|
|
VPHELPER(VP_SCREENCHANGE, nullptr, DGUSScreenVariableHandler::ScreenChangeHook, nullptr), |
|
|
|
VPHELPER(VP_SCREENCHANGE_ASK, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfIdle, nullptr), |
|
|
|
#if ENABLED(SDSUPPORT) |
|
|
|
VPHELPER(VP_SCREENCHANGE_WHENSD, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfSD, nullptr), |
|
|
|
#endif |
|
|
|
VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr), |
|
|
|
|
|
|
|
VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr), |
|
|
|
|
