Bladeren bron

🩹 Fix DGUS (MKS) compile (#24378)

ellensp 1 jaar geleden
bovenliggende
commit
58d1b1be28
No account linked to committer's email address

+ 7
- 3
Marlin/src/feature/pause.cpp Bestand weergeven

@@ -711,9 +711,13 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
711 711
 
712 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 723
 #endif // ADVANCED_PAUSE_FEATURE

+ 1
- 1
Marlin/src/inc/Conditionals_LCD.h Bestand weergeven

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

+ 4
- 4
Marlin/src/inc/Conditionals_adv.h Bestand weergeven

@@ -1018,13 +1018,13 @@
1018 1018
  * LCD_SERIAL_PORT must be defined ahead of HAL.h
1019 1019
  */
1020 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 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 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 1026
     #else
1027
-      #define LCD_SERIAL_PORT 3 // Creality 4.x board
1027
+      #define LCD_SERIAL_PORT 3 // Other boards
1028 1028
     #endif
1029 1029
   #endif
1030 1030
   #ifdef LCD_SERIAL_PORT

+ 9
- 10
Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp Bestand weergeven

@@ -258,7 +258,7 @@ void DGUSScreenHandlerMKS::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
258 258
     ) filelist.refresh();
259 259
   }
260 260
 
261
-  void DGUSScreenHandler::SDPrintingFinished() {
261
+  void DGUSScreenHandlerMKS::SDPrintingFinished() {
262 262
     if (DGUSAutoTurnOff) {
263 263
       queue.exhaust();
264 264
       gcode.process_subcommands_now(F("M81"));
@@ -416,15 +416,15 @@ void DGUSScreenHandlerMKS::LanguageChange(DGUS_VP_Variable &var, void *val_ptr)
416 416
     case MKS_SimpleChinese:
417 417
       DGUS_LanguageDisplay(MKS_SimpleChinese);
418 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 421
       settings.save();
422 422
       break;
423 423
     case MKS_English:
424 424
       DGUS_LanguageDisplay(MKS_English);
425 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 428
       settings.save();
429 429
       break;
430 430
     default: break;
@@ -1125,7 +1125,6 @@ void DGUSScreenHandlerMKS::HandleAccChange(DGUS_VP_Variable &var, void *val_ptr)
1125 1125
 #if ENABLED(BABYSTEPPING)
1126 1126
   void DGUSScreenHandler::HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr) {
1127 1127
     DEBUG_ECHOLNPGM("HandleLiveAdjustZ");
1128
-    char babystep_buf[30];
1129 1128
     float step = ZOffset_distance;
1130 1129
 
1131 1130
     uint16_t flag = swap16(*(uint16_t*)val_ptr);
@@ -1446,12 +1445,12 @@ bool DGUSScreenHandlerMKS::loop() {
1446 1445
 void DGUSScreenHandlerMKS::LanguagePInit() {
1447 1446
   switch (mks_language_index) {
1448 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 1450
       break;
1452 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 1454
       break;
1456 1455
     default:
1457 1456
       break;

+ 2
- 1
Marlin/src/lcd/marlinui.h Bestand weergeven

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

Laden…
Annuleren
Opslaan