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

Revert "auto-stop emulation after 5min feature added"

Browse Source 
This reverts commit 19a5f02d66.
This commit is contained in:
MX
2024-02-21 04:02:02 +03:00
parent 26cb315845
commit 614f9b8705
4 changed files with 2 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/lfrfid/lfrfid_i.h
View File

@@ -66,7 +66,6 @@ enum LfRfidCustomEvent {
LfRfidEventWriteTooLongToWrite, LfRfidEventWriteTooLongToWrite,
LfRfidEventRpcLoadFile, LfRfidEventRpcLoadFile,
LfRfidEventRpcSessionClose, LfRfidEventRpcSessionClose,
LfRfidEventEmulationTimeExpired,
}; };
typedef enum { typedef enum {

31
applications/main/lfrfid/scenes/lfrfid_scene_emulate.c
View File

@@ -1,14 +1,5 @@
#include "../lfrfid_i.h" #include "../lfrfid_i.h"
#define LFRFID_EMULATION_TIME_MAX_MS (5 * 60 * 1000)
FuriTimer* timer;
void lfrfid_scene_emulate_popup_callback(void* context) {
LfRfid* app = context;
view_dispatcher_send_custom_event(app->view_dispatcher, LfRfidEventEmulationTimeExpired);
}
void lfrfid_scene_emulate_on_enter(void* context) { void lfrfid_scene_emulate_on_enter(void* context) {
LfRfid* app = context; LfRfid* app = context;
Popup* popup = app->popup; Popup* popup = app->popup;
@@ -31,36 +22,18 @@ void lfrfid_scene_emulate_on_enter(void* context) {
lfrfid_worker_emulate_start(app->lfworker, (LFRFIDProtocol)app->protocol_id); lfrfid_worker_emulate_start(app->lfworker, (LFRFIDProtocol)app->protocol_id);
notification_message(app->notifications, &sequence_blink_start_magenta); notification_message(app->notifications, &sequence_blink_start_magenta);
timer = furi_timer_alloc(lfrfid_scene_emulate_popup_callback, FuriTimerTypeOnce, app);
furi_timer_start(timer, LFRFID_EMULATION_TIME_MAX_MS);
view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup); view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
} }
bool lfrfid_scene_emulate_on_event(void* context, SceneManagerEvent event) { bool lfrfid_scene_emulate_on_event(void* context, SceneManagerEvent event) {
LfRfid* app = context; UNUSED(context);
UNUSED(event);
bool consumed = false; bool consumed = false;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == LfRfidEventEmulationTimeExpired) {
if(!scene_manager_previous_scene(app->scene_manager)) {
scene_manager_stop(app->scene_manager);
view_dispatcher_stop(app->view_dispatcher);
} else {
scene_manager_previous_scene(app->scene_manager);
}
consumed = true;
}
}
return consumed; return consumed;
} }
void lfrfid_scene_emulate_on_exit(void* context) { void lfrfid_scene_emulate_on_exit(void* context) {
LfRfid* app = context; LfRfid* app = context;
furi_timer_free(timer);
notification_message(app->notifications, &sequence_blink_stop); notification_message(app->notifications, &sequence_blink_stop);
popup_reset(app->popup); popup_reset(app->popup);
lfrfid_worker_stop(app->lfworker); lfrfid_worker_stop(app->lfworker);

2
applications/main/nfc/helpers/nfc_custom_event.h
View File

@@ -30,6 +30,4 @@ typedef enum {
NfcCustomEventPollerFailure, NfcCustomEventPollerFailure,
NfcCustomEventListenerUpdate, NfcCustomEventListenerUpdate,
NfcCustomEventEmulationTimeExpired,
} NfcCustomEvent; } NfcCustomEvent;

32
applications/main/nfc/scenes/nfc_scene_emulate.c
View File

@@ -1,45 +1,13 @@
#include "../helpers/protocol_support/nfc_protocol_support.h" #include "../helpers/protocol_support/nfc_protocol_support.h"
#include "nfc_app_i.h"
#define NFC_EMULATION_TIME_MAX_MS (5 * 60 * 1000)
FuriTimer* timer;
void nfc_scene_emulate_timer_callback(void* context) {
NfcApp* instance = context;
view_dispatcher_send_custom_event(
instance->view_dispatcher, NfcCustomEventEmulationTimeExpired);
}
void nfc_scene_emulate_on_enter(void* context) { void nfc_scene_emulate_on_enter(void* context) {
NfcApp* instance = context;
nfc_protocol_support_on_enter(NfcProtocolSupportSceneEmulate, context); nfc_protocol_support_on_enter(NfcProtocolSupportSceneEmulate, context);
timer = furi_timer_alloc(nfc_scene_emulate_timer_callback, FuriTimerTypeOnce, instance);
furi_timer_start(timer, NFC_EMULATION_TIME_MAX_MS);
} }
bool nfc_scene_emulate_on_event(void* context, SceneManagerEvent event) { bool nfc_scene_emulate_on_event(void* context, SceneManagerEvent event) {
NfcApp* instance = context;
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == NfcCustomEventEmulationTimeExpired) {
if(!scene_manager_previous_scene(instance->scene_manager)) {
scene_manager_stop(instance->scene_manager);
view_dispatcher_stop(instance->view_dispatcher);
} else {
scene_manager_previous_scene(instance->scene_manager);
}
return true;
}
}
return nfc_protocol_support_on_event(NfcProtocolSupportSceneEmulate, context, event); return nfc_protocol_support_on_event(NfcProtocolSupportSceneEmulate, context, event);
} }
void nfc_scene_emulate_on_exit(void* context) { void nfc_scene_emulate_on_exit(void* context) {
furi_timer_free(timer);
nfc_protocol_support_on_exit(NfcProtocolSupportSceneEmulate, context); nfc_protocol_support_on_exit(NfcProtocolSupportSceneEmulate, context);
} }