upd spi mem

RogueMaster · Nov 28, 2023 · c0bf8c3 · c0bf8c3
1 parent 36d2e9c
commit c0bf8c3
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/base_pack/spi_mem_manager/application.fam b/base_pack/spi_mem_manager/application.fam
@@ -6,7 +6,7 @@ App(
     requires=["gui"],
     stack_size=1 * 2048,
     fap_description="Application for reading and writing 25-series SPI memory chips",
-    fap_version="1.0",
+    fap_version="1.2",
     fap_icon="images/Dip8_10px.png",
     fap_category="GPIO",
     fap_icon_assets="images",

diff --git a/base_pack/spi_mem_manager/lib/spi/spi_mem_chip.c b/base_pack/spi_mem_manager/lib/spi/spi_mem_chip.c
@@ -38,6 +38,7 @@ const SPIMemChipVendorName spi_mem_chip_vendor_names[] = {
     {"Fudan", SPIMemChipVendorFudan},
     {"Genitop", SPIMemChipVendorGenitop},
     {"Paragon", SPIMemChipVendorParagon},
+    {"XTX", SPIMemChipVendorXTX},
     {"Unknown", SPIMemChipVendorUnknown}};
 
 static const char* spi_mem_chip_search_vendor_name(SPIMemChipVendor vendor_enum) {

diff --git a/base_pack/spi_mem_manager/lib/spi/spi_mem_chip_arr.c b/base_pack/spi_mem_manager/lib/spi/spi_mem_chip_arr.c
@@ -1396,4 +1396,5 @@ const SPIMemChip SPIMemChips[] = {
     {0xA1, 0x40, 0x13, "FM25Q04A", 524288, 256, SPIMemChipVendorFudan, SPIMemChipWriteModePage},
     {0xA1, 0x40, 0x16, "FM25Q32", 4194304, 256, SPIMemChipVendorFudan, SPIMemChipWriteModePage},
     {0xE0, 0x40, 0x14, "GT25Q80A", 1048576, 256, SPIMemChipVendorGenitop, SPIMemChipWriteModePage},
-    {0xE0, 0x40, 0x13, "PN25F04A", 524288, 256, SPIMemChipVendorParagon, SPIMemChipWriteModePage}};
+    {0xE0, 0x40, 0x13, "PN25F04A", 524288, 256, SPIMemChipVendorParagon, SPIMemChipWriteModePage},
+    {0x0B, 0x40, 0x18, "XT25F128B", 16777216, 256, SPIMemChipVendorXTX, SPIMemChipWriteModePage}};
diff --git a/base_pack/spi_mem_manager/lib/spi/spi_mem_chip_i.h b/base_pack/spi_mem_manager/lib/spi/spi_mem_chip_i.h
@@ -41,7 +41,8 @@ typedef enum {
     SPIMemChipVendorFremont,
     SPIMemChipVendorFudan,
     SPIMemChipVendorGenitop,
-    SPIMemChipVendorParagon
+    SPIMemChipVendorParagon,
+    SPIMemChipVendorXTX
 } SPIMemChipVendor;
 
 typedef enum {

diff --git a/base_pack/spi_mem_manager/scenes/spi_mem_scene_about.c b/base_pack/spi_mem_manager/scenes/spi_mem_scene_about.c
@@ -3,7 +3,7 @@
 
 #define SPI_MEM_VERSION_APP "0.1.0"
 #define SPI_MEM_DEVELOPER "DrunkBatya"
-#define SPI_MEM_GITHUB "https://github.com/flipperdevices/flipperzero-firmware"
+#define SPI_MEM_GITHUB "https://github.com/flipperdevices/flipperzero-good-faps"
 #define SPI_MEM_NAME "\e#\e!       SPI Mem Manager        \e!\n"
 #define SPI_MEM_BLANK_INV "\e#\e!                                                      \e!\n"
 

diff --git a/base_pack/spi_mem_manager/scenes/spi_mem_scene_read_filename.c b/base_pack/spi_mem_manager/scenes/spi_mem_scene_read_filename.c
@@ -11,7 +11,7 @@ void spi_mem_scene_read_set_random_filename(SPIMemApp* app) {
         size_t filename_start = furi_string_search_rchar(app->file_path, '/');
         furi_string_left(app->file_path, filename_start);
     }
-    name_generator_make_auto(app->text_buffer, SPI_MEM_TEXT_BUFFER_SIZE, TAG);
+    name_generator_make_auto(app->text_buffer, SPI_MEM_TEXT_BUFFER_SIZE, SPI_MEM_FILE_PREFIX);
 }
 
 void spi_mem_scene_read_filename_on_enter(void* context) {

diff --git a/base_pack/spi_mem_manager/spi_mem_app_i.h b/base_pack/spi_mem_manager/spi_mem_app_i.h
@@ -24,6 +24,7 @@
 
 #define TAG "SPIMem"
 #define SPI_MEM_FILE_EXTENSION ".bin"
+#define SPI_MEM_FILE_PREFIX "SPIMem"
 #define SPI_MEM_FILE_NAME_SIZE 100
 #define SPI_MEM_TEXT_BUFFER_SIZE 128