Merge branch 'dev' into specific_magic_cards

flipperdevices · Nov 25, 2023 · b73a559 · b73a559
2 parents a1a0396 + 5fcb995
commit b73a559
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/picopass/scenes/picopass_scene_elite_dict_attack.c b/picopass/scenes/picopass_scene_elite_dict_attack.c
@@ -6,13 +6,13 @@
 
 enum {
     PicopassSceneEliteDictAttackDictEliteUser,
-    PicopassSceneEliteDictAttackDictStandart,
+    PicopassSceneEliteDictAttackDictStandard,
     PicopassSceneEliteDictAttackDictElite,
 };
 
 const char* picopass_dict_name[] = {
     [PicopassSceneEliteDictAttackDictEliteUser] = "Elite User Dictionary",
-    [PicopassSceneEliteDictAttackDictStandart] = "Standard System Dictionary",
+    [PicopassSceneEliteDictAttackDictStandard] = "Standard System Dictionary",
     [PicopassSceneEliteDictAttackDictElite] = "Elite System Dictionary",
 };
 
@@ -31,8 +31,8 @@ static bool picopass_elite_dict_attack_change_dict(Picopass* picopass) {
                 PICOPASS_ICLASS_STANDARD_DICT_FLIPPER_NAME,
                 NfcDictModeOpenExisting,
                 PICOPASS_KEY_LEN);
-            scene_state = PicopassSceneEliteDictAttackDictStandart;
-        } else if(scene_state == PicopassSceneEliteDictAttackDictStandart) {
+            scene_state = PicopassSceneEliteDictAttackDictStandard;
+        } else if(scene_state == PicopassSceneEliteDictAttackDictStandard) {
             if(!nfc_dict_check_presence(PICOPASS_ICLASS_ELITE_DICT_FLIPPER_NAME)) break;
             picopass->dict = nfc_dict_alloc(
                 PICOPASS_ICLASS_ELITE_DICT_FLIPPER_NAME,
@@ -76,7 +76,7 @@ NfcCommand picopass_elite_dict_attack_worker_callback(PicopassPollerEvent event,
             scene_manager_get_scene_state(picopass->scene_manager, PicopassSceneEliteDictAttack);
         memcpy(event.data->req_key.key, key, PICOPASS_KEY_LEN);
         event.data->req_key.is_elite_key =
-            (scene_state != PicopassSceneEliteDictAttackDictStandart);
+            (scene_state != PicopassSceneEliteDictAttackDictStandard);
         event.data->req_key.is_key_provided = is_key_provided;
         if(is_key_provided) {
             picopass->dict_attack_ctx.current_key++;
@@ -151,7 +151,7 @@ void picopass_scene_elite_dict_attack_on_enter(void* context) {
     } else {
         picopass->dict = nfc_dict_alloc(
             PICOPASS_ICLASS_STANDARD_DICT_FLIPPER_NAME, NfcDictModeOpenExisting, PICOPASS_KEY_LEN);
-        state = PicopassSceneEliteDictAttackDictStandart;
+        state = PicopassSceneEliteDictAttackDictStandard;
     }
     picopass->dict_attack_ctx.card_detected = true;
     picopass->dict_attack_ctx.total_keys = nfc_dict_get_total_keys(picopass->dict);

diff --git a/picopass/scenes/picopass_scene_read_card.c b/picopass/scenes/picopass_scene_read_card.c
@@ -3,7 +3,7 @@
 #include "../picopass_keys.h"
 
 enum {
-    PicopassSceneReadCardDictStandart,
+    PicopassSceneReadCardDictStandard,
     PicopassSceneReadCardDictElite,
 };
 
@@ -78,7 +78,7 @@ void picopass_scene_read_card_on_enter(void* context) {
     picopass->dict = nfc_dict_alloc(
         PICOPASS_ICLASS_STANDARD_DICT_FLIPPER_NAME, NfcDictModeOpenExisting, PICOPASS_KEY_LEN);
     scene_manager_set_scene_state(
-        picopass->scene_manager, PicopassSceneReadCard, PicopassSceneReadCardDictStandart);
+        picopass->scene_manager, PicopassSceneReadCard, PicopassSceneReadCardDictStandard);
     // Start worker
     picopass->poller = picopass_poller_alloc(picopass->nfc);
     picopass_poller_start(picopass->poller, picopass_read_card_worker_callback, picopass);
@@ -120,7 +120,7 @@ void picopass_scene_read_card_on_exit(void* context) {
     // Clear view
     popup_reset(picopass->popup);
     scene_manager_set_scene_state(
-        picopass->scene_manager, PicopassSceneReadCard, PicopassSceneReadCardDictStandart);
+        picopass->scene_manager, PicopassSceneReadCard, PicopassSceneReadCardDictStandard);
 
     picopass_blink_stop(picopass);
 }
diff --git a/spi_mem_manager/.catalog/changelog.md b/spi_mem_manager/.catalog/changelog.md
@@ -1,3 +1,5 @@
+## 1.2
+   Added support for the XT25F128B flash chip
 ## 1.1
  - New random filename API
 ## 1.0

diff --git a/spi_mem_manager/application.fam b/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.1",
+    fap_version="1.2",
     fap_icon="images/Dip8_10px.png",
     fap_category="GPIO",
     fap_icon_assets="images",

diff --git a/spi_mem_manager/lib/spi/spi_mem_chip.c b/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/spi_mem_manager/lib/spi/spi_mem_chip_arr.c b/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/spi_mem_manager/lib/spi/spi_mem_chip_i.h b/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 {