mirror of
https://github.com/polhenarejos/pico-keys-sdk.git
synced 2026-08-28 23:53:02 +01:00
Fix FORCE_BUTTON_WAIT
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
+2
-2
@@ -39,9 +39,9 @@ bool is_req_button_pending(void) {
|
||||
return req_button_pending;
|
||||
}
|
||||
|
||||
bool cancel_button = false;
|
||||
volatile bool cancel_button = false;
|
||||
bool touch_accept_button = false;
|
||||
bool force_button_wait = false;
|
||||
volatile bool force_button_wait = false;
|
||||
|
||||
#if !defined(ENABLE_EMULATION)
|
||||
#ifdef ESP_PLATFORM
|
||||
|
||||
+2
-2
@@ -27,8 +27,8 @@
|
||||
|
||||
extern int button_wait(void);
|
||||
extern void button_task(void);
|
||||
extern bool cancel_button;
|
||||
extern volatile bool cancel_button;
|
||||
extern bool touch_accept_button;
|
||||
extern bool force_button_wait;
|
||||
extern volatile bool force_button_wait;
|
||||
|
||||
#endif // BUTTON_H
|
||||
|
||||
+1
-1
@@ -207,7 +207,7 @@ static bool rescue_require_user_presence(void) {
|
||||
return true;
|
||||
#else
|
||||
bool previous_force = force_button_wait;
|
||||
#ifdef FORCE_WAIT_BUTTON
|
||||
#ifdef FORCE_BUTTON_WAIT
|
||||
force_button_wait = true;
|
||||
#endif
|
||||
int ret = button_wait();
|
||||
|
||||
+1
-1
@@ -314,7 +314,7 @@ CTAPHID_FRAME last_req = { 0 };
|
||||
uint32_t lock = 0;
|
||||
|
||||
uint8_t thread_type = 0; //1 is APDU, 2 is CBOR
|
||||
extern bool cancel_button;
|
||||
extern volatile bool cancel_button;
|
||||
extern int cbor_process(uint8_t last_cmd, const uint8_t *data, size_t len);
|
||||
static uint32_t last_keepalive_time = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user