zinongli 10 месяцев назад
Родитель
Сommit
dfa7299874
3 измененных файлов с 7 добавлено и 7 удалено
  1. 5 4
      example_file/suica_example.nfc
  2. 0 2
      scenes/keys.c
  3. 2 1
      scenes/metroflip_scene_parse.c

+ 5 - 4
example_file/suica_example.metro → example_file/suica_example.nfc

@@ -1,12 +1,13 @@
 Filetype: Flipper Metroflip File
 Version: 1
+Device type: FeliCa
 Card Type: suica
 Travel History: 
 Travel 00: C8 46 00 00 31 55 85 63 0E B8 00 00 00 00 07 00
 Travel 01: C7 46 00 00 31 55 67 4B EE A9 8C 00 00 00 06 00
-Travel 02: 16 01 00 05 31 54 FA 01 01 1A 1B 00 00 00 05 00
-Travel 03: 16 01 00 05 31 53 01 18 31 00 1B 00 00 00 04 00
+Travel 02: 16 01 00 05 31 54 01 18 FA 01 1B 00 00 00 05 00
+Travel 03: 16 01 00 05 31 53 E3 55 1D 08 1B 00 00 00 04 00
 Travel 04: 16 01 00 05 31 47 82 04 E4 25 1B 00 00 00 03 00
-Travel 05: 1D 01 00 02 31 46 D5 14 01 12 62 01 00 00 02 00
-Travel 06: 12 07 00 00 31 45 82 08 00 00 E8 03 00 00 01 00
+Travel 05: 1D 01 00 02 31 46 D5 14 EF 0D 62 01 00 00 02 00
+Travel 06: 12 07 00 00 31 45 02 FD 00 00 E8 03 00 00 01 00
 Travel 07: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

+ 0 - 2
scenes/keys.c

@@ -33,7 +33,6 @@ const MfClassicKeyPair metromoney_1k_verify_key[] = {
     {.a = 0x9C616585E26D},
 };
 
-
 const uint8_t gocard_verify_data[1][14] = {
     {0x16, 0x18, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x5A, 0x5B, 0x20, 0x21, 0x22, 0x23}};
 
@@ -278,7 +277,6 @@ static bool gocard_verify(MfClassicData* mfc_data, bool data_loaded) {
     return verified;
 }
 
-
 CardType determine_card_type(Nfc* nfc, MfClassicData* mfc_data, bool data_loaded) {
     FURI_LOG_I(TAG, "checking keys..");
     UNUSED(bip_verify);

+ 2 - 1
scenes/metroflip_scene_parse.c

@@ -53,7 +53,8 @@ bool metroflip_scene_parse_on_event(void* context, SceneManagerEvent event) {
 
 void metroflip_scene_parse_on_exit(void* context) {
     Metroflip* app = context;
-    if(!((app->card_type[0] == '\0') || (strcmp(app->card_type, "unknown") == 0) || (!app->card_type))) {
+    if(!((app->card_type[0] == '\0') || (strcmp(app->card_type, "unknown") == 0) ||
+         (!app->card_type))) {
         // Get and run the plugin's on_exit function
         const MetroflipPlugin* plugin = plugin_manager_get_ep(app->plugin_manager, 0);
         plugin->plugin_on_exit(app);