zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix E3V2 M0/M1 and wait_for_user

Browse source
This commit is contained in:
Scott Lahteine 2020-07-17 11:39:07 -05:00
parent f4aba99624
commit c2363a81b4
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_adv.h
View file

@ -109,7 +109,7 @@
#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS) #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
#define HAS_SOFTWARE_ENDSTOPS 1 #define HAS_SOFTWARE_ENDSTOPS 1
#endif #endif
#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS) #if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS, DWIN_CREALITY_LCD)
#define HAS_RESUME_CONTINUE 1 #define HAS_RESUME_CONTINUE 1
#endif #endif

8
Marlin/src/lcd/dwin/rotary_encoder.cpp
View file

@ -49,9 +49,9 @@ ENCODER_Rate EncoderRate;
/*蜂鸣器响*/ /*蜂鸣器响*/
void Encoder_tick(void) { void Encoder_tick(void) {
WRITE(BEEPER_PIN,1); WRITE(BEEPER_PIN, 1);
delay(10); delay(10);
WRITE(BEEPER_PIN,0); WRITE(BEEPER_PIN, 0);
} }
/*编码器初始化 PB12:Encoder_A PB13:Encoder_B PB14:Encoder_C*/ /*编码器初始化 PB12:Encoder_A PB13:Encoder_B PB14:Encoder_C*/
@ -88,7 +88,9 @@ ENCODER_DiffState Encoder_ReceiveAnalyze(void) {
#if PIN_EXISTS(LCD_LED) #if PIN_EXISTS(LCD_LED)
//LED_Action(); //LED_Action();
#endif #endif
return ENCODER_DIFF_ENTER; const bool was_waiting = wait_for_user;
wait_for_user = false;
return was_waiting ? ENCODER_DIFF_NO : ENCODER_DIFF_ENTER;
} }
else return ENCODER_DIFF_NO; else return ENCODER_DIFF_NO;
} }