Skip to content

NFC file version: align with firmware's current version number #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zinongli wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

NFC file version: align with firmware's current version number #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions metroflip_i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <loader/firmware_api/firmware_api.h>
#include <applications/services/storage/storage.h>
#include <applications/services/dialogs/dialogs.h>
#include <lib/nfc/nfc_common.h>

#include "scenes/metroflip_scene.h"

Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/bip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ static void bip_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
MfClassicData* mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/charliecard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,7 @@ static void charliecard_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
MfClassicData* mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/clipper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ static void clipper_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
MfDesfireData* data = mf_desfire_alloc();
mf_desfire_load(data, ff, 2);
mf_desfire_load(data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/gocard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static void gocard_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
MfClassicData* mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/itso.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ static void itso_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
MfDesfireData* data = mf_desfire_alloc();
mf_desfire_load(data, ff, 2);
mf_desfire_load(data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/metromoney.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ static void metromoney_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
MfClassicData* mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/myki.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static void myki_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
MfDesfireData* data = mf_desfire_alloc();
mf_desfire_load(data, ff, 2);
mf_desfire_load(data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/opal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ static void opal_on_enter(Metroflip* app) {
Storage* storage = furi_record_open(RECORD_STORAGE);
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
mf_desfire_load(app->mfdes_data, ff, 2);
mf_desfire_load(app->mfdes_data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
6 changes: 3 additions & 3 deletions scenes/plugins/renfe_regular.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@ static void renfe_regular_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
should_free_mfc_data = true;
}
flipper_format_free(ff);
Expand Down Expand Up @@ -1252,7 +1252,7 @@ static bool renfe_regular_on_event(Metroflip* app, SceneManagerEvent event) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
should_free_mfc_data = true;
}
flipper_format_free(ff);
Expand Down Expand Up @@ -1291,7 +1291,7 @@ static bool renfe_regular_on_event(Metroflip* app, SceneManagerEvent event) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
should_free_mfc_data = true;
}
flipper_format_free(ff);
Expand Down
6 changes: 3 additions & 3 deletions scenes/plugins/renfe_sum10.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,7 @@ static void renfe_sum10_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
should_free_mfc_data = true;
}
flipper_format_free(ff);
Expand Down Expand Up @@ -1549,7 +1549,7 @@ static bool renfe_sum10_on_event(Metroflip* app, SceneManagerEvent event) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
should_free_mfc_data = true;
}
flipper_format_free(ff);
Expand Down Expand Up @@ -1611,7 +1611,7 @@ static bool renfe_sum10_on_event(Metroflip* app, SceneManagerEvent event) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
should_free_mfc_data = true;
}
flipper_format_free(ff);
Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/smartrider.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ static void smartrider_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
MfClassicData* mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
2 changes: 1 addition & 1 deletion scenes/plugins/troika.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@ static void troika_on_enter(Metroflip* app) {
FlipperFormat* ff = flipper_format_file_alloc(storage);
if(flipper_format_file_open_existing(ff, app->file_path)) {
MfClassicData* mfc_data = mf_classic_alloc();
mf_classic_load(mfc_data, ff, 2);
mf_classic_load(mfc_data, ff, NFC_CURRENT_FORMAT_VERSION);
FuriString* parsed_data = furi_string_alloc();
Widget* widget = app->widget;

Expand Down
Loading