Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-07 19:01:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix asset packs folder change stuff

Browse Source
This commit is contained in:
Willy-JL
2023-07-26 15:03:56 +02:00
parent c6564deef9
commit aaafdc1a82
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/desktop/animations/animation_storage.c
+1 -1
View File
@@ -14,7 +14,7 @@
#include <xtreme.h>
#define ANIMATION_META_FILE "meta.txt"
#define TAG "AnimationStorage"
char ANIMATION_DIR[26 /*"/ext/asset_packs//Anims"*/ + XTREME_ASSETS_PACK_NAME_LEN + 1];
char ANIMATION_DIR[23 /*"/ext/asset_packs//Anims"*/ + XTREME_ASSETS_PACK_NAME_LEN + 1];
char ANIMATION_MANIFEST_FILE[sizeof(ANIMATION_DIR) + 13 /*"/manifest.txt"*/];
static void animation_storage_free_bubbles(BubbleAnimation* animation);
assets/.gitignore
+1 -2
View File
@@ -1,7 +1,6 @@
/core2_firmware
/resources/Manifest
/resources/apps/*
/resources/dolphin/*
/resources/dolphin_custom/*
/resources/asset_packs/*
/resources/dolphin/*
/resources/apps_data/**/*.fal
assets/ReadMe.md
+1 -1
View File
@@ -34,7 +34,7 @@ Don't include assets that you are not using, compiler is not going to strip unus
# Structure
- `compiled` - Output folder made for compiled assets, after building project, in `build` directory.
- `dolphin` - Dolphin game assets sources. Goes to `compiled` and `resources` folders in `build` directory.
- `packs` - User-made Asset packs used for basically all scenes. Compiled to `.bmx` and found at `SD/asset_packs`
- `packs` - Hot-swappable asset packs used system wide, both animations and icons. Compiled to `.bm` and `.bmx`, then put at `SD/asset_packs`
- `icons` - Icons sources. Goes to `compiled` folder in `build` directory.
- `protobuf` - Protobuf sources. Goes to `compiled` folder in `build` directory.
- `resources` - Assets that is going to be provisioned to SD card.
furi/flipper.c
+1 -1
View File
@@ -74,7 +74,7 @@ void flipper_migrate_files() {
}
storage_common_copy(storage, U2F_KEY_OLD_FILE, U2F_KEY_FILE); // Ext -> Int
storage_common_migrate(storage, EXT_PATH("dolphin_custom"), EXT_PATH("asset_packs"));
storage_common_migrate(storage, XTREME_ASSETS_OLD_PATH, XTREME_ASSETS_PATH);
furi_record_close(RECORD_STORAGE);
}
lib/xtreme/xtreme.h
+1
View File
@@ -8,6 +8,7 @@ extern "C" {
#endif
#define XTREME_SETTINGS_PATH CFG_PATH("xtreme_settings.txt")
#define XTREME_ASSETS_OLD_PATH EXT_PATH("dolphin_custom")
#define XTREME_ASSETS_PATH EXT_PATH("asset_packs")
#define XTREME_MENU_OLD_PATH CFG_PATH("xtreme_apps.txt")
#define XTREME_MENU_PATH CFG_PATH("xtreme_menu.txt")