Merge remote-tracking branch 'ofw/dev' into mntm-dev

This commit is contained in:
Willy-JL
2024-07-15 22:18:35 +01:00
466 changed files with 3282 additions and 3168 deletions

View File

@@ -19,4 +19,4 @@ void nfc_render_felica_dump(const FelicaData* data, FuriString* str);
void nfc_render_felica_idm(
const FelicaData* data,
NfcProtocolFormatType format_type,
FuriString* str);
FuriString* str);

View File

@@ -120,4 +120,4 @@ const NfcProtocolSupportBase nfc_protocol_support_mf_plus = {
.on_enter = nfc_scene_emulate_on_enter_mf_plus,
.on_event = nfc_protocol_support_common_on_event_empty,
},
};
};

View File

@@ -2,4 +2,4 @@
#include "../nfc_protocol_support_base.h"
extern const NfcProtocolSupportBase nfc_protocol_support_mf_plus;
extern const NfcProtocolSupportBase nfc_protocol_support_mf_plus;

View File

@@ -11,4 +11,4 @@ void nfc_render_mf_ultralight_info(
void nfc_render_mf_ultralight_dump(const MfUltralightData* data, FuriString* str);
void nfc_render_mf_ultralight_pwd_pack(const MfUltralightData* data, FuriString* str);
void nfc_render_mf_ultralight_pwd_pack(const MfUltralightData* data, FuriString* str);

View File

@@ -113,4 +113,4 @@ bool nfc_protocol_support_on_event(
*/
void nfc_protocol_support_on_exit(NfcProtocolSupportScene scene, void* context);
bool nfc_protocol_support_has_feature(NfcProtocol protocol, NfcProtocolFeature feature);
bool nfc_protocol_support_has_feature(NfcProtocol protocol, NfcProtocolFeature feature);

View File

@@ -35,4 +35,4 @@ void nfc_unlock_helper_card_detected_handler(NfcApp* instance) {
scene_manager_set_scene_state(
instance->scene_manager, NfcSceneRead, NfcSceneReadMenuStateCardFound);
nfc_scene_read_setup_view(instance);
}
}

View File

@@ -6,4 +6,4 @@ typedef enum {
} NfcSceneUnlockReadState;
void nfc_unlock_helper_setup_from_state(NfcApp* instance);
void nfc_unlock_helper_card_detected_handler(NfcApp* instance);
void nfc_unlock_helper_card_detected_handler(NfcApp* instance);