Просмотр исходного кода

Merge pull request #14 from ry4000/main

Luu 1 год назад
Родитель
Сommit
3ed7186bc0
2 измененных файлов с 6 добавлено и 6 удалено
  1. 2 2
      scenes/metroflip_scene_config.h
  2. 4 4
      scenes/metroflip_scene_myki.c

+ 2 - 2
scenes/metroflip_scene_config.h

@@ -6,9 +6,9 @@ ADD_SCENE(metroflip, clipper, Clipper)
 ADD_SCENE(metroflip, metromoney, Metromoney)
 ADD_SCENE(metroflip, read_success, ReadSuccess)
 ADD_SCENE(metroflip, bip, Bip)
-ADD_SCENE(metroflip, myki, Myki)
+ADD_SCENE(metroflip, myki, myki)
 ADD_SCENE(metroflip, troika, Troika)
 ADD_SCENE(metroflip, opal, Opal)
-ADD_SCENE(metroflip, itso, Itso)
+ADD_SCENE(metroflip, itso, ITSO)
 ADD_SCENE(metroflip, about, About)
 ADD_SCENE(metroflip, credits, Credits)

+ 4 - 4
scenes/metroflip_scene_myki.c

@@ -6,7 +6,7 @@
 #include "../metroflip_i.h"
 #include <nfc/protocols/mf_desfire/mf_desfire_poller.h>
 
-#define TAG "Metroflip:Scene:Myki"
+#define TAG "Metroflip:Scene:myki"
 
 static const MfDesfireApplicationId myki_app_id = {.data = {0x00, 0x11, 0xf2}};
 static const MfDesfireFileId myki_file_id = 0x0f;
@@ -49,19 +49,19 @@ static bool myki_parse(const NfcDevice* device, FuriString* parsed_data) {
         typedef struct {
             uint32_t top;
             uint32_t bottom;
-        } MykiFile;
+        } mykiFile;
 
         const MfDesfireFileSettings* file_settings =
             mf_desfire_get_file_settings(app, &myki_file_id);
 
         if(file_settings == NULL || file_settings->type != MfDesfireFileTypeStandard ||
-           file_settings->data.size < sizeof(MykiFile))
+           file_settings->data.size < sizeof(mykiFile))
             break;
 
         const MfDesfireFileData* file_data = mf_desfire_get_file_data(app, &myki_file_id);
         if(file_data == NULL) break;
 
-        const MykiFile* myki_file = simple_array_cget_data(file_data->data);
+        const mykiFile* myki_file = simple_array_cget_data(file_data->data);
 
         // All myki card numbers are prefixed with "308425"
         if(myki_file->top != 308425UL) break;