Przeglądaj źródła

Fix MKS H43 sensorless homing (#21388)

Sola 4 lat temu
rodzic
commit
2b621eb45d
No account linked to committer's email address

+ 2
- 2
Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp Wyświetl plik

36
 #include "../../../../marlinui.h"
36
 #include "../../../../marlinui.h"
37
 
37
 
38
 #if ENABLED(HAS_STEALTHCHOP)
38
 #if ENABLED(HAS_STEALTHCHOP)
39
-  #include "../../../../module/stepper/trinamic.h"
39
+  #include "../../../../../module/stepper/trinamic.h"
40
 #endif
40
 #endif
41
 
41
 
42
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
42
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
746
 
746
 
747
 
747
 
748
   // SDCard File listing
748
   // SDCard File listing
749
+  VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
749
   #if ENABLED(SDSUPPORT)
750
   #if ENABLED(SDSUPPORT)
750
     VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
751
     VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
751
-    VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
752
     VPHELPER(VP_SD_FileSelectConfirm, nullptr, ScreenHandler.DGUSLCD_SD_StartPrint, nullptr),
752
     VPHELPER(VP_SD_FileSelectConfirm, nullptr, ScreenHandler.DGUSLCD_SD_StartPrint, nullptr),
753
     VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
753
     VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
754
     VPHELPER_STR(VP_SD_FileName1, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
754
     VPHELPER_STR(VP_SD_FileName1, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),

+ 4
- 1
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp Wyświetl plik

1246
 
1246
 
1247
   uint16_t val_t = swap16(*(uint16_t*)val_ptr);
1247
   uint16_t val_t = swap16(*(uint16_t*)val_ptr);
1248
 
1248
 
1249
+  if (!print_job_timer.isPaused() && !queue.ring_buffer.empty())
1250
+    return;
1251
+
1249
   switch (val_t) {
1252
   switch (val_t) {
1250
     case 0:
1253
     case 0:
1251
       #if HOTENDS >= 1
1254
       #if HOTENDS >= 1
1497
     static bool booted = false;
1500
     static bool booted = false;
1498
     if (!booted && ELAPSED(ms, TERN(USE_MKS_GREEN_UI, 1000, BOOTSCREEN_TIMEOUT))) {
1501
     if (!booted && ELAPSED(ms, TERN(USE_MKS_GREEN_UI, 1000, BOOTSCREEN_TIMEOUT))) {
1499
       booted = true;
1502
       booted = true;
1500
-      #if ANY_AXIS_HAS(STEALTHCHOP)
1503
+      #if USE_SENSORLESS
1501
         #if AXIS_HAS_STEALTHCHOP(X)
1504
         #if AXIS_HAS_STEALTHCHOP(X)
1502
           tmc_x_step = stepperX.homing_threshold();
1505
           tmc_x_step = stepperX.homing_threshold();
1503
         #endif
1506
         #endif

Ładowanie…
Anuluj
Zapisz