mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 04:34:43 +04:00
Code Issues Activity

fix merge artifact

Browse Source
This commit is contained in:
MX
2025-10-12 21:51:25 +03:00
parent 2efcc8f6cc
commit b604c93eb0
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
applications/main/nfc/helpers/protocol_support/felica/felica.c
View File

@@ -126,15 +126,6 @@ static void nfc_scene_read_success_on_enter_felica(NfcApp* instance) {
furi_string_free(temp_str); furi_string_free(temp_str);
} }
static bool nfc_scene_saved_menu_on_event_felica(NfcApp* instance, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom && event.event == SubmenuIndexCommonEdit) {
scene_manager_next_scene(instance->scene_manager, NfcSceneSetUid);
return true;
}
return false;
}
static void nfc_scene_emulate_on_enter_felica(NfcApp* instance) { static void nfc_scene_emulate_on_enter_felica(NfcApp* instance) {
const FelicaData* data = nfc_device_get_data(instance->nfc_device, NfcProtocolFelica); const FelicaData* data = nfc_device_get_data(instance->nfc_device, NfcProtocolFelica);
instance->listener = nfc_listener_alloc(instance->nfc, NfcProtocolFelica, data); instance->listener = nfc_listener_alloc(instance->nfc, NfcProtocolFelica, data);
@@ -194,7 +185,7 @@ const NfcProtocolSupportBase nfc_protocol_support_felica = {
.scene_saved_menu = .scene_saved_menu =
{ {
.on_enter = nfc_protocol_support_common_on_enter_empty, .on_enter = nfc_protocol_support_common_on_enter_empty,
.on_event = nfc_scene_saved_menu_on_event_felica, .on_event = nfc_protocol_support_common_on_event_empty,
}, },
.scene_save_name = .scene_save_name =
{ {
@@ -206,4 +197,11 @@ const NfcProtocolSupportBase nfc_protocol_support_felica = {
.on_enter = nfc_scene_emulate_on_enter_felica, .on_enter = nfc_scene_emulate_on_enter_felica,
.on_event = nfc_protocol_support_common_on_event_empty, .on_event = nfc_protocol_support_common_on_event_empty,
}, },
.scene_write =
{
.on_enter = nfc_protocol_support_common_on_enter_empty,
.on_event = nfc_protocol_support_common_on_event_empty,
},
}; };
NFC_PROTOCOL_SUPPORT_PLUGIN(felica, NfcProtocolFelica);