Browse Source

Fix DUGS / DGUS typo

Scott Lahteine 4 years ago
parent
commit
59cb1466b7

+ 2
- 2
Marlin/Configuration_adv.h View File

1302
     #define DGUS_PREHEAT_UI               // Display a preheat screen during heatup
1302
     #define DGUS_PREHEAT_UI               // Display a preheat screen during heatup
1303
 
1303
 
1304
     #if ENABLED(DGUS_LCD_UI_FYSETC)
1304
     #if ENABLED(DGUS_LCD_UI_FYSETC)
1305
-      //#define DUGS_UI_MOVE_DIS_OPTION   // Disabled by default for UI_FYSETC
1305
+      //#define DGUS_UI_MOVE_DIS_OPTION   // Disabled by default for UI_FYSETC
1306
     #else
1306
     #else
1307
-      #define DUGS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
1307
+      #define DGUS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
1308
     #endif
1308
     #endif
1309
 
1309
 
1310
     #define DGUS_FILAMENT_LOADUNLOAD
1310
     #define DGUS_FILAMENT_LOADUNLOAD

+ 2
- 0
Marlin/src/inc/SanityCheck.h View File

483
   #error "Z_TRIPLE_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
483
   #error "Z_TRIPLE_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
484
 #elif defined(Z_QUAD_ENDSTOPS)
484
 #elif defined(Z_QUAD_ENDSTOPS)
485
   #error "Z_QUAD_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
485
   #error "Z_QUAD_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
486
+#elif defined(DUGS_UI_MOVE_DIS_OPTION)
487
+  #error "DUGS_UI_MOVE_DIS_OPTION is spelled DGUS_UI_MOVE_DIS_OPTION. Please update Configuration_adv.h."
486
 #endif
488
 #endif
487
 
489
 
488
 /**
490
 /**

+ 2
- 2
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp View File

603
   skipVP = var.VP;
603
   skipVP = var.VP;
604
 }
604
 }
605
 
605
 
606
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
606
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
607
   void DGUSScreenVariableHandler::HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr) {
607
   void DGUSScreenVariableHandler::HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr) {
608
     DEBUG_ECHOLNPGM("HandleManualMoveOption");
608
     DEBUG_ECHOLNPGM("HandleManualMoveOption");
609
     *(uint16_t*)var.memadr = swap16(*(uint16_t*)val_ptr);
609
     *(uint16_t*)var.memadr = swap16(*(uint16_t*)val_ptr);
614
   DEBUG_ECHOLNPGM("HandleManualMove");
614
   DEBUG_ECHOLNPGM("HandleManualMove");
615
 
615
 
616
   int16_t movevalue = swap16(*(uint16_t*)val_ptr);
616
   int16_t movevalue = swap16(*(uint16_t*)val_ptr);
617
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
617
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
618
     const uint16_t choice = *(uint16_t*)var.memadr;
618
     const uint16_t choice = *(uint16_t*)var.memadr;
619
     movevalue = movevalue > 0 ? choice : -choice;
619
     movevalue = movevalue > 0 ? choice : -choice;
620
   #endif
620
   #endif

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h View File

119
   static void HandleTemperatureChanged(DGUS_VP_Variable &var, void *val_ptr);
119
   static void HandleTemperatureChanged(DGUS_VP_Variable &var, void *val_ptr);
120
   // Hook for "Change Flowrate"
120
   // Hook for "Change Flowrate"
121
   static void HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr);
121
   static void HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr);
122
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
122
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
123
     // Hook for manual move option
123
     // Hook for manual move option
124
     static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
124
     static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
125
   #endif
125
   #endif

+ 3
- 3
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp View File

36
 #include "../../ui_api.h"
36
 #include "../../ui_api.h"
37
 #include "../../../ultralcd.h"
37
 #include "../../../ultralcd.h"
38
 
38
 
39
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
39
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
40
   uint16_t distanceToMove = 0.1;
40
   uint16_t distanceToMove = 0.1;
41
 #endif
41
 #endif
42
 
42
 
331
   VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr),
331
   VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr),
332
 
332
 
333
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
333
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
334
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
334
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
335
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
335
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
336
   #endif
336
   #endif
337
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
337
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
338
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
338
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
339
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
339
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
340
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
340
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),

+ 3
- 3
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp View File

36
 #include "../../ui_api.h"
36
 #include "../../ui_api.h"
37
 #include "../../../ultralcd.h"
37
 #include "../../../ultralcd.h"
38
 
38
 
39
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
39
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
40
   uint16_t distanceToMove = 0.1;
40
   uint16_t distanceToMove = 0.1;
41
 #endif
41
 #endif
42
 
42
 
327
 
327
 
328
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
328
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
329
 
329
 
330
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
330
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
331
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
331
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
332
   #endif
332
   #endif
333
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
333
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
334
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
334
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
335
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
335
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
336
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
336
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),

+ 3
- 3
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp View File

35
 
35
 
36
 #include "../../../ultralcd.h"
36
 #include "../../../ultralcd.h"
37
 
37
 
38
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
38
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
39
   uint16_t distanceToMove = 0.1;
39
   uint16_t distanceToMove = 0.1;
40
 #endif
40
 #endif
41
 
41
 
162
 
162
 
163
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
163
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),
164
 
164
 
165
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
165
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
166
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
166
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
167
   #endif
167
   #endif
168
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
168
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
169
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
169
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
170
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
170
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
171
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
171
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),

Loading…
Cancel
Save