Tamagotchi: Saving, bus and manifest changes

tama_p1/application.fam

@@ -1,12 +1,12 @@
 App(
-    appid="TAMA_P1",
-    name="TAMA P1",
+    appid="tama_p1",
+    name="Tamagotchi",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="tama_p1_app",
     cdefines=["APP_TAMA_P1"],
     requires=["gui", "storage"],
     stack_size= 2 * 1024,
     order = 215,
-    fap_icon="tamaIcon2.png",
+    fap_icon="tamaIcon4.png",
     fap_category="Games",
 )

tama_p1/tama.h

@@ -4,14 +4,14 @@
 #include "tamalib/tamalib.h"
 
 #define TAG "TamaP1"
-#define TAMA_ROM_PATH EXT_PATH("tama_p1/rom.bin")
+#define TAMA_ROM_PATH APP_DATA_PATH("rom.bin")
 #define TAMA_SCREEN_SCALE_FACTOR 2
 #define TAMA_LCD_ICON_SIZE 14
 #define TAMA_LCD_ICON_MARGIN 1
 
 #define STATE_FILE_MAGIC "TLST"
 #define STATE_FILE_VERSION 2
-#define TAMA_SAVE_PATH EXT_PATH("tama_p1/save.bin")
+#define TAMA_SAVE_PATH APP_DATA_PATH("save.bin")
 
 
 typedef struct {

tama_p1/tama_p1.c

@@ -1,4 +1,5 @@
 #include <furi.h>
+#include <furi_hal_bus.h>
 #include <gui/gui.h>
 #include <input/input.h>
 #include <storage/storage.h>
@@ -719,6 +720,7 @@ static void tama_p1_init(TamaApp* const ctx) {
 
     // Load ROM
     Storage* storage = furi_record_open(RECORD_STORAGE);
+    storage_common_migrate(storage, EXT_PATH("tama_p1"), STORAGE_APP_DATA_PATH_PREFIX);
     FileInfo fi;
     if(storage_common_stat(storage, TAMA_ROM_PATH, &fi) == FSE_OK) {
         File* rom_file = storage_file_alloc(storage);
@@ -750,6 +752,9 @@ static void tama_p1_init(TamaApp* const ctx) {
     if(ctx->rom != NULL) {
         // Init TIM2
         // 64KHz
+
+        furi_hal_bus_enable(FuriHalBusTIM2);
+
         LL_TIM_InitTypeDef tim_init = {
             .Prescaler = 999,
             .CounterMode = LL_TIM_COUNTERMODE_UP,
@@ -782,6 +787,7 @@ static void tama_p1_deinit(TamaApp* const ctx) {
     if(ctx->rom != NULL) {
         tamalib_release();
         furi_thread_free(ctx->thread);
+        furi_hal_bus_disable(FuriHalBusTIM2);
         free(ctx->rom);
     }
 }