Merge branch 'develop' of github.com:solosky/pixl.js into develop

solosky · Nov 18, 2023 · fe2abc0 · fe2abc0
2 parents 8d8ae25 + badc460
commit fe2abc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/fw/application/src/app/amiibo/scene/amiibo_scene_amiibo_detail.c b/fw/application/src/app/amiibo/scene/amiibo_scene_amiibo_detail.c
@@ -187,7 +187,7 @@ static void amiibo_scene_amiibo_detail_reload_files(app_amiibo_t *app) {
             vfs_meta_t meta;
             memset(&meta, 0, sizeof(vfs_meta_t));
             vfs_meta_decode(obj.meta, sizeof(obj.meta), &meta);
-            if (obj.type == VFS_TYPE_REG && (obj.size == NTAG_DATA_SIZE || obj.size == 532 || obj.size == 572) &&
+            if (obj.type == VFS_TYPE_REG && (obj.size == NTAG_DATA_SIZE || obj.size == NTAG_TAGMO_DATA_SIZE || obj.size == NTAG_THENAYA_DATA_SIZE) &&
                 (!meta.has_flags || !(meta.flags & VFS_OBJ_FLAG_HIDDEN))) {
                 string_set_str(file_name, obj.name);
                 string_array_push_back(app->amiibo_files, file_name);
@@ -254,4 +254,4 @@ void amiibo_scene_amiibo_detail_on_exit(void *user_data) {
     app_amiibo_t *app = user_data;
     ntag_emu_set_update_cb(NULL, NULL);
     app_timer_stop(m_amiibo_gen_delay_timer);
-}
+}
diff --git a/fw/application/src/ntag/ntag_def.h b/fw/application/src/ntag/ntag_def.h
@@ -12,6 +12,8 @@
 #include <stdbool.h>
 
 #define NTAG_DATA_SIZE 540
+#define NTAG_TAGMO_DATA_SIZE 532
+#define NTAG_THENAYA_DATA_SIZE 572
 
 typedef enum
 {