thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Fix DUGS / DGUS typo

Scott Lahteine 4 years ago
parent
9c759e5f74
commit
59cb1466b7
7 changed files with 16 additions and 14 deletions
Split View Show Diff Stats
  1. 2
    2
      Marlin/Configuration_adv.h
  2. 2
    0
      Marlin/src/inc/SanityCheck.h
  3. 2
    2
      Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
  4. 1
    1
      Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
  5. 3
    3
      Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionFYSETC.cpp
  6. 3
    3
      Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionHIPRECY.cpp
  7. 3
    3
      Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplayDefinitionOrigin.cpp

+ 2
- 2
Marlin/Configuration_adv.h View File 

@@ -1302,9 +1302,9 @@
1302 1302 
     #define DGUS_PREHEAT_UI               // Display a preheat screen during heatup
1303 1303
1304 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 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 1308 
     #endif
1309 1309
1310 1310 
     #define DGUS_FILAMENT_LOADUNLOAD

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

@@ -483,6 +483,8 @@
483 483 
   #error "Z_TRIPLE_ENDSTOPS is now Z_MULTI_ENDSTOPS. Please update Configuration_adv.h."
484 484 
 #elif defined(Z_QUAD_ENDSTOPS)
485 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 488 
 #endif
487 489
488 490 
 /**

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

@@ -603,7 +603,7 @@ void DGUSScreenVariableHandler::HandleManualExtrude(DGUS_VP_Variable &var, void
603 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 607 
   void DGUSScreenVariableHandler::HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr) {
608 608 
     DEBUG_ECHOLNPGM("HandleManualMoveOption");
609 609 
     *(uint16_t*)var.memadr = swap16(*(uint16_t*)val_ptr);
 
@@ -614,7 +614,7 @@ void DGUSScreenVariableHandler::HandleManualMove(DGUS_VP_Variable &var, void *va
614 614 
   DEBUG_ECHOLNPGM("HandleManualMove");
615 615
616 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 618 
     const uint16_t choice = *(uint16_t*)var.memadr;
619 619 
     movevalue = movevalue > 0 ? choice : -choice;
620 620 
   #endif

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

@@ -119,7 +119,7 @@ public:
119 119 
   static void HandleTemperatureChanged(DGUS_VP_Variable &var, void *val_ptr);
120 120 
   // Hook for "Change Flowrate"
121 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 123 
     // Hook for manual move option
124 124 
     static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
125 125 
   #endif

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

@@ -36,7 +36,7 @@
36 36 
 #include "../../ui_api.h"
37 37 
 #include "../../../ultralcd.h"
38 38
39 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
39 
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
40 40 
   uint16_t distanceToMove = 0.1;
41 41 
 #endif
42 42 
 
@@ -331,10 +331,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
331 331 
   VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr),
332 332
333 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 335 
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
336 336 
   #endif
337 
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
337 
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
338 338 
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
339 339 
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
340 340 
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),

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

@@ -36,7 +36,7 @@
36 36 
 #include "../../ui_api.h"
37 37 
 #include "../../../ultralcd.h"
38 38
39 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
39 
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
40 40 
   uint16_t distanceToMove = 0.1;
41 41 
 #endif
42 42 
 
@@ -327,10 +327,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
327 327
328 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 331 
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
332 332 
   #endif
333 
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
333 
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
334 334 
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
335 335 
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
336 336 
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),

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

@@ -35,7 +35,7 @@
35 35
36 36 
 #include "../../../ultralcd.h"
37 37
38 
-#if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
38 
+#if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
39 39 
   uint16_t distanceToMove = 0.1;
40 40 
 #endif
41 41 
 
@@ -162,10 +162,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
162 162
163 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 166 
     VPHELPER(VP_MOVE_OPTION, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMoveOption, nullptr),
167 167 
   #endif
168 
-  #if ENABLED(DUGS_UI_MOVE_DIS_OPTION)
168 
+  #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
169 169 
     VPHELPER(VP_MOVE_X, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
170 170 
     VPHELPER(VP_MOVE_Y, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),
171 171 
     VPHELPER(VP_MOVE_Z, &distanceToMove, &DGUSScreenVariableHandler::HandleManualMove, nullptr),

Write Preview
Loading…
Cancel
Save