|
@@ -49,9 +49,9 @@ ENCODER_Rate EncoderRate;
|
49
|
49
|
|
50
|
50
|
/*蜂鸣器响*/
|
51
|
51
|
void Encoder_tick(void) {
|
52
|
|
- WRITE(BEEPER_PIN,1);
|
|
52
|
+ WRITE(BEEPER_PIN, 1);
|
53
|
53
|
delay(10);
|
54
|
|
- WRITE(BEEPER_PIN,0);
|
|
54
|
+ WRITE(BEEPER_PIN, 0);
|
55
|
55
|
}
|
56
|
56
|
|
57
|
57
|
/*编码器初始化 PB12:Encoder_A PB13:Encoder_B PB14:Encoder_C*/
|
|
@@ -88,7 +88,9 @@ ENCODER_DiffState Encoder_ReceiveAnalyze(void) {
|
88
|
88
|
#if PIN_EXISTS(LCD_LED)
|
89
|
89
|
//LED_Action();
|
90
|
90
|
#endif
|
91
|
|
- return ENCODER_DIFF_ENTER;
|
|
91
|
+ const bool was_waiting = wait_for_user;
|
|
92
|
+ wait_for_user = false;
|
|
93
|
+ return was_waiting ? ENCODER_DIFF_NO : ENCODER_DIFF_ENTER;
|
92
|
94
|
}
|
93
|
95
|
else return ENCODER_DIFF_NO;
|
94
|
96
|
}
|