MX 1 год назад
Родитель
Сommit
256b734797

+ 4 - 4
non_catalog_apps/video_game_module_tool/application.fam

@@ -1,6 +1,6 @@
 App(
     appid="video_game_module_tool",
-    name="Video Game Module Tool",
+    name="[VGM] Video Game Module Tool",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="vgm_tool_app",
     requires=[
@@ -8,10 +8,10 @@ App(
         "dialogs",
     ],
     stack_size=2048,
-    fap_description="Update Video Game Module's firmware directly from Flipper",
-    fap_version="1.0",
+    fap_description="This app is a standalone firmware updater/installer for the Video Game Module",
+    fap_version="1.1",
     fap_icon="vgm_tool.png",
-    fap_category="Tools",
+    fap_category="GPIO",
     fap_icon_assets="icons",
     fap_file_assets="files",
 )

+ 3 - 3
non_catalog_apps/video_game_module_tool/flasher/rp2040.c

@@ -64,9 +64,9 @@
 #define RP_SSI_XIP_SPI_CTRL0_FORMAT_STD_SPI (0U << 0U)
 #define RP_SSI_XIP_SPI_CTRL0_FORMAT_SPLIT (1U << 0U)
 #define RP_SSI_XIP_SPI_CTRL0_FORMAT_FRF (2U << 0U)
-#define RP_SSI_XIP_SPI_CTRL0_ADDRESS_LENGTH(x) (((x)*2U) << 2U)
+#define RP_SSI_XIP_SPI_CTRL0_ADDRESS_LENGTH(x) (((x) * 2U) << 2U)
 #define RP_SSI_XIP_SPI_CTRL0_INSTR_LENGTH_8b (2U << 8U)
-#define RP_SSI_XIP_SPI_CTRL0_WAIT_CYCLES(x) (((x)*8U) << 11U)
+#define RP_SSI_XIP_SPI_CTRL0_WAIT_CYCLES(x) (((x) * 8U) << 11U)
 #define RP_SSI_XIP_SPI_CTRL0_XIP_CMD_SHIFT 24U
 #define RP_SSI_XIP_SPI_CTRL0_XIP_CMD(x) ((x) << RP_SSI_XIP_SPI_CTRL0_XIP_CMD_SHIFT)
 #define RP_SSI_XIP_SPI_CTRL0_TRANS_1C1A (0U << 0U)
@@ -94,7 +94,7 @@
 
 // SPI Flash defines
 #define SPI_FLASH_OPCODE_MASK 0x00ffU
-#define SPI_FLASH_OPCODE(x) ((x)&SPI_FLASH_OPCODE_MASK)
+#define SPI_FLASH_OPCODE(x) ((x) & SPI_FLASH_OPCODE_MASK)
 #define SPI_FLASH_DUMMY_MASK 0x0700U
 #define SPI_FLASH_DUMMY_SHIFT 8U
 #define SPI_FLASH_DUMMY_LEN(x) (((x) << SPI_FLASH_DUMMY_SHIFT) & SPI_FLASH_DUMMY_MASK)