[FL-3629] fbt: reworked assets & resources handling (#3160)

* fbt: reworking targets & assets handling WIP * fbt: dist fixes * fbt: moved SD card resources to owning apps * unit_tests: moved resources to app folder * github: updated unit_tests paths * github: packaging fixes * unit_tests: fixes * fbt: assets: internal cleanup * fbt: reworked assets handling * github: unit_tests: reintroducing fixes * minor cleanup * fbt: naming changes to reflect private nature of scons tools * fbt: resources: fixed dist archive paths * docs: updated paths * docs: updated more paths * docs: included "resources" parameter in app manifest docs; updated assets readme * updated gitignore for assets * github: updated action versions * unit_tests: restored timeout; scripts: assets: logging changes * gh: don't upload desktop animations for unit test run Co-authored-by: あく <alleteam@gmail.com>
2026-04-24 03:29:57 -07:00 · 2023-10-30 19:17:30 +04:00
parent 176fb21f5f
commit 917410a0a8
345 changed files with 466 additions and 394 deletions
--- a/targets/f7/furi_hal/furi_hal_nfc_event.c
+++ b/targets/f7/furi_hal/furi_hal_nfc_event.c
@@ -0,0 +1,117 @@
+#include <furi_hal_nfc_i.h>
+
+FuriHalNfcEventInternal* furi_hal_nfc_event = NULL;
+
+void furi_hal_nfc_event_init() {
+    furi_hal_nfc_event = malloc(sizeof(FuriHalNfcEventInternal));
+}
+
+FuriHalNfcError furi_hal_nfc_event_start() {
+    furi_assert(furi_hal_nfc_event);
+
+    furi_hal_nfc_event->thread = furi_thread_get_current_id();
+    furi_thread_flags_clear(FURI_HAL_NFC_EVENT_INTERNAL_ALL);
+
+    return FuriHalNfcErrorNone;
+}
+
+FuriHalNfcError furi_hal_nfc_event_stop() {
+    furi_assert(furi_hal_nfc_event);
+
+    furi_hal_nfc_event->thread = NULL;
+
+    return FuriHalNfcErrorNone;
+}
+
+void furi_hal_nfc_event_set(FuriHalNfcEventInternalType event) {
+    furi_assert(furi_hal_nfc_event);
+
+    if(furi_hal_nfc_event->thread) {
+        furi_thread_flags_set(furi_hal_nfc_event->thread, event);
+    }
+}
+
+FuriHalNfcError furi_hal_nfc_abort() {
+    furi_hal_nfc_event_set(FuriHalNfcEventInternalTypeAbort);
+    return FuriHalNfcErrorNone;
+}
+
+FuriHalNfcEvent furi_hal_nfc_wait_event_common(uint32_t timeout_ms) {
+    furi_assert(furi_hal_nfc_event);
+    furi_assert(furi_hal_nfc_event->thread);
+
+    FuriHalNfcEvent event = 0;
+    uint32_t event_timeout = timeout_ms == FURI_HAL_NFC_EVENT_WAIT_FOREVER ? FuriWaitForever :
+                                                                             timeout_ms;
+    uint32_t event_flag =
+        furi_thread_flags_wait(FURI_HAL_NFC_EVENT_INTERNAL_ALL, FuriFlagWaitAny, event_timeout);
+    if(event_flag != (unsigned)FuriFlagErrorTimeout) {
+        if(event_flag & FuriHalNfcEventInternalTypeIrq) {
+            furi_thread_flags_clear(FuriHalNfcEventInternalTypeIrq);
+            FuriHalSpiBusHandle* handle = &furi_hal_spi_bus_handle_nfc;
+            uint32_t irq = furi_hal_nfc_get_irq(handle);
+            if(irq & ST25R3916_IRQ_MASK_OSC) {
+                event |= FuriHalNfcEventOscOn;
+            }
+            if(irq & ST25R3916_IRQ_MASK_TXE) {
+                event |= FuriHalNfcEventTxEnd;
+            }
+            if(irq & ST25R3916_IRQ_MASK_RXS) {
+                event |= FuriHalNfcEventRxStart;
+            }
+            if(irq & ST25R3916_IRQ_MASK_RXE) {
+                event |= FuriHalNfcEventRxEnd;
+            }
+            if(irq & ST25R3916_IRQ_MASK_COL) {
+                event |= FuriHalNfcEventCollision;
+            }
+            if(irq & ST25R3916_IRQ_MASK_EON) {
+                event |= FuriHalNfcEventFieldOn;
+            }
+            if(irq & ST25R3916_IRQ_MASK_EOF) {
+                event |= FuriHalNfcEventFieldOff;
+            }
+            if(irq & ST25R3916_IRQ_MASK_WU_A) {
+                event |= FuriHalNfcEventListenerActive;
+            }
+            if(irq & ST25R3916_IRQ_MASK_WU_A_X) {
+                event |= FuriHalNfcEventListenerActive;
+            }
+        }
+        if(event_flag & FuriHalNfcEventInternalTypeTimerFwtExpired) {
+            event |= FuriHalNfcEventTimerFwtExpired;
+            furi_thread_flags_clear(FuriHalNfcEventInternalTypeTimerFwtExpired);
+        }
+        if(event_flag & FuriHalNfcEventInternalTypeTimerBlockTxExpired) {
+            event |= FuriHalNfcEventTimerBlockTxExpired;
+            furi_thread_flags_clear(FuriHalNfcEventInternalTypeTimerBlockTxExpired);
+        }
+        if(event_flag & FuriHalNfcEventInternalTypeAbort) {
+            event |= FuriHalNfcEventAbortRequest;
+            furi_thread_flags_clear(FuriHalNfcEventInternalTypeAbort);
+        }
+    } else {
+        event = FuriHalNfcEventTimeout;
+    }
+
+    return event;
+}
+
+bool furi_hal_nfc_event_wait_for_specific_irq(
+    FuriHalSpiBusHandle* handle,
+    uint32_t mask,
+    uint32_t timeout_ms) {
+    furi_assert(furi_hal_nfc_event);
+    furi_assert(furi_hal_nfc_event->thread);
+
+    bool irq_received = false;
+    uint32_t event_flag =
+        furi_thread_flags_wait(FuriHalNfcEventInternalTypeIrq, FuriFlagWaitAny, timeout_ms);
+    if(event_flag == FuriHalNfcEventInternalTypeIrq) {
+        uint32_t irq = furi_hal_nfc_get_irq(handle);
+        irq_received = ((irq & mask) == mask);
+        furi_thread_flags_clear(FuriHalNfcEventInternalTypeIrq);
+    }
+
+    return irq_received;
+}