From 59cb1466b7755503c94d6b7496bbc2b204affe65 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 12 Mar 2020 19:29:32 -0500 Subject: [PATCH] Fix DUGS / DGUS typo --- Marlin/Configuration_adv.h | 4 ++-- Marlin/src/inc/SanityCheck.h | 2 ++ Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp | 4 ++-- Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h | 2 +- .../extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp | 6 +++--- .../extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp | 6 +++--- .../extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp | 6 +++--- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 042d188bf..5a49c8775 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1302,9 +1302,9 @@ #define DGUS_PREHEAT_UI // Display a preheat screen during heatup #if ENABLED(DGUS_LCD_UI_FYSETC) - //#define DUGS_UI_MOVE_DIS_OPTION // Disabled by default for UI_FYSETC + //#define DGUS_UI_MOVE_DIS_OPTION // Disabled by default for UI_FYSETC #else - #define DUGS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY + #define DGUS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY #endif #define DGUS_FILAMENT_LOADUNLOAD diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index bcabbe9dc..d017dbf2d 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -483,6 +483,8 @@ #error "Z_TRIPLE_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h." #elif defined(Z_QUAD_ENDSTOPS) #error "Z_QUAD_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h." +#elif defined(DUGS_UI_MOVE_DIS_OPTION) + #error "DUGS_UI_MOVE_DIS_OPTION is spelled DGUS_UI_MOVE_DIS_OPTION. Please update Configuration_adv.h." #endif /** diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp index 951cc827e..2bab99cf8 100644 --- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp @@ -603,7 +603,7 @@ void DGUSScreenVariableHandler::HandleManualExtrude(DGUS_VP_Variable &var, void skipVP = var.VP; } -#if ENABLED(DUGS_UI_MOVE_DIS_OPTION) +#if ENABLED(DGUS_UI_MOVE_DIS_OPTION) void DGUSScreenVariableHandler::HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr) { DEBUG_ECHOLNPGM("HandleManualMoveOption"); *(uint16_t*)var.memadr = swap16(*(uint16_t*)val_ptr); @@ -614,7 +614,7 @@ void DGUSScreenVariableHandler::HandleManualMove(DGUS_VP_Variable &var, void *va DEBUG_ECHOLNPGM("HandleManualMove"); int16_t movevalue = swap16(*(uint16_t*)val_ptr); - #if ENABLED(DUGS_UI_MOVE_DIS_OPTION) + #if ENABLED(DGUS_UI_MOVE_DIS_OPTION) const uint16_t choice = *(uint16_t*)var.memadr; movevalue = movevalue > 0 ? choice : -choice; #endif diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h index 7327f04c7..3b44859dd 100644 --- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h +++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h @@ -119,7 +119,7 @@ public: static void HandleTemperatureChanged(DGUS_VP_Variable &var, void *val_ptr); // Hook for "Change Flowrate" static void HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr); - #if ENABLED(DUGS_UI_MOVE_DIS_OPTION) + #if ENABLED(DGUS_UI_MOVE_DIS_OPTION) // Hook for manual move option static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr); #endif diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp index 9f5eed217..531e372a9 100644 --- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp @@ -36,7 +36,7 @@ #include "../../ui_api.h" #include "../../../ultralcd.h" -#if ENABLED(DUGS_UI_MOVE_DIS_OPTION) +#if ENABLED(DGUS_UI_MOVE_DIS_OPTION) uint16_t distanceToMove = 0.1; #endif @@ -331,10 +331,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = { VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr), VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr), - #if ENABLED(DUGS_UI_MOVE_DIS_OPTION) + #if ENABLED(DGUS_UI_MOVE_DIS_OPTION) VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr), #endif - #if ENABLED(DUGS_UI_MOVE_DIS_OPTION) + #if ENABLED(DGUS_UI_MOVE_DIS_OPTION) VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr), VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr), VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr), diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp index 0b1c5f2ea..520608442 100644 --- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp @@ -36,7 +36,7 @@ #include "../../ui_api.h" #include "../../../ultralcd.h" -#if ENABLED(DUGS_UI_MOVE_DIS_OPTION) +#if ENABLED(DGUS_UI_MOVE_DIS_OPTION) uint16_t distanceToMove = 0.1; #endif @@ -327,10 +327,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = { VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr), - #if ENABLED(DUGS_UI_MOVE_DIS_OPTION) + #if ENABLED(DGUS_UI_MOVE_DIS_OPTION) VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr), #endif - #if ENABLED(DUGS_UI_MOVE_DIS_OPTION) + #if ENABLED(DGUS_UI_MOVE_DIS_OPTION) VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr), VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr), VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr), diff --git a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp index d05acd595..cd5ad5440 100644 --- a/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp @@ -35,7 +35,7 @@ #include "../../../ultralcd.h" -#if ENABLED(DUGS_UI_MOVE_DIS_OPTION) +#if ENABLED(DGUS_UI_MOVE_DIS_OPTION) uint16_t distanceToMove = 0.1; #endif @@ -162,10 +162,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = { VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr), - #if ENABLED(DUGS_UI_MOVE_DIS_OPTION) + #if ENABLED(DGUS_UI_MOVE_DIS_OPTION) VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr), #endif - #if ENABLED(DUGS_UI_MOVE_DIS_OPTION) + #if ENABLED(DGUS_UI_MOVE_DIS_OPTION) VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr), VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr), VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),