Bladeren bron

Fix E3V2 M0/M1 and wait_for_user

Scott Lahteine 4 jaren geleden
bovenliggende
commit
c2363a81b4
2 gewijzigde bestanden met toevoegingen van 6 en 4 verwijderingen
  1. 1
    1
      Marlin/src/inc/Conditionals_adv.h
  2. 5
    3
      Marlin/src/lcd/dwin/rotary_encoder.cpp

+ 1
- 1
Marlin/src/inc/Conditionals_adv.h Bestand weergeven

109
 #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
109
 #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
110
   #define HAS_SOFTWARE_ENDSTOPS 1
110
   #define HAS_SOFTWARE_ENDSTOPS 1
111
 #endif
111
 #endif
112
-#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS)
112
+#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS, DWIN_CREALITY_LCD)
113
   #define HAS_RESUME_CONTINUE 1
113
   #define HAS_RESUME_CONTINUE 1
114
 #endif
114
 #endif
115
 
115
 

+ 5
- 3
Marlin/src/lcd/dwin/rotary_encoder.cpp Bestand weergeven

49
 
49
 
50
 /*蜂鸣器响*/
50
 /*蜂鸣器响*/
51
 void Encoder_tick(void) {
51
 void Encoder_tick(void) {
52
-  WRITE(BEEPER_PIN,1);
52
+  WRITE(BEEPER_PIN, 1);
53
   delay(10);
53
   delay(10);
54
-  WRITE(BEEPER_PIN,0);
54
+  WRITE(BEEPER_PIN, 0);
55
 }
55
 }
56
 
56
 
57
 /*编码器初始化 PB12:Encoder_A PB13:Encoder_B PB14:Encoder_C*/
57
 /*编码器初始化 PB12:Encoder_A PB13:Encoder_B PB14:Encoder_C*/
88
       #if PIN_EXISTS(LCD_LED)
88
       #if PIN_EXISTS(LCD_LED)
89
         //LED_Action();
89
         //LED_Action();
90
       #endif
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
     else return ENCODER_DIFF_NO;
95
     else return ENCODER_DIFF_NO;
94
   }
96
   }

Laden…
Annuleren
Opslaan