thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🐛 Followup to JyersUI

Browse Source 
Fix #22735, #22736
This commit is contained in:
Scott Lahteine
2021-09-11 01:32:39 -05:00
parent 953d283e53
commit 453e60958a
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
View File

@@ -145,7 +145,9 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000; const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100; if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10; else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5; #if ENCODER_5X_STEPS_PER_SEC
else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
#endif
} }
EncoderRate.lastEncoderTime = ms; EncoderRate.lastEncoderTime = ms;
} }

4
Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
View File

@@ -145,7 +145,9 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000; const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100; if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10; else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5; #if ENCODER_5X_STEPS_PER_SEC
else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
#endif
} }
EncoderRate.lastEncoderTime = ms; EncoderRate.lastEncoderTime = ms;
} }

14
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View File

@@ -4757,11 +4757,13 @@ void CrealityDWINClass::Start_Print(bool sd) {
printing = true; printing = true;
statusmsg[0] = '\0'; statusmsg[0] = '\0';
if (sd) { if (sd) {
if (recovery.valid()) { #if ENABLED(POWER_LOSS_RECOVERY)
SdFile *diveDir = nullptr; if (recovery.valid()) {
const char * const fname = card.diveToFile(true, diveDir, recovery.info.sd_filename); SdFile *diveDir = nullptr;
card.selectFileByName(fname); const char * const fname = card.diveToFile(true, diveDir, recovery.info.sd_filename);
} card.selectFileByName(fname);
}
#endif
strcpy_P(filename, card.longest_filename()); strcpy_P(filename, card.longest_filename());
} }
else else
@@ -4801,7 +4803,7 @@ void MarlinUI::update() { CrealityDWIN.Update(); }
void CrealityDWINClass::State_Update() { void CrealityDWINClass::State_Update() {
if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) { if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
if (!printing) Start_Print((card.isFileOpen() || recovery.valid())); if (!printing) Start_Print(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));
else Stop_Print(); else Stop_Print();
} }
if (print_job_timer.isPaused() != paused) { if (print_job_timer.isPaused() != paused) {

4
Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp
View File

@@ -145,7 +145,9 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000; const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100; if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10; else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5; #if ENCODER_5X_STEPS_PER_SEC
else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
#endif
} }
EncoderRate.lastEncoderTime = ms; EncoderRate.lastEncoderTime = ms;
} }

2
Marlin/src/lcd/marlinui.h
View File

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