Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-22 01:08:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ofwdev' into 420

Browse Source
This commit is contained in:
RogueMaster
2022-11-09 15:49:35 -05:00
parent 5c7edd31ae 3985b456c3
commit 1c23a2e0ea
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nfc/nfc_worker.c
+5 -5
View File
@@ -75,12 +75,12 @@ void nfc_worker_start(
void nfc_worker_stop(NfcWorker* nfc_worker) {
furi_assert(nfc_worker);
if(nfc_worker->state == NfcWorkerStateBroken || nfc_worker->state == NfcWorkerStateReady) {
return;
furi_assert(nfc_worker->thread);
if(furi_thread_get_state(nfc_worker->thread) != FuriThreadStateStopped) {
furi_hal_nfc_stop();
nfc_worker_change_state(nfc_worker, NfcWorkerStateStop);
furi_thread_join(nfc_worker->thread);
}
furi_hal_nfc_stop();
nfc_worker_change_state(nfc_worker, NfcWorkerStateStop);
furi_thread_join(nfc_worker->thread);
}
void nfc_worker_change_state(NfcWorker* nfc_worker, NfcWorkerState state) {
lib/nfc/nfc_worker.h
-1
View File
@@ -7,7 +7,6 @@ typedef struct NfcWorker NfcWorker;
typedef enum {
// Init states
NfcWorkerStateNone,
NfcWorkerStateBroken,
NfcWorkerStateReady,
// Main worker states
NfcWorkerStateRead,