瀏覽代碼

🐛 Followup to JyersUI

Fix #22735, #22736
Scott Lahteine 3 年之前
父節點
當前提交
453e60958a

+ 3
- 1
Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp 查看文件

145
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
145
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
146
                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
146
                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
147
           else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
147
           else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
148
-          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC)   encoderMultiplier = 5;
148
+          #if ENCODER_5X_STEPS_PER_SEC
149
+            else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
150
+          #endif
149
         }
151
         }
150
         EncoderRate.lastEncoderTime = ms;
152
         EncoderRate.lastEncoderTime = ms;
151
       }
153
       }

+ 3
- 1
Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp 查看文件

145
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
145
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
146
                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
146
                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
147
           else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
147
           else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
148
-          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC)   encoderMultiplier = 5;
148
+          #if ENCODER_5X_STEPS_PER_SEC
149
+            else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
150
+          #endif
149
         }
151
         }
150
         EncoderRate.lastEncoderTime = ms;
152
         EncoderRate.lastEncoderTime = ms;
151
       }
153
       }

+ 8
- 6
Marlin/src/lcd/e3v2/jyersui/dwin.cpp 查看文件

4757
     printing = true;
4757
     printing = true;
4758
     statusmsg[0] = '\0';
4758
     statusmsg[0] = '\0';
4759
     if (sd) {
4759
     if (sd) {
4760
-      if (recovery.valid()) {
4761
-        SdFile *diveDir = nullptr;
4762
-        const char * const fname = card.diveToFile(true, diveDir, recovery.info.sd_filename);
4763
-        card.selectFileByName(fname);
4764
-      }
4760
+      #if ENABLED(POWER_LOSS_RECOVERY)
4761
+        if (recovery.valid()) {
4762
+          SdFile *diveDir = nullptr;
4763
+          const char * const fname = card.diveToFile(true, diveDir, recovery.info.sd_filename);
4764
+          card.selectFileByName(fname);
4765
+        }
4766
+      #endif
4765
       strcpy_P(filename, card.longest_filename());
4767
       strcpy_P(filename, card.longest_filename());
4766
     }
4768
     }
4767
     else
4769
     else
4801
 
4803
 
4802
 void CrealityDWINClass::State_Update() {
4804
 void CrealityDWINClass::State_Update() {
4803
   if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
4805
   if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
4804
-    if (!printing) Start_Print((card.isFileOpen() || recovery.valid()));
4806
+    if (!printing) Start_Print(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));
4805
     else Stop_Print();
4807
     else Stop_Print();
4806
   }
4808
   }
4807
   if (print_job_timer.isPaused() != paused) {
4809
   if (print_job_timer.isPaused() != paused) {

+ 3
- 1
Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp 查看文件

145
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
145
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
146
                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
146
                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
147
           else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
147
           else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
148
-          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC)   encoderMultiplier = 5;
148
+          #if ENCODER_5X_STEPS_PER_SEC
149
+            else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
150
+          #endif
149
         }
151
         }
150
         EncoderRate.lastEncoderTime = ms;
152
         EncoderRate.lastEncoderTime = ms;
151
       }
153
       }

+ 1
- 1
Marlin/src/lcd/marlinui.h 查看文件

596
     static inline bool use_click() { return false; }
596
     static inline bool use_click() { return false; }
597
   #endif
597
   #endif
598
 
598
 
599
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
599
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
600
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
600
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
601
   #else
601
   #else
602
     static inline void _pause_show_message() {}
602
     static inline void _pause_show_message() {}

Loading…
取消
儲存