Eric Betts 8 месяцев назад
Родитель
Сommit
1c582cfc43
6 измененных файлов с 12 добавлено и 11 удалено
  1. 1 2
      acknowledgements.h
  2. 6 4
      scenes/weebo_scene_main_menu.c
  3. 1 1
      scenes/weebo_scene_write.c
  4. 2 2
      weebo.c
  5. 1 1
      weebo_common.c
  6. 1 1
      weebo_i.h

+ 1 - 2
acknowledgements.h

@@ -1,3 +1,2 @@
 const char* acknowledgements_text =
-  "This app developed using amiitool (https://github.com/socram8888/amiitool) by socram8888.\n";
-
+    "This app developed using amiitool (https://github.com/socram8888/amiitool) by socram8888.\n";

+ 6 - 4
scenes/weebo_scene_main_menu.c

@@ -20,9 +20,11 @@ void weebo_scene_main_menu_on_enter(void* context) {
     submenu_add_item(
         submenu, "Saved", SubmenuIndexSaved, weebo_scene_main_menu_submenu_callback, weebo);
     submenu_add_item(
-        submenu, "Acknowledgements", SubmenuIndexAcknowledgements, weebo_scene_main_menu_submenu_callback, weebo);
-
-
+        submenu,
+        "Acknowledgements",
+        SubmenuIndexAcknowledgements,
+        weebo_scene_main_menu_submenu_callback,
+        weebo);
 
     submenu_set_selected_item(
         submenu, scene_manager_get_scene_state(weebo->scene_manager, WeeboSceneMainMenu));
@@ -39,7 +41,7 @@ bool weebo_scene_main_menu_on_event(void* context, SceneManagerEvent event) {
             scene_manager_next_scene(weebo->scene_manager, WeeboSceneFileSelect);
             consumed = true;
         } else if(event.event == SubmenuIndexAcknowledgements) {
-          scene_manager_next_scene(weebo->scene_manager, WeeboSceneAcknowledgements);
+            scene_manager_next_scene(weebo->scene_manager, WeeboSceneAcknowledgements);
             consumed = true;
         }
     }

+ 1 - 1
scenes/weebo_scene_write.c

@@ -64,7 +64,7 @@ NfcCommand weebo_scene_write_poller_callback(NfcGenericEvent event, void* contex
         }
 
         uint8_t modified[NTAG215_SIZE];
-        nfc3d_amiibo_pack(&weebo->amiiboKeys, weebo->figure, modified);
+        nfc3d_amiibo_pack(&weebo->keys, weebo->figure, modified);
 
         MfUltralightError error;
         MfUltralightPage page;

+ 2 - 2
weebo.c

@@ -36,7 +36,7 @@ bool weebo_load_key_retail(Weebo* weebo) {
             break;
         }
 
-        memcpy(&weebo->amiiboKeys, buffer, bytes_read);
+        memcpy(&weebo->keys, buffer, bytes_read);
 
         // TODO: compare SHA1
         parsed = true;
@@ -94,7 +94,7 @@ bool weebo_load_figure(Weebo* weebo, FuriString* path, bool show_dialog) {
                 buffer + i * MF_ULTRALIGHT_PAGE_SIZE, data->page[i].data, MF_ULTRALIGHT_PAGE_SIZE);
         }
 
-        if(!nfc3d_amiibo_unpack(&weebo->amiiboKeys, buffer, weebo->figure)) {
+        if(!nfc3d_amiibo_unpack(&weebo->keys, buffer, weebo->figure)) {
             FURI_LOG_E(TAG, "Failed to unpack");
             break;
         }

+ 1 - 1
weebo_common.c

@@ -25,7 +25,7 @@ void weebo_remix(Weebo* weebo) {
     memcpy(data->iso14443_3a_data->uid, UID, 7);
 
     //pack
-    nfc3d_amiibo_pack(&weebo->amiiboKeys, weebo->figure, modified);
+    nfc3d_amiibo_pack(&weebo->keys, weebo->figure, modified);
 
     //copy data in
     for(size_t i = 0; i < 130; i++) {

+ 1 - 1
weebo_i.h

@@ -94,7 +94,7 @@ struct Weebo {
     char file_name[WEEBO_FILE_NAME_MAX_LENGTH + 1];
 
     bool keys_loaded;
-    nfc3d_amiibo_keys amiiboKeys;
+    nfc3d_amiibo_keys keys;
 
     WeeboLoadingCallback loading_cb;
     void* loading_cb_ctx;