Browse Source

🩹 Fix DGUS (MKS) compile (#24378)

ellensp 3 years ago
parent
commit
58d1b1be28
No account linked to committer's email address

+ 7
- 3
Marlin/src/feature/pause.cpp View File

711
 
711
 
712
   TERN_(HAS_FILAMENT_SENSOR, runout.reset());
712
   TERN_(HAS_FILAMENT_SENSOR, runout.reset());
713
 
713
 
714
-  TERN(DWIN_LCD_PROUI, DWIN_Print_Resume(), ui.reset_status());
715
-  TERN_(HAS_MARLINUI_MENU, ui.return_to_status());
716
-  TERN_(DWIN_LCD_PROUI, HMI_ReturnScreen());
714
+  #if ENABLED(DWIN_LCD_PROUI)
715
+    DWIN_Print_Resume();
716
+    HMI_ReturnScreen();
717
+  #else
718
+    ui.reset_status();
719
+    ui.return_to_status();
720
+  #endif
717
 }
721
 }
718
 
722
 
719
 #endif // ADVANCED_PAUSE_FEATURE
723
 #endif // ADVANCED_PAUSE_FEATURE

+ 1
- 1
Marlin/src/inc/Conditionals_LCD.h View File

513
   #define HAS_LCDPRINT 1
513
   #define HAS_LCDPRINT 1
514
 #endif
514
 #endif
515
 
515
 
516
-#if ANY(HAS_DISPLAY, HAS_DWIN_E3V2)
516
+#if HAS_DISPLAY || HAS_DWIN_E3V2
517
   #define HAS_STATUS_MESSAGE 1
517
   #define HAS_STATUS_MESSAGE 1
518
 #endif
518
 #endif
519
 
519
 

+ 4
- 4
Marlin/src/inc/Conditionals_adv.h View File

1018
  * LCD_SERIAL_PORT must be defined ahead of HAL.h
1018
  * LCD_SERIAL_PORT must be defined ahead of HAL.h
1019
  */
1019
  */
1020
 #ifndef LCD_SERIAL_PORT
1020
 #ifndef LCD_SERIAL_PORT
1021
-  #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
1021
+  #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI || HAS_DGUS_LCD
1022
     #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
1022
     #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
1023
       #define LCD_SERIAL_PORT 1
1023
       #define LCD_SERIAL_PORT 1
1024
-    #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423)
1025
-      #define LCD_SERIAL_PORT 2 // Creality Ender3S1 board
1024
+    #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423, MKS_ROBIN)
1025
+      #define LCD_SERIAL_PORT 2 // Creality Ender3S1, MKS Robin
1026
     #else
1026
     #else
1027
-      #define LCD_SERIAL_PORT 3 // Creality 4.x board
1027
+      #define LCD_SERIAL_PORT 3 // Other boards
1028
     #endif
1028
     #endif
1029
   #endif
1029
   #endif
1030
   #ifdef LCD_SERIAL_PORT
1030
   #ifdef LCD_SERIAL_PORT

+ 9
- 10
Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp View File

258
     ) filelist.refresh();
258
     ) filelist.refresh();
259
   }
259
   }
260
 
260
 
261
-  void DGUSScreenHandler::SDPrintingFinished() {
261
+  void DGUSScreenHandlerMKS::SDPrintingFinished() {
262
     if (DGUSAutoTurnOff) {
262
     if (DGUSAutoTurnOff) {
263
       queue.exhaust();
263
       queue.exhaust();
264
       gcode.process_subcommands_now(F("M81"));
264
       gcode.process_subcommands_now(F("M81"));
416
     case MKS_SimpleChinese:
416
     case MKS_SimpleChinese:
417
       DGUS_LanguageDisplay(MKS_SimpleChinese);
417
       DGUS_LanguageDisplay(MKS_SimpleChinese);
418
       mks_language_index = MKS_SimpleChinese;
418
       mks_language_index = MKS_SimpleChinese;
419
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_Choose);
420
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_NoChoose);
419
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, (uint8_t)MKS_Language_Choose);
420
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, (uint8_t)MKS_Language_NoChoose);
421
       settings.save();
421
       settings.save();
422
       break;
422
       break;
423
     case MKS_English:
423
     case MKS_English:
424
       DGUS_LanguageDisplay(MKS_English);
424
       DGUS_LanguageDisplay(MKS_English);
425
       mks_language_index = MKS_English;
425
       mks_language_index = MKS_English;
426
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_NoChoose);
427
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_Choose);
426
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, (uint8_t)MKS_Language_NoChoose);
427
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, (uint8_t)MKS_Language_Choose);
428
       settings.save();
428
       settings.save();
429
       break;
429
       break;
430
     default: break;
430
     default: break;
1125
 #if ENABLED(BABYSTEPPING)
1125
 #if ENABLED(BABYSTEPPING)
1126
   void DGUSScreenHandler::HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr) {
1126
   void DGUSScreenHandler::HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr) {
1127
     DEBUG_ECHOLNPGM("HandleLiveAdjustZ");
1127
     DEBUG_ECHOLNPGM("HandleLiveAdjustZ");
1128
-    char babystep_buf[30];
1129
     float step = ZOffset_distance;
1128
     float step = ZOffset_distance;
1130
 
1129
 
1131
     uint16_t flag = swap16(*(uint16_t*)val_ptr);
1130
     uint16_t flag = swap16(*(uint16_t*)val_ptr);
1446
 void DGUSScreenHandlerMKS::LanguagePInit() {
1445
 void DGUSScreenHandlerMKS::LanguagePInit() {
1447
   switch (mks_language_index) {
1446
   switch (mks_language_index) {
1448
     case MKS_SimpleChinese:
1447
     case MKS_SimpleChinese:
1449
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_Choose);
1450
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_NoChoose);
1448
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, (uint8_t)MKS_Language_Choose);
1449
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, (uint8_t)MKS_Language_NoChoose);
1451
       break;
1450
       break;
1452
     case MKS_English:
1451
     case MKS_English:
1453
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_NoChoose);
1454
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_Choose);
1452
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, (uint8_t)MKS_Language_NoChoose);
1453
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, (uint8_t)MKS_Language_Choose);
1455
       break;
1454
       break;
1456
     default:
1455
     default:
1457
       break;
1456
       break;

+ 2
- 1
Marlin/src/lcd/marlinui.h View File

502
   #else // No LCD
502
   #else // No LCD
503
 
503
 
504
     static void update() {}
504
     static void update() {}
505
-    static void return_to_status() {}
506
     static void kill_screen(FSTR_P const, FSTR_P const) {}
505
     static void kill_screen(FSTR_P const, FSTR_P const) {}
507
 
506
 
508
   #endif
507
   #endif
609
 
608
 
610
   #else
609
   #else
611
 
610
 
611
+    static void return_to_status() {}
612
+
612
     static constexpr bool on_status_screen() { return true; }
613
     static constexpr bool on_status_screen() { return true; }
613
 
614
 
614
     #if HAS_WIRED_LCD
615
     #if HAS_WIRED_LCD

Loading…
Cancel
Save