ソースを参照

DGUS minor fixups (#17901)

George Fu 4年前
コミット
34a2fd7b09
コミッターのメールアドレスに関連付けられたアカウントが存在しません

+ 2
- 0
Marlin/Configuration.h ファイルの表示

@@ -2077,6 +2077,8 @@
2077 2077
 
2078 2078
 //
2079 2079
 // DGUS Touch Display with DWIN OS. (Choose one.)
2080
+// ORIGIN : https://www.aliexpress.com/item/32993409517.html
2081
+// FYSETC : https://www.aliexpress.com/item/32961471929.html
2080 2082
 //
2081 2083
 //#define DGUS_LCD_UI_ORIGIN
2082 2084
 //#define DGUS_LCD_UI_FYSETC

+ 12
- 10
Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp ファイルの表示

@@ -734,10 +734,10 @@ void DGUSScreenVariableHandler::HandleSettings(DGUS_VP_Variable &var, void *val_
734 734
     default: break;
735 735
     case 1:
736 736
       TERN_(PRINTCOUNTER, print_job_timer.initStats());
737
-      queue.enqueue_now_P(PSTR("M502\nM500"));
737
+      queue.inject_P(PSTR("M502\nM500"));
738 738
       break;
739
-    case 2: queue.enqueue_now_P(PSTR("M501")); break;
740
-    case 3: queue.enqueue_now_P(PSTR("M500")); break;
739
+    case 2: queue.inject_P(PSTR("M501")); break;
740
+    case 3: queue.inject_P(PSTR("M500")); break;
741 741
   }
742 742
 }
743 743
 
@@ -851,14 +851,16 @@ void DGUSScreenVariableHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable
851 851
   }
852 852
 #endif
853 853
 
854
-void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) {
855
-  DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged");
854
+#if HAS_BED_PROBE
855
+  void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) {
856
+    DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged");
856 857
 
857
-  const float offset = float(int16_t(swap16(*(uint16_t*)val_ptr))) / 100.0f;
858
-  ExtUI::setZOffset_mm(offset);
859
-  ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
860
-  return;
861
-}
858
+    const float offset = float(int16_t(swap16(*(uint16_t*)val_ptr))) / 100.0f;
859
+    ExtUI::setZOffset_mm(offset);
860
+    ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
861
+    return;
862
+  }
863
+#endif
862 864
 
863 865
 #if ENABLED(BABYSTEPPING)
864 866
   void DGUSScreenVariableHandler::HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr) {

+ 3
- 1
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp ファイルの表示

@@ -327,7 +327,9 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
327 327
   // Helper to detect touch events
328 328
   VPHELPER(VP_SCREENCHANGE, nullptr, DGUSScreenVariableHandler::ScreenChangeHook, nullptr),
329 329
   VPHELPER(VP_SCREENCHANGE_ASK, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfIdle, nullptr),
330
-  VPHELPER(VP_SCREENCHANGE_WHENSD, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfSD, nullptr),
330
+  #if ENABLED(SDSUPPORT)
331
+    VPHELPER(VP_SCREENCHANGE_WHENSD, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfSD, nullptr),
332
+  #endif
331 333
   VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr),
332 334
 
333 335
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),

+ 3
- 1
Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp ファイルの表示

@@ -330,7 +330,9 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
330 330
   // Helper to detect touch events
331 331
   VPHELPER(VP_SCREENCHANGE, nullptr, DGUSScreenVariableHandler::ScreenChangeHook, nullptr),
332 332
   VPHELPER(VP_SCREENCHANGE_ASK, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfIdle, nullptr),
333
-  VPHELPER(VP_SCREENCHANGE_WHENSD, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfSD, nullptr),
333
+  #if ENABLED(SDSUPPORT)
334
+    VPHELPER(VP_SCREENCHANGE_WHENSD, nullptr, DGUSScreenVariableHandler::ScreenChangeHookIfSD, nullptr),
335
+  #endif
334 336
   VPHELPER(VP_CONFIRMED, nullptr, DGUSScreenVariableHandler::ScreenConfirmedOK, nullptr),
335 337
 
336 338
   VPHELPER(VP_TEMP_ALL_OFF, nullptr, &DGUSScreenVariableHandler::HandleAllHeatersOff, nullptr),

読み込み中…
キャンセル
保存