Przeglądaj źródła

upd vb migrate (new category)

MX 2 lat temu
rodzic
commit
b7f0c89659

+ 1 - 1
ReadMe.md

@@ -203,6 +203,7 @@ The Flipper and its community wouldn't be as rich as it is without your contribu
 | Music Tracker | ![Media Badge] | [by DrZlo13](https://github.com/DrZlo13/flipper-zero-music-tracker) |  | [![UFW Badge]](https://lab.flipper.net/apps/zero_tracker) |
 | Music Tracker | ![Media Badge] | [by DrZlo13](https://github.com/DrZlo13/flipper-zero-music-tracker) |  | [![UFW Badge]](https://lab.flipper.net/apps/zero_tracker) |
 | Mifare Fuzzer | ![NFC Badge] | [by spheeere98](https://github.com/spheeere98/mifare_fuzzer) | Fixed crash on exit | [![UFW Badge]](https://lab.flipper.net/apps/mifare_fuzzer) |
 | Mifare Fuzzer | ![NFC Badge] | [by spheeere98](https://github.com/spheeere98/mifare_fuzzer) | Fixed crash on exit | [![UFW Badge]](https://lab.flipper.net/apps/mifare_fuzzer) |
 | Seader | ![NFC Badge] | [by bettse](https://github.com/bettse/seader/tree/main) | `Interface with a SAM from the Flipper Zero over UART` | [![Author Badge]](https://lab.flipper.net/apps/seader) |
 | Seader | ![NFC Badge] | [by bettse](https://github.com/bettse/seader/tree/main) | `Interface with a SAM from the Flipper Zero over UART` | [![Author Badge]](https://lab.flipper.net/apps/seader) |
+| VB Lab Migration Assistant | ![NFC Badge] | [by GMMan (cyanic)](https://github.com/GMMan/flipperzero-vb-migrate) |  | [![Author Badge]](https://lab.flipper.net/apps/vb_migrate) |
 | RFID Beacon | ![RFID Badge] | [by nmrr](https://github.com/nmrr/flipperzero-rfidbeacon)  | `A letter/number Morse beacon on 125 kHz` | ![None Badge] |
 | RFID Beacon | ![RFID Badge] | [by nmrr](https://github.com/nmrr/flipperzero-rfidbeacon)  | `A letter/number Morse beacon on 125 kHz` | ![None Badge] |
 | EM4100 universal keys generator (for RFID Fuzzer) | ![RFID Badge] | [by Milk-Cool](https://github.com/Milk-Cool/fz-em4100-generator) |  | [![Author Badge]](https://lab.flipper.net/apps/key_generator) |
 | EM4100 universal keys generator (for RFID Fuzzer) | ![RFID Badge] | [by Milk-Cool](https://github.com/Milk-Cool/fz-em4100-generator) |  | [![Author Badge]](https://lab.flipper.net/apps/key_generator) |
 | (Q)M100 UHF RFID | ![RFID Badge] | [by frux-c](https://github.com/frux-c/uhf_rfid) | WIP -> (+Added icon by @xMasterX) | ![None Badge] |
 | (Q)M100 UHF RFID | ![RFID Badge] | [by frux-c](https://github.com/frux-c/uhf_rfid) | WIP -> (+Added icon by @xMasterX) | ![None Badge] |
@@ -226,7 +227,6 @@ The Flipper and its community wouldn't be as rich as it is without your contribu
 | Pomodoro Timer | ![Tools Badge] | [by sbrin](https://github.com/sbrin/flipperzero_pomodoro) |  | [![UFW Badge]](https://lab.flipper.net/apps/pomodoro_timer) |
 | Pomodoro Timer | ![Tools Badge] | [by sbrin](https://github.com/sbrin/flipperzero_pomodoro) |  | [![UFW Badge]](https://lab.flipper.net/apps/pomodoro_timer) |
 | QR Code | ![Tools Badge] | [by bmatcuk](https://github.com/bmatcuk/flipperzero-qrcode) |  | ![None Badge] |
 | QR Code | ![Tools Badge] | [by bmatcuk](https://github.com/bmatcuk/flipperzero-qrcode) |  | ![None Badge] |
 | Resistance calculator | ![Tools Badge] | [by instantiator](https://github.com/instantiator/flipper-zero-experimental-apps) |  | [![UFW Badge]](https://lab.flipper.net/apps/resistors) |
 | Resistance calculator | ![Tools Badge] | [by instantiator](https://github.com/instantiator/flipper-zero-experimental-apps) |  | [![UFW Badge]](https://lab.flipper.net/apps/resistors) |
-| VB Lab Migration Assistant | ![Tools Badge] | [by GMMan (cyanic)](https://github.com/GMMan/flipperzero-vb-migrate) |  | [![Author Badge]](https://lab.flipper.net/apps/vb_migrate) |
 | Simple calendar app | ![Tools Badge] | [by Adiras](https://github.com/Adiras/flipperzero-calendar) |  | ![None Badge] |
 | Simple calendar app | ![Tools Badge] | [by Adiras](https://github.com/Adiras/flipperzero-calendar) |  | ![None Badge] |
 | USB HID Autofire | ![USB Badge] | [by pbek](https://github.com/pbek/usb_hid_autofire) |  | ![None Badge] |
 | USB HID Autofire | ![USB Badge] | [by pbek](https://github.com/pbek/usb_hid_autofire) |  | ![None Badge] |
 
 

+ 3 - 0
non_catalog_apps/flipperzero_vb_migrate/CHANGES.md

@@ -1,3 +1,6 @@
+# v1.2
+Updated for API 39.1
+
 # v1.1
 # v1.1
 Updated data directory path and built for API 26.3
 Updated data directory path and built for API 26.3
 
 

+ 2 - 2
non_catalog_apps/flipperzero_vb_migrate/application.fam

@@ -23,10 +23,10 @@ App(
     entry_point="vb_migrate_app",
     entry_point="vb_migrate_app",
     requires=["gui", "dialogs", "notification", "storage"],
     requires=["gui", "dialogs", "notification", "storage"],
     stack_size=2 * 1024,
     stack_size=2 * 1024,
-    fap_version=(1, 1),
+    fap_version=(1,2),
     fap_libs=[],
     fap_libs=[],
     fap_icon="vb_migrate_10px.png",
     fap_icon="vb_migrate_10px.png",
-    fap_category="Tools",
+    fap_category="NFC",
     fap_description="Makes transferring characters with VB Lab less cumbersome",
     fap_description="Makes transferring characters with VB Lab less cumbersome",
     fap_author="cyanic",
     fap_author="cyanic",
     fap_weburl="https://github.com/GMMan/flipperzero-vb-migrate",
     fap_weburl="https://github.com/GMMan/flipperzero-vb-migrate",

+ 2 - 2
non_catalog_apps/flipperzero_vb_migrate/scenes/vb_migrate_scene_to_app.c

@@ -194,8 +194,8 @@ static void vb_migrate_scene_to_app_load_capture(VbMigrate* inst, bool go_next)
     } else {
     } else {
         uint32_t state = scene_manager_get_scene_state(inst->scene_manager, VbMigrateSceneToApp);
         uint32_t state = scene_manager_get_scene_state(inst->scene_manager, VbMigrateSceneToApp);
         inst->next_id = vb_migrate_get_next_id(inst, inst->text_store, inst->next_id, true);
         inst->next_id = vb_migrate_get_next_id(inst, inst->text_store, inst->next_id, true);
-        FuriString* temp_str =
-            furi_string_alloc_printf(VB_MIGRATE_CAPTURE_FORMAT, inst->next_id, NFC_APP_FILENAME_EXTENSION);
+        FuriString* temp_str = furi_string_alloc_printf(
+            VB_MIGRATE_CAPTURE_FORMAT, inst->next_id, NFC_APP_FILENAME_EXTENSION);
 
 
         vb_migrate_show_loading_popup(inst, true);
         vb_migrate_show_loading_popup(inst, true);
         if(vb_migrate_load_nfc(inst, inst->text_store, furi_string_get_cstr(temp_str))) {
         if(vb_migrate_load_nfc(inst, inst->text_store, furi_string_get_cstr(temp_str))) {

+ 2 - 1
non_catalog_apps/flipperzero_vb_migrate/vb_migrate.c

@@ -102,7 +102,8 @@ bool vb_migrate_delete(VbMigrate* inst, const char* dev_name, bool whole_vb) {
             FuriString* file_path = furi_string_alloc();
             FuriString* file_path = furi_string_alloc();
             while(storage_dir_read(dir_handle, &file_info, name, sizeof(name))) {
             while(storage_dir_read(dir_handle, &file_info, name, sizeof(name))) {
                 // Files that is .nfc, but is not template
                 // Files that is .nfc, but is not template
-                if(!(file_info.flags & FSF_DIRECTORY) && strstr(name, NFC_APP_FILENAME_EXTENSION) &&
+                if(!(file_info.flags & FSF_DIRECTORY) &&
+                   strstr(name, NFC_APP_FILENAME_EXTENSION) &&
                    !strstr(name, VB_MIGRATE_TEMPLATE_NAME)) {
                    !strstr(name, VB_MIGRATE_TEMPLATE_NAME)) {
                     furi_string_printf(file_path, "%s/%s", furi_string_get_cstr(dir_path), name);
                     furi_string_printf(file_path, "%s/%s", furi_string_get_cstr(dir_path), name);
                     deleted =
                     deleted =

+ 1 - 1
non_catalog_apps/flipperzero_vb_migrate/vb_migrate.h

@@ -20,7 +20,7 @@
 
 
 #include <storage/storage.h>
 #include <storage/storage.h>
 
 
-#define VB_MIGRATE_VERSION "1.1"
+#define VB_MIGRATE_VERSION "1.2"
 
 
 #define VB_MIGRATE_FOLDER STORAGE_APP_DATA_PATH_PREFIX
 #define VB_MIGRATE_FOLDER STORAGE_APP_DATA_PATH_PREFIX