upd rfid freq detector

Flipper-XFW · Oct 24, 2023 · 18ff6c6 · 18ff6c6
1 parent e6cc06d
commit 18ff6c6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 136 deletions.
diff --git a/application.fam b/application.fam
@@ -1,13 +1,13 @@
 App(
     appid="nfc_rfid_detector",
-    name="NFC/RFID detector",
+    name="RFID detector",
     apptype=FlipperAppType.EXTERNAL,
     targets=["f7"],
     entry_point="nfc_rfid_detector_app",
     requires=["gui"],
     stack_size=4 * 1024,
     fap_description="Identify the reader type: NFC (13 MHz) and/or RFID (125 KHz).",
-    fap_version="1.0",
+    fap_version="1.1",
     fap_icon="nfc_rfid_detector_10px.png",
     fap_category="Tools",
     fap_icon_assets="images",

diff --git a/helpers/nfc_rfid_detector_types.h b/helpers/nfc_rfid_detector_types.h
@@ -5,7 +5,7 @@
 
 #define NFC_RFID_DETECTOR_VERSION_APP "0.1"
 #define NFC_RFID_DETECTOR_DEVELOPED "SkorP"
-#define NFC_RFID_DETECTOR_GITHUB "https://github.com/flipperdevices/flipperzero-firmware"
+#define NFC_RFID_DETECTOR_GITHUB "https://github.com/flipperdevices/flipperzero-good-faps"
 
 typedef enum {
     NfcRfidDetectorViewVariableItemList,

diff --git a/nfc_rfid_detector_app.c b/nfc_rfid_detector_app.c
@@ -62,7 +62,7 @@ NfcRfidDetectorApp* nfc_rfid_detector_app_alloc() {
         NfcRfidDetectorViewFieldPresence,
         nfc_rfid_detector_view_field_presence_get_view(app->nfc_rfid_detector_field_presence));
 
-    scene_manager_next_scene(app->scene_manager, NfcRfidDetectorSceneStart);
+    scene_manager_next_scene(app->scene_manager, NfcRfidDetectorSceneFieldPresence);
 
     return app;
 }

diff --git a/nfc_rfid_detector_app_i.c b/nfc_rfid_detector_app_i.c
@@ -11,7 +11,7 @@ void nfc_rfid_detector_app_field_presence_start(NfcRfidDetectorApp* app) {
     furi_hal_rfid_field_detect_start();
 
     // start the field presence nfc detection
-    furi_hal_nfc_exit_sleep();
+    furi_hal_nfc_acquire();
     furi_hal_nfc_field_detect_start();
 }
 
@@ -22,14 +22,17 @@ void nfc_rfid_detector_app_field_presence_stop(NfcRfidDetectorApp* app) {
     furi_hal_rfid_field_detect_stop();
 
     // stop the field presence nfc detection
-    furi_hal_nfc_start_sleep();
+    furi_hal_nfc_field_detect_stop();
+    furi_hal_nfc_release();
 }
 
 bool nfc_rfid_detector_app_field_presence_is_nfc(NfcRfidDetectorApp* app) {
     furi_assert(app);
 
     // check if the field presence is nfc
-    return furi_hal_nfc_field_is_present();
+    bool is_present = furi_hal_nfc_field_is_present();
+
+    return is_present;
 }
 
 bool nfc_rfid_detector_app_field_presence_is_rfid(NfcRfidDetectorApp* app, uint32_t* frequency) {

diff --git a/scenes/nfc_rfid_detector_scene_about.c b/scenes/nfc_rfid_detector_scene_about.c
diff --git a/scenes/nfc_rfid_detector_scene_config.h b/scenes/nfc_rfid_detector_scene_config.h
@@ -1,3 +1 @@
-ADD_SCENE(nfc_rfid_detector, start, Start)
-ADD_SCENE(nfc_rfid_detector, about, About)
 ADD_SCENE(nfc_rfid_detector, field_presence, FieldPresence)
diff --git a/scenes/nfc_rfid_detector_scene_start.c b/scenes/nfc_rfid_detector_scene_start.c