From 0ef9f7d308e093f3dc45df79202c73c150756957 Mon Sep 17 00:00:00 2001
From: Ruslan Nadyrshin <110516632+rnadyrshin@users.noreply.github.com>
Date: Mon, 2 Dec 2024 10:58:13 +0400
Subject: [PATCH 01/14] JS packages folder included to the doxygen's exclude
 list (#4021)

---
 documentation/doxygen/Doxyfile.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/doxygen/Doxyfile.cfg b/documentation/doxygen/Doxyfile.cfg
index e01631749..3df12f08f 100644
--- a/documentation/doxygen/Doxyfile.cfg
+++ b/documentation/doxygen/Doxyfile.cfg
@@ -1042,6 +1042,7 @@ EXCLUDE                = $(DOXY_SRC_ROOT)/lib/mlib \
                          $(DOXY_SRC_ROOT)/applications/plugins/dap_link/lib/free-dap \
                          $(DOXY_SRC_ROOT)/applications/debug \
                          $(DOXY_SRC_ROOT)/applications/main \
+                         $(DOXY_SRC_ROOT)/applications/system/js_app/packages \
                          $(DOXY_SRC_ROOT)/applications/settings \
                          $(DOXY_SRC_ROOT)/lib/micro-ecc \
                          $(DOXY_SRC_ROOT)/lib/ReadMe.md \

From 399bcdcc13765cff4701eb8ddb2dbeddcb5ba59f Mon Sep 17 00:00:00 2001
From: Nicolas Marie-Magdelaine PhD <nikos.mm.e@gmail.com>
Date: Mon, 2 Dec 2024 08:15:29 +0100
Subject: [PATCH 02/14] Add IR command for NAD DR2 D7050 D3020 (#4020)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: あく <alleteam@gmail.com>
---
 .../resources/infrared/assets/audio.ir        | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/applications/main/infrared/resources/infrared/assets/audio.ir b/applications/main/infrared/resources/infrared/assets/audio.ir
index 20070bbe0..efd0382e3 100644
--- a/applications/main/infrared/resources/infrared/assets/audio.ir
+++ b/applications/main/infrared/resources/infrared/assets/audio.ir
@@ -4650,3 +4650,42 @@ type: parsed
 protocol: NECext
 address: 7F 01 00 00
 command: 69 96 00 00
+#
+# Model : NAD DR2 remote for NAD D7050 and D3020
+#
+name: Power
+type: parsed
+protocol: NECext
+address: 87 7C 00 00
+command: 25 DA 00 00
+#
+name: Vol_up
+type: parsed
+protocol: NECext
+address: 87 7C 00 00
+command: 88 77 00 00
+#
+name: Vol_dn
+type: parsed
+protocol: NECext
+address: 87 7C 00 00
+command: 8C 73 00 00
+#
+name: Mute
+type: parsed
+protocol: NECext
+address: 87 7C 00 00
+command: 94 6B 00 00
+#
+name: Next
+type: parsed
+protocol: NECext
+address: 87 7C 00 00
+command: 1A E5 00 00
+#
+name: Prev
+type: parsed
+protocol: NECext
+address: 87 7C 00 00
+command: 1D E2 00 00
+#

From c3dc9e1ec2aa785f346d979e906ecef82dc2ab74 Mon Sep 17 00:00:00 2001
From: Luu <112649910+luu176@users.noreply.github.com>
Date: Mon, 2 Dec 2024 08:27:16 +0100
Subject: [PATCH 03/14] Fix typo for mf_classic_key_cahce_get_next_key()
 function (#4015)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update mf_classic_key_cache.c
* Update mf_classic_key_cache.h
* Update mf_classic.c
* Update nfc_scene_mf_classic_update_initial.c

Co-authored-by: あく <alleteam@gmail.com>
---
 applications/main/nfc/helpers/mf_classic_key_cache.c            | 2 +-
 applications/main/nfc/helpers/mf_classic_key_cache.h            | 2 +-
 .../main/nfc/helpers/protocol_support/mf_classic/mf_classic.c   | 2 +-
 .../main/nfc/scenes/nfc_scene_mf_classic_update_initial.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/main/nfc/helpers/mf_classic_key_cache.c b/applications/main/nfc/helpers/mf_classic_key_cache.c
index 1b945660c..763c4dea7 100644
--- a/applications/main/nfc/helpers/mf_classic_key_cache.c
+++ b/applications/main/nfc/helpers/mf_classic_key_cache.c
@@ -166,7 +166,7 @@ void mf_classic_key_cache_load_from_data(MfClassicKeyCache* instance, const MfCl
     }
 }
 
-bool mf_classic_key_cahce_get_next_key(
+bool mf_classic_key_cache_get_next_key(
     MfClassicKeyCache* instance,
     uint8_t* sector_num,
     MfClassicKey* key,
diff --git a/applications/main/nfc/helpers/mf_classic_key_cache.h b/applications/main/nfc/helpers/mf_classic_key_cache.h
index b09f4526b..50a1f5c30 100644
--- a/applications/main/nfc/helpers/mf_classic_key_cache.h
+++ b/applications/main/nfc/helpers/mf_classic_key_cache.h
@@ -16,7 +16,7 @@ bool mf_classic_key_cache_load(MfClassicKeyCache* instance, const uint8_t* uid,
 
 void mf_classic_key_cache_load_from_data(MfClassicKeyCache* instance, const MfClassicData* data);
 
-bool mf_classic_key_cahce_get_next_key(
+bool mf_classic_key_cache_get_next_key(
     MfClassicKeyCache* instance,
     uint8_t* sector_num,
     MfClassicKey* key,
diff --git a/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c b/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
index 4fece16be..6f7be7f4c 100644
--- a/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
+++ b/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
@@ -72,7 +72,7 @@ static NfcCommand nfc_scene_read_poller_callback_mf_classic(NfcGenericEvent even
         uint8_t sector_num = 0;
         MfClassicKey key = {};
         MfClassicKeyType key_type = MfClassicKeyTypeA;
-        if(mf_classic_key_cahce_get_next_key(
+        if(mf_classic_key_cache_get_next_key(
                instance->mfc_key_cache, &sector_num, &key, &key_type)) {
             mfc_event->data->read_sector_request_data.sector_num = sector_num;
             mfc_event->data->read_sector_request_data.key = key;
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c
index 7c76260b4..a477a08b9 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c
@@ -34,7 +34,7 @@ NfcCommand nfc_mf_classic_update_initial_worker_callback(NfcGenericEvent event,
         uint8_t sector_num = 0;
         MfClassicKey key = {};
         MfClassicKeyType key_type = MfClassicKeyTypeA;
-        if(mf_classic_key_cahce_get_next_key(
+        if(mf_classic_key_cache_get_next_key(
                instance->mfc_key_cache, &sector_num, &key, &key_type)) {
             mfc_event->data->read_sector_request_data.sector_num = sector_num;
             mfc_event->data->read_sector_request_data.key = key;

From 2f30817dc9a052a9d033b53c6f32de6b67d74b0c Mon Sep 17 00:00:00 2001
From: WillyJL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 2 Dec 2024 07:54:50 +0000
Subject: [PATCH 04/14] Settings: More granularity for LCD and Notification
 (#4010)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: あく <alleteam@gmail.com>
---
 .../notification_settings_app.c               | 54 +++++++++++--------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/applications/settings/notification_settings/notification_settings_app.c b/applications/settings/notification_settings/notification_settings_app.c
index ada2bfdd4..2462b32bd 100644
--- a/applications/settings/notification_settings/notification_settings_app.c
+++ b/applications/settings/notification_settings/notification_settings_app.c
@@ -20,8 +20,11 @@ static const NotificationSequence sequence_note_c = {
     NULL,
 };
 
-#define CONTRAST_COUNT 11
+#define CONTRAST_COUNT 17
 const char* const contrast_text[CONTRAST_COUNT] = {
+    "-8",
+    "-7",
+    "-6",
     "-5",
     "-4",
     "-3",
@@ -33,8 +36,14 @@ const char* const contrast_text[CONTRAST_COUNT] = {
     "+3",
     "+4",
     "+5",
+    "+6",
+    "+7",
+    "+8",
 };
 const int32_t contrast_value[CONTRAST_COUNT] = {
+    -8,
+    -7,
+    -6,
     -5,
     -4,
     -3,
@@ -46,44 +55,47 @@ const int32_t contrast_value[CONTRAST_COUNT] = {
     3,
     4,
     5,
+    6,
+    7,
+    8,
 };
 
-#define BACKLIGHT_COUNT 5
+#define BACKLIGHT_COUNT 21
 const char* const backlight_text[BACKLIGHT_COUNT] = {
-    "0%",
-    "25%",
-    "50%",
-    "75%",
-    "100%",
+    "0%",  "5%",  "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%",  "50%",
+    "55%", "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%",
 };
 const float backlight_value[BACKLIGHT_COUNT] = {
-    0.0f,
-    0.25f,
-    0.5f,
-    0.75f,
-    1.0f,
+    0.00f, 0.05f, 0.10f, 0.15f, 0.20f, 0.25f, 0.30f, 0.35f, 0.40f, 0.45f, 0.50f,
+    0.55f, 0.60f, 0.65f, 0.70f, 0.75f, 0.80f, 0.85f, 0.90f, 0.95f, 1.00f,
 };
 
-#define VOLUME_COUNT 5
+#define VOLUME_COUNT 21
 const char* const volume_text[VOLUME_COUNT] = {
-    "0%",
-    "25%",
-    "50%",
-    "75%",
-    "100%",
+    "0%",  "5%",  "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%",  "50%",
+    "55%", "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%",
+};
+const float volume_value[VOLUME_COUNT] = {
+    0.00f, 0.05f, 0.10f, 0.15f, 0.20f, 0.25f, 0.30f, 0.35f, 0.40f, 0.45f, 0.50f,
+    0.55f, 0.60f, 0.65f, 0.70f, 0.75f, 0.80f, 0.85f, 0.90f, 0.95f, 1.00f,
 };
-const float volume_value[VOLUME_COUNT] = {0.0f, 0.25f, 0.5f, 0.75f, 1.0f};
 
-#define DELAY_COUNT 6
+#define DELAY_COUNT 11
 const char* const delay_text[DELAY_COUNT] = {
     "1s",
     "5s",
+    "10s",
     "15s",
     "30s",
     "60s",
+    "90s",
     "120s",
+    "5min",
+    "10min",
+    "30min",
 };
-const uint32_t delay_value[DELAY_COUNT] = {1000, 5000, 15000, 30000, 60000, 120000};
+const uint32_t delay_value[DELAY_COUNT] =
+    {1000, 5000, 10000, 15000, 30000, 60000, 90000, 120000, 300000, 600000, 1800000};
 
 #define VIBRO_COUNT 2
 const char* const vibro_text[VIBRO_COUNT] = {

From 8629c61dc91f843577d9214b4a60b9b607fe1914 Mon Sep 17 00:00:00 2001
From: mxcdoam <72457810+mxcdoam@users.noreply.github.com>
Date: Mon, 2 Dec 2024 11:08:17 +0300
Subject: [PATCH 05/14] NFC: Plantain parser Last payment amount fix (#3998)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: あく <alleteam@gmail.com>
---
 .../main/nfc/plugins/supported_cards/plantain.c  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/applications/main/nfc/plugins/supported_cards/plantain.c b/applications/main/nfc/plugins/supported_cards/plantain.c
index 9f2491691..49bbaebe8 100644
--- a/applications/main/nfc/plugins/supported_cards/plantain.c
+++ b/applications/main/nfc/plugins/supported_cards/plantain.c
@@ -310,9 +310,11 @@ static bool plantain_parse(const NfcDevice* device, FuriString* parsed_data) {
                 last_payment_date.year,
                 last_payment_date.hour,
                 last_payment_date.minute);
-            //payment amount. This needs to be investigated more, currently it shows incorrect amount on some cards.
-            uint16_t last_payment = (data->block[18].data[9] << 8) | data->block[18].data[8];
-            furi_string_cat_printf(parsed_data, "Amount: %d rub", last_payment / 100);
+            //Last payment amount.
+            uint16_t last_payment = ((data->block[18].data[10] << 16) |
+                                     (data->block[18].data[9] << 8) | (data->block[18].data[8])) /
+                                    100;
+            furi_string_cat_printf(parsed_data, "Amount: %d rub", last_payment);
             furi_string_free(card_number_s);
             furi_string_free(tmp_s);
             //This is for 4K Plantains.
@@ -369,9 +371,11 @@ static bool plantain_parse(const NfcDevice* device, FuriString* parsed_data) {
                 last_payment_date.year,
                 last_payment_date.hour,
                 last_payment_date.minute);
-            //payment amount
-            uint16_t last_payment = (data->block[18].data[9] << 8) | data->block[18].data[8];
-            furi_string_cat_printf(parsed_data, "Amount: %d rub", last_payment / 100);
+            //Last payment amount
+            uint16_t last_payment = ((data->block[18].data[10] << 16) |
+                                     (data->block[18].data[9] << 8) | (data->block[18].data[8])) /
+                                    100;
+            furi_string_cat_printf(parsed_data, "Amount: %d rub", last_payment);
             furi_string_free(card_number_s);
             furi_string_free(tmp_s);
         }

From 3d6fd9b00d216f744a69472341e1bca89fa7a83c Mon Sep 17 00:00:00 2001
From: ted-logan <ted.logan@gmail.com>
Date: Mon, 2 Dec 2024 01:51:57 -0800
Subject: [PATCH 06/14] nfc/clipper:  (#3991)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* nfs/clipper: BART station ids for San Lorenzo, Bay Fair

Update the BART station ids for the San Lorenzo and Bay Fair stations in
the East Bay of the San Francisco Bay Area.

* nfc/clipper: Update MUNI station ids

Add MUNI station ids for the T line "Central Subway" project, which
opened three new underground stations in 2022.

---------

Co-authored-by: あく <alleteam@gmail.com>
---
 applications/main/nfc/plugins/supported_cards/clipper.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/applications/main/nfc/plugins/supported_cards/clipper.c b/applications/main/nfc/plugins/supported_cards/clipper.c
index 3eba82425..eb459d419 100644
--- a/applications/main/nfc/plugins/supported_cards/clipper.c
+++ b/applications/main/nfc/plugins/supported_cards/clipper.c
@@ -101,7 +101,8 @@ static const IdMapping bart_zones[] = {
     {.id = 0x001d, .name = "Lake Merrit"},
     {.id = 0x001e, .name = "Fruitvale"},
     {.id = 0x001f, .name = "Coliseum"},
-    {.id = 0x0021, .name = "San Leandro"},
+    {.id = 0x0020, .name = "San Leandro"},
+    {.id = 0x0021, .name = "Bay Fair"},
     {.id = 0x0022, .name = "Hayward"},
     {.id = 0x0023, .name = "South Hayward"},
     {.id = 0x0024, .name = "Union City"},
@@ -131,6 +132,9 @@ static const IdMapping muni_zones[] = {
     {.id = 0x000b, .name = "Castro"},
     {.id = 0x000c, .name = "Forest Hill"}, // Guessed
     {.id = 0x000d, .name = "West Portal"},
+    {.id = 0x0019, .name = "Union Square/Market Street"},
+    {.id = 0x001a, .name = "Chinatown - Rose Pak"},
+    {.id = 0x001b, .name = "Yerba Buena/Moscone"},
 };
 static const size_t kNumMUNIZones = COUNT(muni_zones);
 

From 0fd26ee14826247ea77c1ee8ee121952ae6924c7 Mon Sep 17 00:00:00 2001
From: Astra <me@astrra.space>
Date: Mon, 2 Dec 2024 19:24:20 +0900
Subject: [PATCH 07/14] Increase system stack's reserved memory size

---
 targets/f7/stm32wb55xx_flash.ld  | 2 +-
 targets/f7/stm32wb55xx_ram_fw.ld | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/f7/stm32wb55xx_flash.ld b/targets/f7/stm32wb55xx_flash.ld
index 524da6fc3..ef61bb238 100644
--- a/targets/f7/stm32wb55xx_flash.ld
+++ b/targets/f7/stm32wb55xx_flash.ld
@@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _stack_end = 0x20030000;    /* end of RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
-_stack_size = 0x200; /* required amount of stack */
+_stack_size = 0x400; /* required amount of stack */
 
 MEMORY {
     FLASH (rx)  : ORIGIN = 0x08000000, LENGTH = 1024K
diff --git a/targets/f7/stm32wb55xx_ram_fw.ld b/targets/f7/stm32wb55xx_ram_fw.ld
index f0e8ad678..93579788d 100644
--- a/targets/f7/stm32wb55xx_ram_fw.ld
+++ b/targets/f7/stm32wb55xx_ram_fw.ld
@@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _stack_end = 0x20030000;    /* end of RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
-_stack_size = 0x200; /* required amount of stack */
+_stack_size = 0x400; /* required amount of stack */
 
 MEMORY {
     FLASH (rx)  : ORIGIN = 0x08000000, LENGTH = 1024K

From 7d5358b9d3b0d6493a8be3d0e76dfd58de913493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <github@ondrej.org>
Date: Tue, 3 Dec 2024 07:30:25 +0100
Subject: [PATCH 08/14] Replace mf_classic_dict.nfc with Proxmark3 version
 (#4013)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: あく <alleteam@gmail.com>
---
 .../resources/nfc/assets/mf_classic_dict.nfc  | 3712 ++++++++++++-----
 1 file changed, 2556 insertions(+), 1156 deletions(-)

diff --git a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
index e2b74f847..0a3de18af 100644
--- a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
+++ b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
@@ -1,126 +1,82 @@
-# Key dictionary from https://github.com/ikarus23/MifareClassicTool.git
-
-# More well known keys!
-# Standard keys
+# Key dictionary from https://github.com/RfidResearchGroup/proxmark3/
+#
+# Mifare Default Keys
+#   -- iceman fork version --
+#   -- contribute to this list, sharing is caring --
+#
+# Default key
 FFFFFFFFFFFF
-A0A1A2A3A4A5
-D3F7D3F7D3F7
+#
+# Blank key
 000000000000
-
-# Keys from mfoc
+#
+# NFC Forum MADkey
+A0A1A2A3A4A5
+#
+# MAD access key A (reversed)
+A5A4A3A2A1A0
+#
+# MAD access key B
+89ECA97F8C2A
+#
+# Mifare 1k EV1 (S50) hidden blocks, Signature data
+# 16 A
+5C8FF9990DA2
+#
+# 17 A
+75CCB59C9BED
+#
+# 16 B
+D01AFEEB890A
+#
+# 17 B
+4B791BEA7BCC
+#
+# QL88 keys
+# 17 A/B
+2612C6DE84CA
+707B11FC1481
+#
+# QL88 diversifed
+03F9067646AE
+2352C5B56D85
+#
 B0B1B2B3B4B5
+C0C1C2C3C4C5
+D0D1D2D3D4D5
+AABBCCDDEEFF
 4D3A99C351DD
 1A982C7E459A
-AABBCCDDEEFF
+#
+# key A Wien
+D3F7D3F7D3F7
+#
+# key B Wien
+5A1B85FCE20A
+#
+#
 714C5C886E97
 587EE5F9350F
 A0478CC39091
 533CB6C723F6
 8FD0A4F256E9
-
-# Keys from:
-# http://pastebin.com/wcTHXLZZ
-A64598A77478
-26940B21FF5D
-FC00018778F7
-00000FFE2488
-5C598C9C58B5
-E4D2770A89BE
-
-# Keys from:
-# http://pastebin.com/svGjN30Q
-434F4D4D4F41
-434F4D4D4F42
-47524F555041
-47524F555042
-505249564141
-505249564142
-
-# Keys from:
-# http://pastebin.com/d7sSetef
-0297927C0F77
-EE0042F88840
-722BFCC5375F
-F1D83F964314
-
-# Keys from:
-# http://pastebin.com/pvJX0xVS
-54726176656C
-776974687573
-4AF9D7ADEBE4
-2BA9621E0A36
-
-# Keys from:
-# http://pastebin.com/y3PDBWR1
-000000000001
-123456789ABC
-B127C6F41436
-12F2EE3478C1
-34D1DF9934C5
-55F5A5DD38C9
-F1A97341A9FC
-33F974B42769
-14D446E33363
-C934FE34D934
-1999A3554A55
-27DD91F1FCF1
-A94133013401
-99C636334433
-43AB19EF5C31
-A053A292A4AF
-505249565441
-505249565442
-
-# Keys from:
-# http://pastebin.com/TUXj17K3
-FC0001877BF7
-
-# Keys from:
-# http://0x9000.blogspot.com/2010/12/mifare-classic-default-keys.html
-A0B0C0D0E0F0
-A1B1C1D1E1F1
-
-# Keys from:
-# https://code.google.com/p/mifare-key-cracker/downloads/list
-BD493A3962B6
-010203040506
-111111111111
-222222222222
-333333333333
-444444444444
-555555555555
-666666666666
-777777777777
-888888888888
-999999999999
-AAAAAAAAAAAA
-BBBBBBBBBBBB
-CCCCCCCCCCCC
-DDDDDDDDDDDD
-EEEEEEEEEEEE
-0123456789AB
-
-# Keys from:
-# https://github.com/4ZM/mfterm/blob/master/dictionary.txt
-000000000002
-00000000000A
-00000000000B
-100000000000
-200000000000
-A00000000000
-B00000000000
-
-# Key from:
-# ladyada.net
-ABCDEF123456
-
-# Key from:
-# http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
-F4A9EF2AFC6D
-
-# Keys from:
-# https://github.com/iceman1001/proxmark
-4B0B20107CCB
+#
+# iCopy-X
+E00000000000
+#
+#
+E7D6064C5860
+B27CCAB30DBD
+#
+# lib / Nat Bieb
+D2ECE8B9395E
+# NSCP default key
+1494E81663D7
+#
+# NFC tools
+7c9fb8474242
+#
+# Kiev keys
 569369C5A0E5
 632193BE1C3C
 644672BD4AFE
@@ -129,410 +85,926 @@ F4A9EF2AFC6D
 B5FF67CBA951
 EFF603E1EFE9
 F14EE7CAE863
+#
+# ICT S14 A/B
+9C28A60F7249
+C9826AF02794
+#
+# RKF
+# Västtrafiken KeyA, RKF ÖstgötaTrafiken KeyA
+FC00018778F7
+#
+# Västtrafiken KeyA
+0297927C0F77
+54726176656C
+#
+# Västtrafiken KeyB
+00000FFE2488
+776974687573
+EE0042F88840
+#
+# RKF SLKeyA
+26940B21FF5D
+A64598A77478
+#
+# RKF SLKeyB
+5C598C9C58B5
+E4D2770A89BE
+#
+# RKF Rejskort Danmark KeyA
+722BFCC5375F
+#
+# RKF Rejskort Danmark KeyB
+F1D83F964314
+#
+# RKF JOJOPRIVA KeyA
+505249564141
+#
+# RKF JOJOPRIVA KeyB
+505249564142
+#
+# RKF JOJOGROUP KeyA
+47524F555041
+434F4D4D4F41
+#
+# RKF JOJOGROUP KeyB
+47524F555042
+434F4D4D4F42
+#
+# TNP3xxx
+4B0B20107CCB
+#
+# Access control system
+605F5E5D5C5B
+#
+# NSP Global keys A and B (uk housing access control)
+199404281970
+199404281998
+#
+# Data from http://www.proxmark.org/forum/viewtopic.php?pid=25925#p25925
+# Tengo Cards Key A
+FFF011223358
+FF9F11223358
+#
+# Elevator system Kherson, Ukraine
+AC37E76385F5
+576DCFFF2F25
+#
+# Car wash system
+1EE38419EF39
+26578719DCD9
+#
+# more Keys from mfc_default_keys.lua
+000000000001
+000000000002
+00000000000A
+00000000000B
+010203040506
+0123456789AB
+100000000000
+111111111111
+123456789ABC
+12F2EE3478C1
+14D446E33363
+1999A3554A55
+200000000000
+222222222222
+27DD91F1FCF1
+#
+# Hotel system
+505209016A1F
+#
+# Directory and eventlog KeyB
+2BA9621E0A36
+#
+# Directory and eventlog KeyA
+4AF9D7ADEBE4
+#
+#
+333333333333
+33F974B42769
+34D1DF9934C5
+43AB19EF5C31
+444444444444
+505249565441
+505249565442
+555555555555
+55F5A5DD38C9
+666666666666
+777777777777
+888888888888
+999999999999
+99C636334433
+A00000000000
+A053A292A4AF
+A94133013401
+AAAAAAAAAAAA
+#
+# Key from ladyada.net
+ABCDEF123456
+#
+#
+B00000000000
+B127C6F41436
+BBBBBBBBBBBB
+BD493A3962B6
+C934FE34D934
+CCCCCCCCCCCC
+DDDDDDDDDDDD
+EEEEEEEEEEEE
+#
+# elevator
+# data from forum
+FFFFFF545846
+#
+#
+F1A97341A9FC
+#
+# hotel system
 44AB09010845
 85FED980EA5A
-314B49474956
-564C505F4D41
-0263DE1278F3
-067DB45454A9
-15FC4C7613FE
-16F21A82EC84
-16F3D5AB1139
-17758856B182
-1FC235AC1309
-22C1BAE1AACD
-243F160918D1
-25094DF6F148
-2A3C347A1200
-324F5DF65310
-32AC3B90AC13
-35C3D2CAEE88
-3A42F33AF429
-3DF14C8000A1
-3E3554AF0E12
-3E65E4FB65B3
-454841585443
-460722122510
-48FFE71294A0
-491CDCFB7752
-4AD1E273EAF1
-4B791BEA7BCC
-51284C3686A6
-528C9DFFE28C
-5EB8F884C8D1
-5F146716E373
-6338A371C0ED
-63F17A449AF0
-643FB6DE2217
-64E3C10394C2
-682D401ABB09
-68D30288910A
-693143F10368
-6A470D54127C
-740E9A4F9AAF
-75CCB59C9BED
-75D8690F21B6
-75EDE6A84460
-82F435DEDF01
-85675B200017
-871B8C085997
-937A4FFF3011
-97184D136233
-97D1101F18B0
-9AFC42372AF1
-A27D3804C259
-A3F97428DD01
-A8966C7CC54B
+#
+# ARD (fr) key A
+43454952534E
+# ARD (fr) key B
+4A2B29111213
+#
+#
+4143414F5250
+#
+# Tehran Railway
+A9B43414F585
+1FB235AC1388
+#
+# Data from http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
+# BCARD KeyB
+F4A9EF2AFC6D
+#
+#
+# S0 B
+89EAC97F8C2A
+#
+# S4 A
+43C7600DEE6B
+#
+# S6 A
+0120BF672A64
+#
+# S6 B
+FB0B20DF1F34
+#
+#
 A9F953DEF0A3
-AAFB06045877
-AC0E24C75527
-AE3FF4EEA0DB
-B0C9DD55DD4D
-B736412614AF
-C4652C54261C
-C6AD00254562
-C82EC29E3235
-D39BB83F5297
-D49E2826664F
-DF27A8F1CB8E
-E2C42591368A
-E3429281EFC1
-E444D53D359F
+#
+# Data from forum
+74A386AD0A6D
+3F7A5C2DBD81
+21EDF95E7433
+C121FF19F681
+3D5D9996359A
+#
+# Here be BIP keys...
+3A42F33AF429
+1FC235AC1309
+6338A371C0ED
+243F160918D1
 F124C2578AD0
+9AFC42372AF1
+32AC3B90AC13
+682D401ABB09
+4AD1E273EAF1
+067DB45454A9
+E2C42591368A
+15FC4C7613FE
+2A3C347A1200
+68D30288910A
+16F3D5AB1139
 F59A36A2546D
-FEE470A4CB58
-0000000018DE
-0000014B5C31
-003003003003
-003CC420001A
-013889343891
-01FA3FC68349
-021209197591
-050908080008
-0A7932DC7E65
-0C669993C776
-0C71BCFB7E72
-0D258FE90296
+937A4FFF3011
+64E3C10394C2
+35C3D2CAEE88
+B736412614AF
+693143F10368
+324F5DF65310
+A3F97428DD01
+643FB6DE2217
+63F17A449AF0
+82F435DEDF01
+C4652C54261C
+0263DE1278F3
+D49E2826664F
+51284C3686A6
+3DF14C8000A1
+6A470D54127C
+#
+# Data from http://pastebin.com/AK9Bftpw
+# Länstrafiken i Västerbotten
+48FFE71294A0
+E3429281EFC1
+16F21A82EC84
+460722122510
+#
+# 3dprinter
+# EPI Envisionte
+AAFB06045877
+#
+# Gyms / Fitness Clubs / Health Clubs / Wellness Centres
+#
+# Fysiken A
+3E65E4FB65B3
+#
+# Fysiken B
+25094DF6F148
+#
+#
+# https://mattionline.de/fitnessstudio-armband-reverse-engineering/
+# https://mattionline.de/milazycracker/
+# Gym Wristband A - Same as Fysiken A
+# Gym Wristband B
+81CC25EBBB6A
+195DC63DB3A3
+#
+# CleverFit
+A05DBD98E0FC
+#
+# GoFit
+AA4DDA458EBB
+EAB8066C7479
+#
+# Nordic Wellness A - Same as Fysiken A
+# Nordic Wellness B
+E5519E1CC92B
+# 
+# Jett's 24 Hour Fitness S0 KA/B
+# 049979614077
+# 829338771705
+#
+# Hotel KeyCard
+D3B595E9DD63
+AFBECD121004
+#
+# SimonsVoss
+6471A5EF2D1A
+#
+# ID06
+4E3552426B32
+22BDACF5A33F
+6E7747394E63
+763958704B78
+#
+# Onity  S1 A/B
+8A19D40CF2B5
+#
+3961EA82C46D
+#
+# 24-7
+D21762B2DE3B
 0E83A374B513
-0F230695923F
+1F1FFE000000
+A10F303FC879
+1322285230B8
+0C71BCFB7E72
+C3C88C6340B8
+F101622750B7
+1F107328DC8D
+710732200D34
+7C335FB121B5
+B39AE17435DC
+#
+# key A
+454841585443
+#
+# Lift system
+190819842023
+#
+# Data from http://pastebin.com/gQ6nk38G
+D39BB83F5297
+85675B200017
+528C9DFFE28C
+C82EC29E3235
+3E3554AF0E12
+491CDCFB7752
+22C1BAE1AACD
+5F146716E373
+740E9A4F9AAF
+AC0E24C75527
+97184D136233
+E444D53D359F
+17758856B182
+A8966C7CC54B
+C6AD00254562
+AE3FF4EEA0DB
+5EB8F884C8D1
+FEE470A4CB58
+75D8690F21B6
+871B8C085997
+97D1101F18B0
+75EDE6A84460
+DF27A8F1CB8E
+B0C9DD55DD4D
+#
+# Data from http://bit.ly/1bdSbJl
+A0B0C0D0E0F0
+A1B1C1D1E1F1
+#
+# Data from msk social
+2735FC181807
+2ABA9519F574
+84FD7F7A12B6
+186D8C4B93F9
+3A4BBA8ADAF0
+8765B17968A2
+40EAD80721CE
+0DB5E6523F7C
+51119DAE5216
+83E3549CE42D
+136BDB246CAC
+7DE02A7F6025
+BF23A53C1F63
+CB9A1F2D7368
+C7C0ADB3284F
+9F131D8C2057
+67362D90F973
+6202A38F69E2
+100533B89331
+653A87594079
+D8A274B2E026
+B20B83CB145C
+9AFA6CB4FC3D
+A229E68AD9E5
+49C2B5296EF4
+#
+# Data from http://pastebin.com/RRJUEDCM
+0D258FE90296
+E55A3CA71826
+A4F204203F56
+EEB420209D0C
+911E52FD7CE4
+752FBB5B7B45
+66B03ACA6EE9
+48734389EDC3
+17193709ADF4
+1ACC3189578C
+C2B7EC7D4EB1
+369A4663ACD2
+#
+# Data from https://github.com/zhangjingye03/zxcardumper
+# zxcard Key A/B
+668770666644
+003003003003
+#
+# Data from http://phreakerclub.com/forum/showthread.php?p=41266
+26973EA74321
+71F3A315AD26
+51044EFB5AAB
+AC70CA327A04
+EB0A8FF88ADE
+#
+# Transport system Metromoney
+2803BCB0C7E1
+9C616585E26D
+4FA9EB49F75E
+2DADE48942C5
+A160FCD5EC4C
+112233445566
+361A62F35BC9
+#
+# Transport system Spain
+83F3CB98C258
+070D486BC555
+A9B018868CC1
+9DCDB136110C
+749934CC8ED3
+506DB955F161
+F088A85E71D7
+72B458D60363
+70C714869DC7
+B32464412EE3
+F253C30568C4
+1C68315674AC
+CFE63749080A
+C1E6F8AFC9EC
+DD0DE3BA08A6
+3D923EB73534
+FF94F86B09A6
+D61707FFDFB1
+8223205047B6
+9951A273DEE7
+C9449301AF93
+66695A45C9FA
+89AA9D743812
+C41514DEFC07
+C52876869800
+5353B3AECB53
+2E4169A5C79D
+4BB747E48C2A
+6285A1C8EB5C
+5145C34DBA19
+25352912CD8D
+81B20C274C3F
+00B70875AF1D
+04B787B2F3A5
+05412723F1B6
+05C301C8795A
+066F5AF3CCEE
+0A1B6C50E04E
+0AD0956DF6EE
+0AD6B7E37183
+0F3A4D48757B
+1417E5671417
+18AB07270506
+18E887D625B4
+1ABC15934F5A
+1AF66F83F5BE
+260480290483
+2900AAC52BC3
+2910AFE15C99
+374521A38BCC
+3A4C47757B07
+3A524B7A7B37
+3C4ABB877EAF
+3F3A534B7B7B
+4B787B273A50
+4B92DF1BF25D
+4F0E4AE8051A
+514B797B2F3A
+529CF51F05C5
+52B26C199862
+57A18BFEC381
+5A7D87876EA8
+64CBADC7A313
+65B6C3200736
+67B1B3A4E497
+6B0454D5D3C3
+6B3B7AF45777
+6C273F431564
+702C1BF025DD
+738385948494
+76E450094393
+777B1F3A4F4A
+7B173A4E4976
+81504133B13C
+826576A1AB68
+8A55194F6587
+8DFACF11E778
+8FD6D76742DC
+9AFEE1F65742
+9D56D83658AC
+9FAC23197904
+A1AB3A08712C
+A514B797B373
+A58AB5619631
+A5BB18152EF1
+A777B233A4F4
+AB19BC885A29
+AB91BDA25F00
+AE98BA1E6F2C
+B133A4D48757
+B3A4C47757B0
+B6803136F5AF
+B793ADA6DB0C
+B95BFDEBA7E4
+C0AA2BBD27CD
+C27F5C1A9C2B
+C9BE49675FE4
+CCCE24102003
+CDE668FDCDBA
+D23A31A4AAB9
+DEDD7688BC38
+E9AE90885C39
+F0A3C5182007
+F3A524B7A7B3
+#
+# Data from mall
+# playland balikesir
+ABBA1234FCB0
+#
+# A trio bowling bahcelievler
+314F495254FF
+4152414B4E41
+#
+# karinca park nigde
+4E474434FFFF
+#
+# hotel system
+537930363139
+#
+# Data from https://github.com/RadioWar/NFCGUI
+44DD5A385AAF
+21A600056CB0
+B1ACA33180A5
+DD61EB6BCE22
+1565A172770F
+3E84D2612E2A
+F23442436765
+79674F96C771
+87DF99D496CB
+C5132C8980BC
+A21680C27773
+F26E21EDCEE2
+675557ECC92E
+F4396E468114
+6DB17C16B35B
+4186562A5BB2
+2FEAE851C199
+DB1A3338B2EB
+157B10D84C6B
+A643F952EA57
+DF37DCB6AFB3
+4C32BAF326E0
+91CE16C07AC5
+3C5D1C2BCD18
+C3F19EC592A2
+F72A29005459
+185FA3438949
+321A695BD266
+D327083A60A7
+45635EF66EF3
+5481986D2D62
+CBA6AE869AD5
+645A166B1EEB
+A7ABBC77CC9E
+F792C4C76A5C
+BFB6796A11DB
+#
+# Data from Salto A/B
+6A1987C40A21
+7F33625BC129
+6BE9314930D8
+#
+# Data from forum
+2338B4913111
+#
+# Data from stoye
+CB779C50E1BD
+A27D3804C259
+003CC420001A
+F9861526130F
+381ECE050FBD
+A57186BDD2B9
+48C739E21A04
+36ABF5874ED7
+649D2ABBBD20
+BBE8FFFCF363
+AB4E7045E97D
+340E40F81CD8
+E4F65C0EF32C
+D2A597D76936
+A920F32FE93A
+86AFD95200F7
+9B832A9881FF
+26643965B16E
+0C669993C776
+B468D1991AF9
+D9A37831DCE5
+2FC1F32F51B1
 0FFBF65B5A14
+C5CFE06D9EA3
+C0DECE673829
+#
+#
+A56C2DF9A26D
+#
+# Data from https://pastebin.com/vbwast74
+68D3F7307C89
+#
+# Smart Rider. Western Australian Public Transport Cards
+568C9083F71C
+117E5C165B10
+24BB421C7973
+3E3A546650EA
+41F262D3AB66
+514956AB3142
+863933AE8388
+#
+# Bangkok metro key
+97F5DA640B18
+#
+# Metro Valencia key
+A8844B0BCA06
+#
+# HTC Eindhoven key
+857464D3AAD1
+#
+# Vigik Keys
+# Various sources :
+# * https://github.com/DumpDos/Vigik
+# * http://newffr.com/viewtopic.php?&forum=235&topic=11559
+# * Own dumps
+#
+# French VIGIK
+# VIGIK1 A
+314B49474956
+#
+# VIGIK1 B
+564C505F4D41
+BA5B895DA162
+#
+# BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
+021209197591
+#
+#
+2EF720F2AF76
+414C41524F4E
+424C41524F4E
+4A6352684677
+BF1F4424AF76
+536653644C65
+#
+# Intratone Cogelec
+# Data from http://bouzdeck.com/rfid/32-cloning-a-mifare-classic-1k-tag.html
+484558414354
+A22AE129C013
+49FAE4E3849F
+38FCF33072E0
+8AD5517B4B18
+509359F131B1
+6C78928E1317
+AA0720018738
+A6CAC2886412
+62D0C424ED8E
+E64A986A5D94
+8FA1D601D0A2
+89347350BD36
+66D2B7DC39EF
+6BC1E1AE547D
+22729A9BD40F
+#
+# Data from https://dfir.lu/blog/cloning-a-mifare-classic-1k-tag.html
+925B158F796F
+FAD63ECB5891
+BBA840BA1C57
+CC6B3B3CD263
+6245E47352E6
+8ED41E8B8056
+2DD39A54E1F3
+6D4C5B3658D2
+1877ED29435A
+52264716EFDE
+961C0DB4A7ED
+703140FD6D86
+157C9A513FA5
+E2A5DC8E066F
+#
+# Data from forum,  schlage 9691T fob
+EF1232AB18A0
+#
+# Data from a oyster card
+374BF468607F
+BFC8E353AF63
+15CAFD6159F6
+62EFD80AB715
+987A7F7F1A35
+C4104FA3C526
+4C961F23E6BE
+67546972BC69
+F4CD5D4C13FF
+94414C1A07DC
+16551D52FD20
+9CB290282F7D
+77A84170B574
+ED646C83A4F3
+E703589DB50B
+513C85D06CDE
+95093F0B2E22
+543B01B27A95
+C6D375B99972
+EE4CC572B40E
+5106CA7E4A69
+C96BD1CE607F
+167A1BE102E0
+A8D0D850A606
+A2ABB693CE34
+7B296C40C486
+91F93A5564C9
+E10623E7A016
+B725F9CBF183
+#
+# Data from FDi tag
+8829DA9DAF76
+#
+# Data from GitHub issue
+0A7932DC7E65
 11428B5BCE06
 11428B5BCE07
 11428B5BCE08
 11428B5BCE09
 11428B5BCE0A
 11428B5BCE0F
-11496F97752A
-123F8888F322
-1322285230B8
-1565A172770F
-157B10D84C6B
-157C9A513FA5
-15CAFD6159F6
-160A91D29A9C
-16551D52FD20
-167A1BE102E0
-16DDCB6B3F24
-1717E34A7A8A
-17193709ADF4
-185FA3438949
-1877ED29435A
 18971D893494
-1AB23CD45EF6
-1ACC3189578C
-1F107328DC8D
-1F1A0A111B5B
-1F1FFE000000
-2031D1E57A3B
-# HID Key B
-204752454154
-21A600056CB0
-22729A9BD40F
-2338B4913111
-2548A443DF28
 25D60050BF6E
-26643965B16E
-26973EA74321
-27FBC86A00D0
-2A2C13CC242A
-2A6D9205E7CA
-2CB1A90071C8
-2DD39A54E1F3
-2ED3B15E7C0F
-2EF720F2AF76
-2FC1F32F51B1
-2FEAE851C199
-3060206F5B0A
-31646241686C
-321958042333
-321A695BD266
-340E40F81CD8
-345547514B4D
-356D46474348
-369A4663ACD2
-36ABF5874ED7
-374BF468607F
-381ECE050FBD
-386B4D634A65
-38FCF33072E0
-3A09594C8587
-3B7E4FD575AD
-3C5D1C2BCD18
-3E84D2612E2A
-3FA7217EC575
-410B9B40B872
-414C41524F4E
-415A54454B4D
-4186562A5BB2
-424C41524F4E
-425A73484166
-436A46587552
-447AB7FD5A6B
-44DD5A385AAF
 44F0B5FBE344
-45635EF66EF3
-476242304C53
-484558414354
-# HID Key A
-484944204953
-484A57696F4A
-48734389EDC3
-48C739E21A04
-49FAE4E3849F
-4A6352684677
-4C32BAF326E0
-4C6B69723461
-4C961F23E6BE
-4D3248735131
-4D5076656D58
-4E32336C6E38
-4E4175623670
-4F9F59C9C875
-509359F131B1
-51044EFB5AAB
-5106CA7E4A69
-513C85D06CDE
-52264716EFDE
-536653644C65
-53C11F90822A
-543B01B27A95
-5481986D2D62
-5544564E6E67
-564777315276
-568C9083F71C
-57734F6F6974
-57784A533069
-584F66326877
-5A1B85FCE20A
-5EC39B022F2B
-623055724556
-62387B8D250D
-6245E47352E6
-62CED42A6D87
-62D0C424ED8E
-62EFD80AB715
-645A166B1EEB
-649D2ABBBD20
-666E564F4A44
-668770666644
-66B03ACA6EE9
-66D2B7DC39EF
-66F3ED00FED7
-67546972BC69
-675557ECC92E
-686A736A356E
-68D3F7307C89
-69FB7B7CD8EE
-6A1987C40A21
-6A676C315142
-6A696B646631
-6B6579737472
-6BC1E1AE547D
-6C78928E1317
-6C94E1CED026
-6D44B5AAF464
-6D4C5B3658D2
-6D4E334B6C48
-6DB17C16B35B
-6F4B6D644178
-6F506F493353
-703140FD6D86
-70564650584F
-710732200D34
-71F3A315AD26
-744E326B3441
-752FBB5B7B45
-756EF55E2507
-77494C526339
-77646B633657
-77A84170B574
-79674F96C771
-7B296C40C486
 7B296F353C6B
-7C335FB121B5
-7F33625BC129
 8553263F4FF0
-8697389ACA26
-86AFD95200F7
-87DF99D496CB
-8829DA9DAF76
-89347350BD36
-8AD5517B4B18
 8E5D33A6ED51
-8ED41E8B8056
-8FA1D601D0A2
-911E52FD7CE4
-9189449EA24E
-91CE16C07AC5
-91F93A5564C9
-925B158F796F
-92EE4DC87191
-932B9CB730EF
-94414C1A07DC
-95093F0B2E22
-961C0DB4A7ED
-987A7F7F1A35
-9B832A9881FF
-9CB290282F7D
-9DC282D46217
 9F42971E8322
-A10F303FC879
-A21680C27773
-A22AE129C013
-A2ABB693CE34
-A4F204203F56
-A56C2DF9A26D
-A57186BDD2B9
-A643F952EA57
-A6CAC2886412
-A7ABBC77CC9E
-A8D0D850A606
-A920F32FE93A
-AA0720018738
-AB4E7045E97D
-AC70CA327A04
-AD4FB33388BF
-AD9E0A1CA2F7
-AFD0BA94D624
-B1ACA33180A5
-B35A0E4ACC09
-B39AE17435DC
-B468D1991AF9
-B578F38A5C61
-B725F9CBF183
-B7BF0C13066E
-B8A1F613CF3D
-BA5B895DA162
-BBA840BA1C57
-BBE8FFFCF363
-BEDB604CC9D1
-BF1F4424AF76
-BFB6796A11DB
-BFC8E353AF63
-C0C1C2C3C4C5
-C0DECE673829
-C2B7EC7D4EB1
-C3C88C6340B8
-C3F19EC592A2
-C4104FA3C526
-C5132C8980BC
-C5CFE06D9EA3
 C620318EF179
-C6D375B99972
-C96BD1CE607F
-CB779C50E1BD
-CBA6AE869AD5
-CC6B3B3CD263
-D0D1D2D3D4D5
-D21762B2DE3B
-D2A597D76936
-D327083A60A7
 D4FE03CE5B06
 D4FE03CE5B07
 D4FE03CE5B08
 D4FE03CE5B09
 D4FE03CE5B0A
 D4FE03CE5B0F
-D58023BA2BDC
-D9A37831DCE5
-DB1A3338B2EB
-DD61EB6BCE22
-DF37DCB6AFB3
-E10623E7A016
 E241E8AFCBAF
-E2A5DC8E066F
-E4F65C0EF32C
-E55A3CA71826
-E64A986A5D94
-E703589DB50B
-EB0A8FF88ADE
-EC0A9B1A9E06
-ED646C83A4F3
-EE4CC572B40E
-EEB420209D0C
-F101622750B7
-F1B9F5669CC8
-F23442436765
-F238D78FF48F
-F26E21EDCEE2
-F4396E468114
-F4CD5D4C13FF
-F662248E7E89
-F72A29005459
-F792C4C76A5C
+# Transport system Argentina - SUBE
+# Shared key - sec 3 blk 15
+3FA7217EC575
+#
+# Data from forum post
+123F8888F322
+050908080008
+#
+# Data from hoist
+4F9F59C9C875
+#
+# Data from pastebin
+66F3ED00FED7
 F7A39753D018
-F9861526130F
-FAD63ECB5891
-
-# Some keys of https://w3bsit3-dns.com and https://ikey.ru
-BC4580B7F20B
-8E26E45E7D65
-A7141147D430
-18E3A02B5EFF
-E328A1C7156D
-8A8D88151A00
-7A86AA203788
-72F96BDD3714
-C76BF71A2509
-1B61B2E78C75
-045CECA15535
-6B07877E2C5C
-0CE7CD2CC72B
-EA0FD73CB149
-B81F2B0C2F66
-BB52F8CCE07F
-46D78E850A7E
-E4821A377B75
-8791B2CCB5C4
-D5524F591EED
-BAFF3053B496
-0F318130ED18
-42E9B54E51AB
-7413B599C4EA
-9EA3387A63C1
-B27ADDFB64B0
-E56AC127DD45
-0BE5FAC8B06A
-FD8705E721B0
-7259FA0197C6
-22052B480D11
-9D993C5D4EF4
-C65D4EAA645B
-0EB23CC8110B
-3A8A139C20B4
-19FC84A3784B
-0F01CEFF2742
-A3FAA6DAFF67
-BC2D1791DEC1
-7A396F0D633D
-ACFFFFFFFFFF
-77DABC9825E1
-518DC6EEA089
-044CE1872BC3
-114D6BE9440C
-AFCEF64C9913
-
+#
+# Data from https://pastebin.com/Z7pEeZif
+386B4D634A65
+666E564F4A44
+564777315276
+476242304C53
+6A696B646631
+4D3248735131
+425A73484166
+57784A533069
+345547514B4D
+4C6B69723461
+4E4175623670
+4D5076656D58
+686A736A356E
+484A57696F4A
+6F4B6D644178
+744E326B3441
+70564650584F
+584F66326877
+6D4E334B6C48
+6A676C315142
+77494C526339
+623055724556
+356D46474348
+4E32336C6E38
+57734F6F6974
+436A46587552
+5544564E6E67
+6F506F493353
+31646241686C
+77646B633657
+#
+# Data from TransPert
+2031D1E57A3B
+53C11F90822A
+9189449EA24E
+#
+# data from Github
+410B9B40B872
+2CB1A90071C8
+#
+#
+8697389ACA26
+1AB23CD45EF6
+013889343891
+#
+#
+0000000018DE
+16DDCB6B3F24
+#
+# Data from https://pastebin.com/vwDRZW7d
+# Vingcard Mifare 4k Staff card
+EC0A9B1A9E06
+6C94E1CED026
+0F230695923F
+0000014B5C31
+#
+#
+BEDB604CC9D1
+B8A1F613CF3D
+B578F38A5C61
+B66AC040203A
+6D0B6A2A0003
+2E641D99AD5B
+AD4FB33388BF
+69FB7B7CD8EE
+#
+# Hotel
+2A6D9205E7CA
+13B91C226E56
+#
+# KABA Hotel Locks
+2A2C13CC242A
+#
+#
+27FBC86A00D0
+01FA3FC68349
+#
+# Smart Rider. Western Australian Public Transport Cards
+6D44B5AAF464
+1717E34A7A8A
+#
+# RFIDeas
+6B6579737472
+#
+# HID MIFARE Classic 1k Key
+484944204953
+204752454154
+# HID MIFARE SO
+3B7E4FD575AD
+11496F97752A
+#
+# Luxeo/Aztek cashless vending
+415A54454B4D
+#
+# BQT
+321958042333
+#
+# Aperio KEY_A Sector 1, 12, 13, 14, 15 Data Start 0 Length 48
+160A91D29A9C
+#
+# Gallagher
+B7BF0C13066E
+#
+# PIK Comfort Moscow keys (ISBC Mifare Plus SE 1K)
+009FB42D98ED
+002E626E2820
+#
+# Boston, MA, USA Transit - MBTA Charlie Card
+3060206F5B0A
+5EC39B022F2B
+3A09594C8587
+F1B9F5669CC8
+F662248E7E89
+62387B8D250D
+F238D78FF48F
+9DC282D46217
+AFD0BA94D624
+92EE4DC87191
+B35A0E4ACC09
+756EF55E2507
+447AB7FD5A6B
+932B9CB730EF
+1F1A0A111B5B
+AD9E0A1CA2F7
+D58023BA2BDC
+62CED42A6D87
+2548A443DF28
+2ED3B15E7C0F
+F66224EE1E89
+#
+#
+60012E9BA3FA
+#
+#
+DE1FCBEC764B
+81BFBE8CACBA
+BFF123126C9B
+2F47741062A0
+B4166B0A27EA
+A170D9B59F95
+400BC9BE8976
+D80511FC2AB4
+1FCEF3005BCF
+BB467463ACD6
+E67C8010502D
+FF58BA1B4478
+#
+# Data from https://pastebin.com/Kz8xp4ev
+FBF225DC5D58
+#
+# Data  https://pastebin.com/BEm6bdAE
+# vingcard.txt
+# Note: most likely diversified
+96A301BCE267
+4708111C8604
+3D50D902EA48
+6700F10FEC09
+7A09CC1DB70A
+560F7CFF2D81
+66B31E64CA4B
+9E53491F685B
+3A09911D860C
+8A036920AC0C
+361F69D2C462
+D9BCDE7FC489
+0C03A720F208
+6018522FAC02
+#
+# Data from https://pastebin.com/4t2yFMgt
+# Mifare technische Universität Graz TUG
+D58660D1ACDE
+50A11381502C
+C01FC822C6E5
+0854BF31111E
+#
+# More keys - Found 8A at Sebel Hotel in Canberra, Australia
+AE8587108640
+#
+# SafLock standalone door locks
+135B88A94B8B
+#
 # Russian Troika card
+EC29806D9738
 08B386463229
 0E8F64340BA4
 0F1C63013DBA
@@ -587,545 +1059,284 @@ EAAC88E5DC99
 F8493407799D
 6B8BD9860763
 D3A297DC2698
-FBF225DC5D58
-# Strelka extension
+#
+# Data from reddit
+34635A313344
+593367486137
+#
+# Keys from Mifare Classic Tool project
+044CE1872BC3
+045CECA15535
+0BE5FAC8B06A
+0CE7CD2CC72B
+0EB23CC8110B
+0F01CEFF2742
+0F318130ED18
+114D6BE9440C
+18E3A02B5EFF
+19FC84A3784B
+1B61B2E78C75
+22052B480D11
 3367BFAA91DB
+3A8A139C20B4
+42E9B54E51AB
+46D78E850A7E
 4B609876BBA3
-5C83859F2224
-66B504430416
-70D1CF2C6843
+518DC6EEA089
+6B07877E2C5C
+7259FA0197C6
+72F96BDD3714
+7413B599C4EA
+77DABC9825E1
+7A396F0D633D
+7A86AA203788
+8791B2CCB5C4
+8A8D88151A00
 8C97CD7A0E56
+8E26E45E7D65
+9D993C5D4EF4
+9EA3387A63C1
+A3FAA6DAFF67
+A7141147D430
+ACFFFFFFFFFF
+AFCEF64C9913
+B27ADDFB64B0
+B81F2B0C2F66
 B9F8A7D83978
-C4B3BD0ED5F1
-C4D3911AD1B3
-CAD7D4A6A996
-DA898ACBB854
-FEA1295774F9
-
-# Moscow public toilets card
-807119F81418
-22C8BCD10AAA
-0AAABA420191
-E51B4C22C8BC
-DBF9F79AB7A2
-34EDE51B4C22
-C8BCD10AAABA
-BCD10AAABA42
-
-# Moscow social card
-2735FC181807
-2ABA9519F574
-84FD7F7A12B6
-186D8C4B93F9
-3A4BBA8ADAF0
-8765B17968A2
-40EAD80721CE
-0DB5E6523F7C
-51119DAE5216
-83E3549CE42D
-136BDB246CAC
-2F87F74090D1
-E53EAEFE478F
-CE2797E73070
-328A034B93DB
-81E1529AE22B
-FC55C50E579F
-1A72E2337BC3
-5DB52676BE07
-F64FBF085098
-8FE758A8F039
-BB1484CC155D
-41990A529AE2
-CD2E9EE62F77
-69C1327AC20B
-3C9C0D559DE5
-67BF3880C811
-48A01159A1E9
-2B83FB448CD4
-F24BBB044C94
-7DE02A7F6025
-BF23A53C1F63
-CB9A1F2D7368
-C7C0ADB3284F
-9F131D8C2057
-67362D90F973
-6202A38F69E2
-100533B89331
-653A87594079
-D8A274B2E026
-B20B83CB145C
-9AFA6CB4FC3D
-94F46DB5FD46
-C31C8CD41D65
-BB1684CC155D
-CA2393DB246C
-1D75E52E76BE
-81D9529AE223
-0159C9125AA2
-52AA1B6BB3FB
-97EF60A8F031
-6FC73888D011
-3A92FA438BD3
-74CC3D85CD0E
-025ACA1B63A3
-AF0878C81151
-9BFB6CB4FC45
-F750C0095199
-075FCF1860A8
-2686EE3F87C7
-277FEF3880C0
-82DA4B93DB1C
-9CF46DB5FD46
-93EB64ACF43D
-
-# Keys from RfidResearchGroup proxmark3 project
-# https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_default_keys.dic
-0854BF31111E
-0C03A720F208
-135B88A94B8B
-1FCEF3005BCF
-2F47741062A0
-361F69D2C462
-3A09911D860C
-3D50D902EA48
-400BC9BE8976
-4708111C8604
-50A11381502C
-560F7CFF2D81
-60012E9BA3FA
-6018522FAC02
-66B31E64CA4B
-6700F10FEC09
-7A09CC1DB70A
-81BFBE8CACBA
-8A036920AC0C
-8A19D40CF2B5
-96A301BCE267
-9E53491F685B
-A170D9B59F95
-AE8587108640
-B4166B0A27EA
-BB467463ACD6
-BFF123126C9B
-C01FC822C6E5
-D58660D1ACDE
-D80511FC2AB4
-D9BCDE7FC489
-DE1FCBEC764B
-E67C8010502D
-FF58BA1B4478
-
-C1E51C63B8F5
-4143414F5250
-474249437569
-B0699AD03D17
-B18CDCDE52B7
-3864FCBA5937
-85A438F72A8A
-C342F825B01B
-C6A76CB2F3B5
-323334353637
-43C7600DEE6B
-D01AFEEB890A
-26396F2042E7
-F3F0172066B2
-BB320A757099
-00F0BD116D70
-25094DF2C1BD
-E41E6199318F
-F00DFEEDD0D0
-6D9B485A4845
-71171A82D951
-62711F1A83E9
-1711B1A82E96
-F3864FCCA693
-7B7E752B6A2D
-2012053082AD
-9AEDF9931EC1
-B9C874AE63D0
-83BAB5ACAD62
-A541538F1416
-4A2B29111213
-D31463A7AB6D
-AD5645062534
-B069D0D03D17
-30FFB6B056F5
-D7744A1A0C44
-D1991E71E2C5
-1795902DBAF9
-4243414F5250
-C554EF6A6015
-A5524645CD91
-200306202033
-A00003000084
-CEE3632EEFF5
-F0F0172066B2
-B021669B44BB
-3F1A87298691
-A2B2C9D187FB
-4B511F4D28DD
-E3AD9E9BA5D4
-B3630C9F11C8
-F83466888612
-857464D3AAD1
-A2A3CCA2A3CC
-35D850D10A24
-B2F170172066
-0D8CA561BDF3
-05F89678CFCF
-850984712F1A
-21EDF95E7433
-172066B2F2F0
-6B2F1B017206
-363119000001
-23D4CDFF8DA3
-EF4C5A7AC6FC
-123456ABCDEF
-8F9B229047AC
-E96246531342
-5D293AFC8D7E
-AABBCC660429
-63FCA9492F38
-354A787087F1
-40E5EA1EFC00
-675A32413770
-12FD3A94DF0E
-C4F271F5F0B3
-4A306E62E9B6
-4CFF128FA3EF
-0000085F0000
-0F385FFB6529
-FA38F70215AD
-904735F00F9E
-B66AC040203A
-BCFE01BCFE01
-2FCA8492F386
-237A4D0D9119
-E6849FCC324B
-0ED7846C2BC9
-1FB235AC1388
-EA1B88DF0A76
-C9739233861F
-89EAC97F8C2A
-D964406E67B4
-563A22C01FC8
-DB5181C92CBE
-1E352F9E19E5
-6291B3860FC8
-A9A4045DCE77
-434456495243
-B5F454568271
-491CDC863104
-4D8B8B95FDEE
-AFBECD121004
-4D48414C5648
-E1DD284379D4
-AFBECD120454
-CFC738403AB0
-0AF7DB99AEE4
-772219470B38
-EF61A3D48E2A
-4A4C474F524D
-0172066B2F03
-3D5D9996359A
-66A163BA82B4
-2011092119F1
-BB2C0007D022
-1494E81663D7
-590BD659CDD2
-A6C028A12FBB
-BCF5A6B5E13F
-A2F63A485632
-39CF885474DD
-D2ECE8B9395E
-17505586EF02
-70172066B2F0
-B385EFA64290
-B7C344A36D88
-010000000000
-2F130172066B
-DFED39FFBB76
-3F7A5C2DBD81
-DFE73BE48AC6
-FB0B20DF1F34
-913385FFB752
-2066B2F27017
-91FF18E63887
-0734BFB93DAB
-97F5DA640B18
-B42C4DFD7A90
-C121FF19F681
-BE7C4F6C7A9A
-FE04ECFE5577
-18F34C92A56E
-0BB31DC123E5
-0E0E8C6D8EB6
-1CFA22DBDFC3
-0F1A81C95071
-AA4D051954AC
-9F9D8EEDDCCE
-863FCB959373
-98631ED2B229
-A23456789123
-833FBD3CFE51
-AB28A44AD5F5
-74A386AD0A6D
-4C60F4B15BA8
-022FE48B3072
-97271231A83F
-385EFA542907
-066B2F230172
-BA729428E808
-BDF837787A71
-A05DBD98E0FC
-395244733978
-9B1DD7C030A1
-2C9F3D45BA13
-1DB710648A65
-E65B66089AFC
-A85198481331
-5A12F83326E7
-A7D71AC06DC2
-64E2283FCF5E
-FFFFAE82366C
-10F3BEBC01DF
+BAFF3053B496
+BB52F8CCE07F
+BC2D1791DEC1
+BC4580B7F20B
+C65D4EAA645B
+C76BF71A2509
+D5524F591EED
+E328A1C7156D
+E4821A377B75
+E56AC127DD45
+EA0FD73CB149
+FC0001877BF7
+FD8705E721B0
 00ADA2CD516D
-1D28C58BBE8A
-6936C035AE1B
-AC45AD2D620D
-64A2EE93B12B
-A9F95891F0A4
-E45230E7A9E8
-A7FB4824ACBF
-223C3427108A
-58AC17BF3629
-535F47D35E39
-10F2BBAA4D1C
-A0004A000036
-3F3865FCCB69
-0B0172066B2F
-4098653289D3
-BA28CFD15EE8
-A22647F422AE
-99858A49C119
-29173860FC76
-1A80B93F7107
-1A2B3C4D5E6F
-2C60E904539C
-6C9EC046C1A4
-FC9839273862
-1C1532A6F1BC
-09800FF94AAF
+518108E061E2
+558AAD64EB5B
+001122334455
+6CA761AB6CA7
+B1C4A8F7F6E3
+FF75AFDA5A3C
+FCDDF7767C10
+A6B3F6C8F1D4
+#
+#
+237A4D0D9119
+0ED7846C2BC9
 FFFFD06F83E3
-0B83797A9C64
-13B91C226E56
-A4EF6C3BB692
-000000270000
-A00002000021
-872B71F9D15A
-A37A30004AC9
-B1A862985913
-A4CDFF3B1848
-2E641D99AD5B
-827ED62B31A7
-CD212889C3ED
-B1A80C94F710
-CB911A1A1929
-A844F4F52385
-C0BEEFEC850B
-5C8FF9990DA2
-160F4B7AB806
-B8937130B6BA
-66B2F1F01720
-82D58AA49CCB
-A9B43414F585
-C38197C36420
-0172066B2F33
-434143445649
-34B16CD59FF8
-5A7A52D5E20D
-6471A5EF2D1A
-F57F410E18FF
-3B0172066B2F
-E907470D31CC
-B8457ACC5F5D
-67CC03B7D577
-A8844B0BCA06
-435330666666
-B47058139187
-46868F6D5677
-C27D999912EA
-37FC71221B46
-F97371271A84
-AE43F36C1A9A
-5EC7938F140A
-AA734D2F40E0
-A5A4A3A2A1A0
-70172066B2F3
-03EA4053C6ED
-06FF5F03AA1A
-5554AAA96321
-0120BF672A64
-87291F3861FC
-9EBC3EB37130
-B4C36C79DA8D
-43CA22C13091
-6D0B6A2A0003
-FB6C88B7E279
-013940233313
-7DD399D4E897
-ED3A7EFBFF56
-68F9A1F0B424
-6476FA0746E7
-1A8619858137
-1131A81D9507
-8268046CD154
-4857DD68ECD9
-B62307B62307
-C6C866AA421E
-F66224EE1E89
-4ECCA6236400
-72066B2F2B01
-34D3C568B348
-000131B93F28
-419A13811554
-B6323F550F54
+FFFFAE82366C
 F89C86B2A961
-B268F7C9CA63
-B8B1CFA646A8
-4D57414C5648
-6A0E215D1EEB
-70758FDD31E0
+F83466888612
+ED3A7EFBFF56
+E96246531342
+E1DD284379D4
+DFED39FFBB76
+DB5181C92CBE
+CFC738403AB0
+BCFE01BCFE01
+BA28CFD15EE8
+B0699AD03D17
+AABBCC660429
+A4EF6C3BB692
+A2B2C9D187FB
+9B1DD7C030A1
+9AEDF9931EC1
+8F9B229047AC
+872B71F9D15A
+833FBD3CFE51
+5D293AFC8D7E
+5554AAA96321
+474249437569
+435330666666
+1A2B3C4D5E6F
+123456ABCDEF
+83BAB5ACAD62
+64E2283FCF5E
+64A2EE93B12B
+46868F6D5677
+40E5EA1EFC00
 37D4DCA92451
-444156494442
-B210CFA436D2
-207FFED492FD
-7578BF2C66A9
-50983712B1A8
-5A85536395B3
-B81846F06EDF
-842146108088
+2012053082AD
+2011092119F1
+200306202033
+1795902DBAF9
+17505586EF02
+022FE48B3072
+013940233313
+#
+# Hotel Adina
+9EBC3EB37130
+#
+# Misc. keys from hotels & library cards in Germany
+914f57280ce3
+324a82200018
+370aee95cd69
+2e032ad6850d
+1feda39d38ec
+288b7a34dbf8
+0965e3193497
+18c628493f7f
+064d9423938a
+995fd2a2351e
+7c7d672bc62e
+217250fb7014
+ae7478ccaee7
+abbf6d116eaf
+05862c58edfb
+e43b7f185460
+6a59aa9a959b
+b79e5b175227
+7bc9ebb8274b
+b2afbf2331d4
+223e5847dd79
+640524d2a39b
+aee297cb2fd6
+3da5dfa54604
+0cf1a2aa1f8d
+#
+# most likely diversifed individual keys.
+# data from https://github.com/korsehindi/proxmark3/commit/24fdbfa9a1d5c996aaa5c192bc07e4ab28db4c5c
+491CDC863104
+A2F63A485632
+98631ED2B229
 19F1FFE02563
-D3B595E9DD63
+#
+# Argentina
+563A22C01FC8
+43CA22C13091
+25094DF2C1BD
+#
+# OMNITEC.ES HOTEL TIMECARD / MAINTENANCECARD
+AFBECD120454
+#
+# OMNITEC.ES HOTEL EMERGENCYCARD
+842146108088
+#
+# TAPCARD PUBLIC TRANSPORT LA
+EA1B88DF0A76
+D1991E71E2C5
+05F89678CFCF
+D31463A7AB6D
+C38197C36420
+772219470B38
+1C1532A6F1BC
+FA38F70215AD
+E907470D31CC
+160F4B7AB806
+1D28C58BBE8A
 B3830B95CA34
-A506370E7C0F
+6A0E215D1EEB
+E41E6199318F
+C4F271F5F0B3
+1E352F9E19E5
+0E0E8C6D8EB6
+C342F825B01B
+CB911A1A1929
+E65B66089AFC
+B81846F06EDF
+37FC71221B46
 880C09CFA23C
-43454952534E
-39AD2963D3D1
+6476FA0746E7
+419A13811554
+2C60E904539C
+4ECCA6236400
+10F2BBAA4D1C
+4857DD68ECD9
+C6A76CB2F3B5
+E3AD9E9BA5D4
+6C9EC046C1A4
+#
+# ROC HIGHSCHOOL ACCESSCARD
+B021669B44BB
+B18CDCDE52B7
+A22647F422AE
+B268F7C9CA63
+A37A30004AC9
+B3630C9F11C8
+A4CDFF3B1848
+B42C4DFD7A90
+A541538F1416
+B5F454568271
+A6C028A12FBB
+B6323F550F54
+A7D71AC06DC2
+B7C344A36D88
+A844F4F52385
+B8457ACC5F5D
+A9A4045DCE77
 B9B8B7B6B5B3
-82908B57EF4F
-
-C67BEB41FFBF
-2AFFD6F88B97
-E77952748484
-988ACDECDFB0
-605F5E5D5C5B
-42EF7BF572AB
-4087C6A75A96
-AADE86B1F9C1
-5EA088C824C9
-120D00FFFFFF
-CA679D6291B0
-E2A9E88BFE16
-0A4600FF00FF
-43B04995D234
-0602721E8F06
-5F31F6FCD3A0
-4AE23A562A80
-A0974382C4C5
-91C2376005A1
-FEE2A3FBC5B6
-2602FFFFFFFF
-CA3A24669D45
-A9F3F289B70C
-B84D52971107
-274E6101FC5E
-00DD300F4F10
-F7BA51A9434E
-4A832584637D
-B16B2E573235
-A82045A10949
-FC0B50AF8700
-403F09848B87
-DFF293979FA7
-4118D7EF0902
-30B7680B2BC9
-52B0D3F6116E
-5296C26109D4
-DB6819558A25
-4D6F62692E45
-0406080A0C0E
-6130DFA578A0
-30D9690FC5BC
-D73438698EEA
-005078565703
-
-7C87013A648A
-9E7168064993
-45FEE09C1D06
-734EBE504CE8
-E592ED478E59
-C229CE5123D5
-240F0BB84681
-D8BA1AA9ABA0
-865B6472B1C0
-974A36E2B1BA
-57D83754711D
-C9CD8D7C65E5
-C197AE6D6990
-AABAFFCC7612
-C0AD1B72921A
-AFAAFCC40DEC
-E902395C1744
-DAC7E0CBA8FD
-755D49191A78
-68D3263A8CD6
-2F8A867B06B4
-7357EBD483CC
-ABCC1276FCB0
-26BF1A68B00F
-704A81DDACED
-E8794FB14C63
-EC070A52E539
-037F64F470AD
-76939DDD9E97
-4D80A10649DF
-89E00BC444EF
-26107E7006A0
-B1D3BC5A7CCA
-ECC58C5D34CA
-9F97C182585B
-B2FE3B2875A6
-B70B1957FE71
-E495D6E69D9C
-0860318A3A89
-4051A85E7F2D
-17D071403C20
-3BF391815A8D
-1927A45A83D3
-CE7712C5071D
-F3C1F1DB1D83
-D0DDDF2933EC
-
-# Iron Logic
-A3A26EF4C6B0
-2C3FEAAE99FC
-E85B73382E1F
-F4ED24C2B998
-CB574C6D3B19
-E092081D724B
-B38D82CF7B6C
-8228D2AA6EFA
-2C7E983588A3
-CF7A7B77E232
-32A7F5EAF87D
-7453A687B5F0
-01A0C008A5B9
-DEC0CEB0CE24
-413BED2AE45B
-D6261A9A4B3F
-CB9D507CE56D
-
+AA4D051954AC
+BA729428E808
+AB28A44AD5F5
+BB320A757099
+AC45AD2D620D
+BCF5A6B5E13F
+AD5645062534
+BDF837787A71
+AE43F36C1A9A
+BE7C4F6C7A9A
+5EC7938F140A
+82D58AA49CCB
+#
+# MELON CARD
+323334353637
+#
+#
+CEE3632EEFF5
+827ED62B31A7
+03EA4053C6ED
+C0BEEFEC850B
+F57F410E18FF
+0AF7DB99AEE4
+A7FB4824ACBF
+207FFED492FD
+1CFA22DBDFC3
+30FFB6B056F5
+39CF885474DD
+00F0BD116D70
+4CFF128FA3EF
+10F3BEBC01DF
+#
+# Transportes Insular La Palma
+0172066B2F03
+0000085F0000
+1A80B93F7107
+70172066B2F0
+B1A80C94F710
+0B0172066B2F
+0F1A81C95071
+F0F0172066B2
+1131A81D9507
+2F130172066B
+71171A82D951
+B2F170172066
+1711B1A82E96
+6B2F1B017206
+62711F1A83E9
+66B2F1F01720
+97271231A83F
+066B2F230172
+F97371271A84
+2066B2F27017
+50983712B1A8
+72066B2F2B01
+850984712F1A
+172066B2F2F0
+A85198481331
+0172066B2F33
+1A8619858137
+70172066B2F3
+B1A862985913
+3B0172066B2F
+3F1A87298691
+F3F0172066B2
+#
 # Tehran ezpay
 38A88AEC1C43
 CBD2568BC7C6
@@ -1142,138 +1353,404 @@ D3B1C7EA5C53
 604AC8D87C7E
 8E7B29460F12
 BB3D7B11D224
-
-# More keys from the PM3 repo
-DC018FC1D126
-C428C4550A75
-0C4233587119
-5B0C7EC83645
-540D5E6355CC
-35C649004000
-CFE63749080A
-6307417353C1
-411053C05273
-749934CC8ED3
-1C68315674AC
-35D152154017
-D1417E431949
-26B85DCA4321
-D973D917A4C7
-3A471B2192BF
-534F4C303232
-730956C72BC2
-C9449301AF93
-F678905568C3
-4578ABFEDC12
-075D1A4DD323
-43E69C28F08C
-0F35D5660653
-F7FA2F629BB1
-5145C34DBA19
-124578ABFEDC
-E2F14D0A0E28
-C8AACD7CF3D1
-9C616585E26D
-4927C97F1D57
-6F30126EE7E4
-155332417E00
-5353B3AECB53
-361A62F35BC9
-00460740D722
-A9B018868CC1
-2E71D3BD262A
-4F75030AD12B
-42454C4C4147
-D75971531042
-25352912CD8D
-51E97FFF51E9
-1170553E4304
-D1F71E05AD9D
-541C417E57C0
-AE76242931F1
-6039ABB101BB
-0E620691B9FE
-4BF6DE347FB6
-10510049D725
-1F0128447C00
-D14E615E0545
-94B6A644DFF6
-81B20C274C3F
-66695A45C9FA
-130662240200
-DD0DE3BA08A6
-05F5EC05133C
-4FA9EB49F75E
-C1E6F8AFC9EC
-28D70900734C
-32CA52054416
-703265497350
-3D923EB73534
-C151D998C669
+#
+# Chaco
+B210CFA436D2
+B8B1CFA646A8
+A9F95891F0A4
+#
+# Keys from APK application "Scan Badge"
+4A4C474F524D
+444156494442
+434143445649
+434456495243
+A00002000021
+EF61A3D48E2A
+A23456789123
+010000000000
+363119000001
+A00003000084
+675A32413770
+395244733978
+A0004A000036
+2C9F3D45BA13
+4243414F5250
+DFE73BE48AC6
+#
+#
+B069D0D03D17
+000131B93F28
+#
+# From the DFW Area, TX, USA
+A506370E7C0F
+26396F2042E7
+70758FDD31E0
+9F9D8EEDDCCE
+06FF5F03AA1A
+4098653289D3
+904735F00F9E
+B4C36C79DA8D
+68F9A1F0B424
+5A85536395B3
+7DD399D4E897
+EF4C5A7AC6FC
+B47058139187
+8268046CD154
+67CC03B7D577
+#
+# From the HTL Mödling, NÖ, AT
+A5524645CD91
+D964406E67B4
+99858A49C119
+7B7E752B6A2D
+C27D999912EA
+66A163BA82B4
+4C60F4B15BA8
+#
+# CAFE + CO, AT
+35D850D10A24
+4B511F4D28DD
+E45230E7A9E8
+535F47D35E39
+FB6C88B7E279
+#
+# Metro Card, AT
+223C3427108A
+#
+# Unknown, AT
+23D4CDFF8DA3
+E6849FCC324B
+12FD3A94DF0E
+#
+# Unknown, AT
+0B83797A9C64
+39AD2963D3D1
+#
+# Hotel Berlin Classic room A KEY
+34B16CD59FF8
+#
+# Hotel Berlin Classic room B KEY
+BB2C0007D022
+#
+# Coinmatic laundry Smart card
+# data from: https://pastebin.com/XZQiLtUf
+0734BFB93DAB
+85A438F72A8A
+#
+# Data from forum, Chinese hotel
+58AC17BF3629
+B62307B62307
+#
+#
+A2A3CCA2A3CC
+#
+# Granada, ES Transport Card
+000000270000
+0F385FFB6529
+29173860FC76
+2FCA8492F386
+385EFA542907
+3864FCBA5937
+3F3865FCCB69
+6291B3860FC8
+63FCA9492F38
+863FCB959373
+87291F3861FC
+913385FFB752
+B385EFA64290
+C9739233861F
+F3864FCCA693
+FC9839273862
+#
+# various hotel keys
+34D3C568B348
+91FF18E63887
+4D8B8B95FDEE
+354A787087F1
+4A306E62E9B6
+B9C874AE63D0
+#
+# Data from official repo
+F00DFEEDD0D0
+0BB31DC123E5
+7578BF2C66A9
+CD212889C3ED
+6936C035AE1B
+C6C866AA421E
+590BD659CDD2
+AA734D2F40E0
+09800FF94AAF
+5A12F83326E7
+C554EF6A6015
+0D8CA561BDF3
+B8937130B6BA
+D7744A1A0C44
+82908B57EF4F
+FE04ECFE5577
+#
+# comfort inn hotel
+4D57414C5648
+4D48414C5648
+#
+# unknown hotel key
+6D9B485A4845
+#
+# Bosch Solution 6000
+5A7A52D5E20D
+#
+# Found in TagInfo app
+# RATB key
+C1E51C63B8F5
+1DB710648A65
+# E-GO card key
+18F34C92A56E
+#
+# Library Card MFP - SL1
+4A832584637D
+CA679D6291B0
+30D9690FC5BC
+5296C26109D4
+E77952748484
+91C2376005A1
+30B7680B2BC9
+E2A9E88BFE16
+43B04995D234
+AADE86B1F9C1
+5EA088C824C9
+C67BEB41FFBF
+B84D52971107
+52B0D3F6116E
+#
+# Data from https://pastebin.com/cLSQQ9xN
+CA3A24669D45
+4087C6A75A96
+403F09848B87
+D73438698EEA
+5F31F6FCD3A0
+A0974382C4C5
+A82045A10949
+#
+# Data from https://pastebin.com/2iV8h93h
+#
+# funnivarium
+# forum ankara
+2602FFFFFFFF
+#
+# macera adasi
+# ankara kentpark
+# INACTIVE
+0A4600FF00FF
+DFF293979FA7
+4D6F62692E45
+4118D7EF0902
+#
+# petrol ofisi
+# positive card
+# ode-gec
+0406080A0C0E
+#
+# konya elkart
+988ACDECDFB0
+120D00FFFFFF
+#
+# bowlingo
+# serdivan avym
+4AE23A562A80
+#
+#  kart 54
+2AFFD6F88B97
+A9F3F289B70C
+DB6819558A25
+6130DFA578A0
+B16B2E573235
+42EF7BF572AB
+274E6101FC5E
+#
+# crazy park
+# kizilay avm
+00DD300F4F10
+#
+# kartsistem B
+FEE2A3FBC5B6
+#
+# toru ent
+# taurus avm
+005078565703
+#
+# Ving?
+0602721E8F06
+FC0B50AF8700
+F7BA51A9434E
+#
+# eskart
+# eskisehir transport card
+E902395C1744
+4051A85E7F2D
+7357EBD483CC
+D8BA1AA9ABA0
+76939DDD9E97
+3BF391815A8D
+#
+# muzekart
+# museum card for turkey
+7C87013A648A
+E8794FB14C63
+9F97C182585B
+EC070A52E539
+C229CE5123D5
+E495D6E69D9C
+26BF1A68B00F
+B1D3BC5A7CCA
+734EBE504CE8
+974A36E2B1BA
+C197AE6D6990
+4D80A10649DF
+037F64F470AD
+C9CD8D7C65E5
+B70B1957FE71
+CE7712C5071D
+C0AD1B72921A
+45FEE09C1D06
+E592ED478E59
+F3C1F1DB1D83
+704A81DDACED
+89E00BC444EF
+AFAAFCC40DEC
+ECC58C5D34CA
+57D83754711D
+D0DDDF2933EC
+240F0BB84681
+9E7168064993
+2F8A867B06B4
+#
+# bursakart
+# bursa transport card
+755D49191A78
+DAC7E0CBA8FD
+68D3263A8CD6
+865B6472B1C0
+0860318A3A89
+1927A45A83D3
+B2FE3B2875A6
+#
+# playland
+# maltepe park
+ABCC1276FCB0
+AABAFFCC7612
+#
+# lunasan
+# kocaeli fair
+26107E7006A0
+#
+# gamefactory
+# ozdilek
+17D071403C20
+#
+#
 534F4C415249
-70C714869DC7
-A7395CCB42A0
-89AA9D743812
-A160FCD5EC4C
-9DCDB136110C
-9951A273DEE7
-AA0857C641A3
-F1A1239A4487
-B882FD4A9F78
-9386E2A48280
-460661C93045
-EF1232AB18A0
-6285A1C8EB5C
-C41514DEFC07
-ABFEDC124578
-046154274C11
-5429D67E1F57
-# SMARTair Key B
-E7316853E731
-CD7FFFF81C4A
-F253C30568C4
-E7D6064C5860
-506DB955F161
-8223205047B6
-070D486BC555
-D4B2D140CB2D
-0C734F230E13
-2E4169A5C79D
-69D92108C8B5
-A297CEB7D34B
+534F4C303232
+#
+# Nespresso, smart card
+# key-gen algo, these keys are for one card (keys diversified)
 FF9A84635BD2
-735175696421
-5D0762D13401
-D61707FFDFB1
-2803BCB0C7E1
-C52876869800
-424C0FFBF657
-AF9E38D36582
-B32464412EE3
-50240A68D1D8
-6B13935CD550
-83F3CB98C258
-521B517352C7
-4BB747E48C2A
-5E594208EF02
-FFFFFF545846
-D65561530174
-52750A0E592A
-112233445566
-2DADE48942C5
-A7765C952DDF
-2CA4A4D68B8E
-72B458D60363
-F088A85E71D7
-FF94F86B09A6
-B27CCAB30DBD
-89ECA97F8C2A
-E00000000000
+6F30126EE7E4
+6039ABB101BB
+F1A1239A4487
+#
+#
+B882FD4A9F78
+CD7FFFF81C4A
+AA0857C641A3
+C8AACD7CF3D1
 9FFDA233B496
+26B85DCA4321
+D4B2D140CB2D
+A7395CCB42A0
+541C417E57C0
+D14E615E0545
+69D92108C8B5
+703265497350
+D75971531042
+10510049D725
+35C649004000
+5B0C7EC83645
+05F5EC05133C
+521B517352C7
+94B6A644DFF6
+2CA4A4D68B8E
+A7765C952DDF
+E2F14D0A0E28
+DC018FC1D126
+4927C97F1D57
+046154274C11
+155332417E00
+6B13935CD550
+C151D998C669
+D973D917A4C7
+130662240200
+9386E2A48280
+52750A0E592A
+075D1A4DD323
+32CA52054416
+460661C93045
+5429D67E1F57
+0C734F230E13
+1F0128447C00
+411053C05273
+42454C4C4147
+C428C4550A75
+730956C72BC2
+28D70900734C
+4F75030AD12B
+6307417353C1
+D65561530174
+D1F71E05AD9D
+F7FA2F629BB1
+0E620691B9FE
+43E69C28F08C
+735175696421
+424C0FFBF657
+51E97FFF51E9
+E7316853E731
+00460740D722
+35D152154017
+5D0762D13401
+0F35D5660653
+1170553E4304
+0C4233587119
+F678905568C3
+50240A68D1D8
+2E71D3BD262A
+540D5E6355CC
+D1417E431949
+4BF6DE347FB6
+#
+#
+3A471B2192BF
+A297CEB7D34B
+AE76242931F1
+#
+#
+124578ABFEDC
+ABFEDC124578
+4578ABFEDC12
+#
+# Data from
+# premier inn hotel chain
+5E594208EF02
+AF9E38D36582
+#
+# Norwegian building site identication card. (HMS KORT)
+# Key a
 10DF4D1859C8
+#
+# Key B
 B5244E79B0C8
+#
+# Ukraine hotel
 F5C1C4C5DE34
-
+#
+# Data from Mifare Classic Tool repo
 # Rotterdam University of applied sciences campus card
 BB7923232725
 A95BD5BB4FC5
@@ -1297,27 +1774,406 @@ B5ADEFCA46C4
 BF3FE47637EC
 B290401B0CAD
 AD11006B0601
-
-# Keys of Armenian underground ticket
-A0A1A2A8A4A5
+#
+# Data from Mifare Classic Tool repo
+# Armenian Metro
+E4410EF8ED2D
+6A68A7D83E11
 0D6057E8133B
 D3F3B958B8A3
-6A68A7D83E11
-7C469FE86855
-E4410EF8ED2D
 3E120568A35C
-CE99FBC8BD26
 2196FAD8115B
-
-# PIK Comfort Moscow keys (ISBC Mifare Plus SE 1K)
-009FB42D98ED
-002E626E2820
-
-# Volgograd (Russia) Volna transport cards keys
-2B787A063D5D
-D37C8F1793F7
-
+7C469FE86855
+CE99FBC8BD26
+#
+# keys from Eurothermes group (Switzerland)
+D66D91829013
+75B691829013
+83E391829013
+A23C91829013
+E46A91829013
+D9E091829013
+FED791829013
+155F91829013
+06CC91829013
+8DDC91829013
+54AF91829013
+29A791829013
+668091829013
+00008627C10A
+#
+# easycard
+310D51E539CA
+2CCDA1358323
+03E0094CEDFE
+562E6EF73DB6
+F53E9F4114A9
+AD38C17DE7D2
+#
+# SUBE cards keys (new)
+2DEB57A3EA8F
+32C1BB023F87
+70E3AD3F2D29
+202ECDCCC642
+3686192D813F
+24501C422387
+2C7813A721C3
+FFE04BE3D995
+D28F090677A1
+DE2D83E2DCCC
+A66A478712EA
+643232ADB2D5
+C7F4A4478415
+95C013B70D99
+3C383889362A
+3C6D9C4A90FA
+51BEDBA005E5
+74BF7363F354
+53B09DB89111
+E98075318085
+2F904641D75F
+7F60AEF68136
+F5C1B3F62FDA
+3E6E5713BA10
+8B75A29D4AB2
+7E6545076619
+#
+# SUBE cards keys (old)
+4C5A766DFE3A
+32C6768847F5
+F68930789631
+8B42B6D64B02
+B627A3CB13F8
+562A4FB8260B
+88DDC24E1671
+91CB7802A559
+7A3E0F5B63FC
+8CA2C9DC8292
+5CCC6D50EAAC
+DE4F5AA9A7F3
+52D0145E1AF5
+C10F92A4E57E
+7D6E7AF43C97
+DE1E7D5F6DF1
+F4CB751B031A
+C54474936B59
+2A1F900D4533
+6303CDCBB233
+F115E91357B3
+BFE25035B0C8
+62FF943EB069
+7C82EF592001
+D5C172325DD3
+992B152E834A
+CE75D7EADEAF
+#
+# Russian Podorozhnik card (Saint-Petersburg transport)
+# may be combined with Troika
+038B5F9B5A2A
+04DC35277635
+0C420A20E056
+152FD0C420A7
+296FC317A513
+29C35FA068FB
+31BEC3D9E510
+462225CD34CF
+4B7CB25354D3
+5583698DF085
+578A9ADA41E3
+6F95887A4FD3
+7600E889ADF9
+86120E488ABF
+8818A9C5D406
+8C90C70CFF4A
+8E65B3AF7D22
+9764FEC3154A
+9BA241DB3F56
+AD2BDC097023
+B0A2AAF3A1BA
+B69D40D1A439
+C956C3B80DA3
+CA96A487DE0B
+D0A4131FB290
+D27058C6E2C7
+E19504C39461
+FA1FBB3F0F1F
+FF16014FEFC7
+#
+# Food GEM
+6686FADE5566
+#
+# Samsung Data Systems (SDS) — Electronic Locks
+# Gen 1 S10 KA/KB is FFFFFFFFFFFF, incompatible with Gen 2 locks
+#
+# SDS Gen 2 S10 KB
+C22E04247D9A
+#
+# Data from Discord, French pool
+# SDS Gen 2 S10 KA
+9B7C25052FC3
+494446555455
+#
+# Data from Discord, seems to be related to ASSA
+427553754D47
+# Keys found on Edith Cowan University Smart Riders
+9A677289564D
+186C59E6AFC9
+DDDAA35A9749
+9D0D0A829F49
+# Mercator Pika Card, Slovenia
+97D77FAE77D3
+5AF445D2B87A
+#
+# Vilniečio/JUDU kortelė, Lithuania
+# A
+16901CB400BC
+F0FE56621A42
+8C187E78EE9C
+FE2A42E85CA8
+# B
+6A6C80423226
+F4CE4AF888AE
+307448829EBC
+C2A0105EB028
+#
+# Keys from Flipper Zero Community
+# Last update: Aug 13, 2022
+#
+# unknown if keys are diversified or static default
+#
+# Strelka Extension
+5C83859F2224
+66B504430416
+70D1CF2C6843
+C4B3BD0ED5F1
+C4D3911AD1B3
+CAD7D4A6A996
+DA898ACBB854
+FEA1295774F9
+#
+# Moscow Public Toilets Card
+807119F81418
+22C8BCD10AAA
+0AAABA420191
+E51B4C22C8BC
+DBF9F79AB7A2
+34EDE51B4C22
+C8BCD10AAABA
+BCD10AAABA42
+#
+# Moscow Social Card
+2F87F74090D1
+E53EAEFE478F
+CE2797E73070
+328A034B93DB
+81E1529AE22B
+FC55C50E579F
+1A72E2337BC3
+5DB52676BE07
+F64FBF085098
+8FE758A8F039
+BB1484CC155D
+41990A529AE2
+CD2E9EE62F77
+69C1327AC20B
+3C9C0D559DE5
+67BF3880C811
+48A01159A1E9
+2B83FB448CD4
+F24BBB044C94
+94F46DB5FD46
+C31C8CD41D65
+BB1684CC155D
+CA2393DB246C
+1D75E52E76BE
+81D9529AE223
+0159C9125AA2
+52AA1B6BB3FB
+97EF60A8F031
+6FC73888D011
+3A92FA438BD3
+74CC3D85CD0E
+025ACA1B63A3
+AF0878C81151
+9BFB6CB4FC45
+F750C0095199
+075FCF1860A8
+2686EE3F87C7
+277FEF3880C0
+82DA4B93DB1C
+9CF46DB5FD46
+93EB64ACF43D
+#
+# Iron Logic RU
+A3A26EF4C6B0
+2C3FEAAE99FC
+E85B73382E1F
+F4ED24C2B998
+CB574C6D3B19
+E092081D724B
+B38D82CF7B6C
+8228D2AA6EFA
+2C7E983588A3
+CF7A7B77E232
+32A7F5EAF87D
+7453A687B5F0
+01A0C008A5B9
+DEC0CEB0CE24
+413BED2AE45B
+D6261A9A4B3F
+CB9D507CE56D
+#
+# Armenian Underground Ticket
+A0A1A2A8A4A5
+#
+# Badge Maker Leaked from https://github.com/UberGuidoZ
+1A1B1C1D1E1F
+1665FE2AE945
+158B51947A8E
+E167EC67C7FF
+D537320FF90E
+5E56BFA9E2C9
+F81CED821B63
+C81584EF5EDF
+9551F8F9259D
+36E1765CE3E8
+509052C8E42E
+776C9B03BE71
+C608E13ADD50
+BEE8B345B949
+ED0EC56EEFDD
+9716D5241E28
+05D1FC14DC31
+3321FB75A356
+F22A78E29880
+EC211D12C98D
+8CCA8F62A551
+B637E46AD674
+39605B3C8917
+3882719778A1
+9F27D36C4230
+DB32A6811327
+8AA8544A2207
+8C5819E780A4
+7549E90353A2
+2E52ABE0CE95
+E46210ED98AB
+61D030C0D7A8
+18E20102821E
+DA59354DFB88
+040047C12B75
+D10008074A6F
+686E736F6E20
+446176696453
+6F6674776172
+6520446F7665
+#
+# Apartment keyfobs (USA) (Corvette830)
+E60F8387F0B9
+FFD46FF6C5EE
+4F9661ED2E70
+576A798C9904
+1C5179C4A8A1
+16CA203B811B
+11AC8C8F3AF2
+#
+# The Westin Jakarta Indonesia (D4DB0D)
+# Peppers Hotel Unknown location (D4D0D)
+6E0DD4136B0A
+141940E9B71B
+3B1D3AAC866E
+95E9EE4CCF8F
+FEA6B332F04A
+BE0EC5155806
+0500D6BFCC4F
+FC5AC7678BE3
+F09BB8DD142D
+B4B3FFEDBE0A
+540E0D2D1D08
+#
+# Schlage 9691T Keyfob (seasnaill)
+7579B671051A
+4F4553746B41
+#
+# Vigik ScanBadge App (fr.badgevigik.scanbadge)
+# Website https://badge-vigik.fr/  (Alex)
+0000A2B3C86F
+021200C20307
+021209197507
+1E34B127AF9C
+303041534956
+4143532D494E
+41454E521985
+43412D627400
+455249524345
+456666456666
+45B722C63319
+484585414354
+4D414C414741
+536563644C65
+57D27B730760
+593DD8FE167A
+6472616E7265
+65626F726369
+680E95F3C287
+709BA7D4F920
+8829DAD9AF76
+92D0A0999CBA
+948EE7CFC9DB
+9EB7C8A6D4E3
+A22AE12C9013
+AFC984A3576E
+#
+# Vigik verified by quantum-x
+# https://github.com/RfidResearchGroup/proxmark3/pull/1742#issuecomment-1206113976
+A00027000099
+A00016000028
+A00003000028
+A0000F000345
+A00001000030
+A00002000086
+A00002000036
+A00002000088
+A00000000058
+A00000000096
+A00000000008
+A00000043D79
+A00000000064
+A00025000030
+A00003000057
+#
+# BH USA 2013 conference
+012279BAD3E5
+#
+# iGuard Simple (and reverse) keys
+AAAAAAFFFFFF
+FFFFFFAAAAAA
+#
+# Random Hotel A Key Sec 0 Blk 3 - KABA Lock (VideoMan)
+3111A3A303EB
+# Transport system Uruguay - STM
+# Shared key - sec 0 blk 3
+D144BD193063
+#
+# Data from http://www.proxmark.org/forum/viewtopic.php?pid=45659#p45659
+3515AE068CAD
+#
+# Keys Catering
+6A0D531DA1A7
+4BB29463DC29
+#
+# Keys Swim
+8627C10A7014
+453857395635
+#
+# Unknown hotel system Sec 0 / A
+353038383134
+#
+# Brazil transport Sec 8 / A
+50d4c54fcdf5
+#
 # Bandai Namco Passport [fka Banapassport] / Sega Aime Card
+# Dumped on the Flipper Devices Discord Server
 6090D00632F5
 019761AA8082
 574343467632
@@ -1351,7 +2207,551 @@ E69DD9015A43
 C8382A233993
 7B304F2A12A6
 FC9418BF788B
+#
+# Guest Cashless Prepaid Arcade Payment Cards
+168168168168
+198407157610
+4E4F584D2101
+4E4F584D2105
+686B35333376
+861861861861
+#
+# Transport System Cracow / Polen
+B071A76BA2E9
+B3A181BCA5F2
+3225942F7717
+80D00703C5FB
+6DD510E080B1
+87529F30FC58
+B75C4FA614AE
+42DC568C64F4
+# Data from "the more the marriott" mifare project (colonelborkmundus)
+# aka The Horde
+#
+# These keys seem to be from Vingcard / Saflok system which means they are diversified
+# and not static default keys.  To verify this, the UID from such a card is needed.
+#
+# 20230125-01, Elite Member Marriott Rewards
+43012BD9EB87
+# 20230125-02, Elite Member Marriott Rewards
+3119A70628EB
+# 20230125-03, Elite Member Marriott Rewards
+23C9FDD9A366
+# 20230125-04, Elite Member Marriott Rewards
+7B4DFC6D6525
+# 20230125-05, Elite Member Marriott Rewards
+1330824CD356
+# 20230125-06, Elite Member Marriott Rewards
+30AAD6A711EF
+# 20230125-07, Fairfield Inn & Suites Marriott
+7B3B589A5525
+# 20230125-08, Moxy Hotels
+20C166C00ADB
+# 20230125-09, Westin Hotels & Resorts
+7D0A1C277C05
+2058580A941F
+8C29F8320617
+# 20230125-10, Westin Hotels & Resorts
+C40964215509
+D44CFC178460
+5697519A8F02
+# 20230125-12, AC Hotels Marriott
+7B56B2B38725
+# 20230125-13, AC Hotels Marriott
+8EA8EC3F2320
+# 20230125-14, Waldorf Astoria Chicago
+011C6CF459E8
+# 20230125-24, Aria Resort & Casino
+A18D9F4E75AF
+# 20230125-25, Aria Resort & Casino
+316B8FAA12EF
+# 20230125-26, Residence Inn Mariott
+3122AE5341EB
+# 20230125-27, Residence Inn Mariott
+F72CD208FDF9
+# 20230125-28, Marriott
+035C70558D7B
+# 20230125-29, Marriott
+12AB4C37BB8B
+# 20230125-30, Marriott
+9966588CB9A0
+# 20230125-31, Sheraton
+42FC522DE987
+# 20230125-32, The Industrialist
+2158E314C3DF
+# 20230125-39, The Ritz-Carlton Balharbour
+30FB20D0EFEF
+# 20230125-40, The Ritz-Carlton Balharbour
+66A3B064CC4B
+# 20230125-41, The Ritz-Carlton Balharbour
+D18296CD9E6E
+# 20230125-42, The Ritz-Carlton Balharbour
+D20289CD9E6E
+# 20230125-44, Graduate Hotels
+209A2B910545
+C49DAE1C6049
+# 20230125-46, AmericInn
+8AC04C1A4A25
+# 20230129-53, Marriott Bonvoy
+6E029927600D
+3E173F64C01C
+C670A9AD6066
+# 20230413-69, Westin
+487339FA02E0
+# 20230413-70, Marriott Bonvoy
+DBD5CA4EE467
+A0B1F234006C
+180DE12B700E
+# 20230413-71, Westin
+1352C68F7A56
+# 20230413-76, Ritz Carlton
+318BD98C1CEF
+# 20230413-77, Marriott
+D23C1CB1216E
+# 20230413-78, Caesars
+A1D92F808CAF
+# 20230413-79, The Cosmopolitan, Vegas
+# 20230413-80, Aria
+1153C319B4F8
+# 20230413-81, Aria
+110C819BBEF8
+# 20230413-82, Aria
+1332117E8756
+# 20230413-83, Kimpton
+500AE915F50A
+5032E362B484
+8B63AB712753
+# 20230413-85, Kimpton
+06106E187106
+2E45C23DC541
+D9FF8BEE7550
+# 20230413-87, Marriott
+42F7A186BF87
+# 20230413-88, Meritage Resort
+D213B093B79A
+# 20230413-89, Meritage Resort
+216024C49EDF
+# 20230413-90, Gaylord Palms
+D201DBB6AB6E
+# 20230413-91, Residence Inn
+9F4AD875BB30
+# 20230413-92, Marriott
+3352DB1E8777
+# 20230413-94, Marriott
+09074A146605
+151F3E85EC46
+#
+# Travelodge by Wyndham Berkeley
+0000FFFFFFFF
+4663ACD2FFFF
+EDC317193709
+# Hotel Santa Cruz
+75FAB77E2E5B
+# saflok brand HOTEL key
+32F093536677
+# A WaterFront Hotel in  Oakland
+3351916B5A77
+# Ballys (2018)
+336E34CC2177
+# Random Hawaiian Hotel
+A1670589B2AF
+# SF Hotel (SoMa area)
+2E0F00700000
+#
+# Unknown PACS from Western Australia
+CA80E51FA52B
+A71E80EA35E1
+05597810D63D
+#
+# Hotel Key from Las Vegas
+EA0CA627FD06
+80BB8436024C
+5044068C5183
+#
+# Key from Hotel M Montreal (probably diversified)
+7E5E05866ED6
+661ABF99AFAD
+#
+# Key from evo Montreal (probably diversified)
+1064BA5D6DF8
+# Hotel key
+CE0F4F15E909
+D60DE9436219
+#
+# ATM Area de Girona, spanish transport card
+A01000000000
+A02000000000
+A03000000000
+A04000000000
+A05000000000
+A06000000000
+A07000000000
+A08000000000
+A09000000000
+A10000000000
+A11000000000
+A12000000000
+A13000000000
+A14000000000
+A15000000000
+B01000000000
+B02000000000
+B03000000000
+B04000000000
+B05000000000
+B06000000000
+B07000000000
+B08000000000
+B09000000000
+B10000000000
+B11000000000
+B12000000000
+B13000000000
+B14000000000
+B15000000000
+#
+# Pittsburgh, PA, USA - Pittsburgh Regional Transit ConnectCard
+A7AE4A5A33DC
+6B857B568C10
+E2CE9A674CBE
+A4896B2EBA4E
+0724DF9AEDE8
+0E368FB140C1
+874EB25C8721
+5C313F4539CD
+C5498606E0A8
+79C69F7EC7C0
+DA7DD0044DA2
+1B8189BD966B
+765584147990
+4B7C7C315E6E
+46CAAD12C524
+53BD03DEA5C9
+D2D72CB60F59
+14D258786538
+E2E89A375B36
+B3FA87DB0C45
+44D3B1561B34
+2817C6E02F97
+A513FF1232E9
+BD454BD52792
+391771654DC8
+5162797F8E1C
+F700BD8E042D
+3973ABFD8B66
+CE8BFF3728EE
+09938D05DA78
+EACDA4DBE420
+EC2B9FD483CA
+#
+# Hotel Intelier Orange - Benicasim, Spain
+# block 1 - key A
+04256CFE0425
+#
+# InsideWash Membership Card - Portugal
+C18063858BB9
+#
+# An apartment building in Sydney Olympic Park
+13254608D0AB
+24A2971BC0B2
+14264709D1AC
+25A3981CC1B3
+1527480AD2AD
+26A4991DC2B4
+1628490BD3AE
+27A59A1EC3B5
+17294A0CD4AF
+28A69B1FC4B6
+182A4B0DD5B0
+29A79C20C5B7
+192B4C0ED6B1
+2AA89D21C6B8
+1A2C4D0FD7B2
+2BA99E22C7B9
+1B2D4E10D8B3
+2CAA9F23C8BA
+1C2E4F11D9B4
+2DABA024C9BB
+1D2F5012DAB5
+2EACA125CABC
+1E305113DBB6
+2FADA226CBBD
+1F315214DCB7
+30AEA327CCBE
+20325315DDB8
+31AFA428CDBF
+21335416DEB9
+32B0A529CEC0
+22345517DFBA
+33B1A62ACFC1
+#
+# Universidade de São Paulo (USP) student card
+17B50E38F1B0
+24E311F594CE
+3794FBFB1A54
+43B229069F6A
+4531952F765F
+4943F2F35E0A
+4985E681EF88
+4F56C88E0337
+710070E92C79
+8A036C5C35D4
+A027BD830A06
+D33673C19243
+D89A506542F2
+E5813CD228F1
+FAB943906E9C
+#
+# R.A.T.T transport card key A/B
+AA034F342A55
+456776908C48
 
+# BusFacil - Brazilian public transport card for some cities
+7b296f353c6b
+3fa7217ec575
+fae9b14365a9
+c567dd4a6004
+c567dd4a6005
+c567dd4a6006
+c567dd4a6007
+c567dd4a6008
+c567dd4a6009
+c567dd4a600a
+c567dd4a600d
+c567dd4a600e
+c567dd4a600f
+5ef014ec5d7f
+5086052022ac
+bd6af9754c18
+5d67d4732a7d
+17fe45604a04
+17fe45604a05
+17fe45604a06
+17fe45604a07
+17fe45604a08
+17fe45604a09
+17fe45604a0a
+17fe45604a0d
+17fe45604a0e
+17fe45604a0f
+# keys for swimming pool cards in Reykjavík Iceland
+28220F14BEF0
+# key for Orkan keyfobs
+300724070486
+# key for Atlantsolía keyfobs
+60FCB3C42ABF
+# key for hotel in greece
+722F24F0722F
+# STS Hotel 2A
+535453535453
+# Public transport in Sofia, Bulgaria (SKGT)
+# upgraded to DESFire since January 2024
+# SKGT common
+# Sector 15, key A
+f618b3d7855a
+# Sector 15, key B
+f1afa4da949f
+# SKGT multi-use ticket
+# Sector 0
+67362dace527
+633a010fa3c3
+# Sector 1
+f93c98655b9c
+67ec0a47b0fb
+# Sector 2
+54a028818ac7
+b2e87e53c5a0
+# Sector 3
+3e93cf0644b6
+79e12280e219
+# Sector 4
+2204b9fbf033
+4537fd238c8e
+# Sector 5
+d1b44a9df05f
+cfa526835a1f
+# Sector 6
+21cc007ad81c
+c097d0a85446
+# Sector 7
+d2268262710f
+730bb7b8b3de
+# Sector 8
+9fe7c5be7dff
+61ae2d920c79
+# Sector 9
+78fcd4470c50
+b638caf7357b
+# Sector 10
+0dc1dd7c8ea2
+4c6a6866b934
+# Sector 11
+03de2ceb2ea1
+93e0118b21ed
+# Sector 12
+8fbced387bf4
+f57ca95c6edd
+# Sector 13
+ef24fe3b4cf7
+8b44d303d62f
+# Sector 14
+b1ea40b2caa6
+3abf8431003b
+# Sector 15 - see above
+# SKGT personalised subscription card
+# Sector 0, 2, 16, key A
+a0a1a2a3a4a5
+# Sector 8-14, 17-39, key A
+ffffffffffff
+# Sector 1, key A
+# blue
+f1df0ca8948b
+# yellow
+7747b4912984
+# Sector 3, key A
+# blue
+09d556d57a4b
+# yellow
+3ed158c6934e
+# Sector 4-7, key A
+# blue
+839dedbfec0d
+# yellow
+c694a9ed2f9e
+# Sector 15 - see above
+# Sector 0, 16, key B (blue)
+81d55f4551b9
+# Sector 0, key B (yellow)
+6e9a040c3c91
+# Sector 1, key B
+# blue
+5b72c63fb416
+# yellow
+a3cdced46371
+# Sector 2, key B
+# blue
+87a61433d026
+# yellow
+9cd3a81f11ab
+# Sector 3, key B
+# blue
+7070d331360c
+# yellow
+836c790f6e2c
+# Sector 4-7, key B
+# blue
+7fe057787c4f
+# yellow
+ff59c6d13f88
+# Sector 8-14, 17-39, key B
+536f6669614d
+# Sector 15 - see above
+# End of SKGT
+# Hanoi Bus Rapid Transit - 1/2/3 A
+AAAFBA10FC37
+C61F2C28DADF
+23AACA30CBF2
+#
+# Keys dumped from student ID (AGH Cracow - Poland), may be diversified
+# Need to be verified
+833E4F32589E
+432D02DA59F3
+5C161CA2716F
+F60B5F9666B8
+98EAC5321D2F
+CC945E3FE5C4
+70783C436CF4
+2D186C7149A9
+5D60AC0939FC
+93A5CE63C873
+87174550E900
+45675B25A3DA
+F91750E629D5
+A3E662ABCDC8
+33D99E9FFA6A
+FF7AABA39C61
+A8248C049BEA
+C2AF731771C4
+9263B2E0DD80
+CE7FCCBBA5D8
+F8E385E5A2A0
+B27678B5C4AE
+D68D7EBB9551
+7AB63F082328
+#
+# Payment cards used by Eurest on certain campuses
+7E2BC58168EB
+#
+# Shower cards provided by Seijsener
+291A65CBEA7B
+344A359BBAD9
+476572726974
+4D696368656C
+4F3748E6C826
+69D40AF8B353
+72DEA10F21DF
+74845AA8E3F1
+8C3C43EDCC55
+ACD30DFFB434
+D1A27C8EC5DF
+F14D329CBDBE
+#
+# Hotel cards from Austria
+AB287B3B4903
+7B0DEDA7E162
+#
+#Metro Q transit cards from Huston, Texas
+373B72D34B80
+BF3FFC245C9b
+7D1D9E7CF8A7
+6A917BF357E6
+B1D461EC62CA
+C6BECABEBE8A
+66026782D435
+4547E34E40D9
+753897b99AAE
+1C36761E8ABD
+6D8FBD8CC524
+5A3274779706
+23F13602CC1A
+511C1C2C9804
+F8B2B926555E
+2593E37D9B2E
+41A1F17EE990
+64DD48AEDE88
+7915ED4D9903
+D139DD71DB92
+216D97D46E88
+D9D1C447E427
+911E789433CB
+93B43D689F85
+525A869053F1
+69B25667E0B4
+6AACA2D97645
+# UK London Office
+435DF6296EC4
+2338B4913222
+# Acces card of students, and more in Occitanie, France
+E9A553102EA5
+F982E971CFED
+1F42AB9159EE
+BBFB836A48B8
+B5D170B2E8F5
+E76978A05F10
+0B1A995DD007
+650DB9CEDB6B
+13E54B4448B7
+3E3540C2C273
+A76152840117
+066CCC7666BC
+3C0B3AC3AFA3
+CCB541598D72
+1988B5D48EC3
+892EEF0D30FB
+0FE5CE5CC640
+# Volgograd (Russia) Volna transport cards keys
+2B787A063D5D
+D37C8F1793F7
 # H World Hotel Chain Room Keys
 543071543071
 5F01015F0101

From dd6e0a9b721c09b82a127aadd0a1accba8b18f7c Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:53:09 +0300
Subject: [PATCH 09/14] keeloq jolly motors add full support with add manually

thanks @pkooiman !
---
 .../main/subghz/helpers/subghz_custom_event.h |   1 +
 .../resources/subghz/assets/keeloq_mfcodes    | 117 +++++++++---------
 .../subghz/scenes/subghz_scene_set_type.c     |  11 ++
 3 files changed, 71 insertions(+), 58 deletions(-)

diff --git a/applications/main/subghz/helpers/subghz_custom_event.h b/applications/main/subghz/helpers/subghz_custom_event.h
index e28c018d8..093ca9526 100644
--- a/applications/main/subghz/helpers/subghz_custom_event.h
+++ b/applications/main/subghz/helpers/subghz_custom_event.h
@@ -82,6 +82,7 @@ typedef enum {
     SetTypeAllmatic868,
     SetTypeCenturion433,
     SetTypeMonarch433,
+    SetTypeJollyMotors433,
     SetTypeSommer_FM_434,
     SetTypeSommer_FM_868,
     SetTypeSommer_FM238_434,
diff --git a/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes
index 23b7a031a..97e1aab47 100644
--- a/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes
+++ b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes
@@ -1,61 +1,62 @@
 Filetype: Flipper SubGhz Keystore File
 Version: 0
 Encryption: 1
-IV: 46 75 72 72 79 20 63 68 65 63 6B 20 3F 3F 21 21
-3FF98B52C38558ECDB26C3E86D118FAC9AF22EDDDE7649CB53726855CEBCCF9E
-06B901C6E36E381B4A83554ED972288977F999C232106D337C3BE4A9A44608F8
-8153E6CAF4B272BA0EA168B9F0F29CF02CEB33E4ABBD4D5C858D1ADBFF474A25
-F61216CE3A7E500E0C9B2173F91C2E7B1BB7D7AA65D4150EAC28169116647DDD
-A3ABC262415035A190447EC9C15CFD1AB1720560AB7C82D7447215342305299732776A9A6DEA4D359C52A23BFCE6B015
-5784D0E77A55E1361F47A1F6CFFBFAF715CFCAD2BD502ED266AA86DC47F98541
-E082BF64C75023F23FB333C53F2590F408FD932EB71DF4ED4D0E0EAF2AEBD488
-EFF328889D57D9F4B9111918F9C9BC641645104223009842FFF7B6F73E24E5B7
-BDCD1DBCBCA789C5A5C3623C0A287D791F1CACCBBD7D144E2EF1F92DA5513D90
-6310362BE6ED7CB5E3F4CA84D3093DF620BABD2C9D419A2BA5AA05F241EE7592
-4C6F97C553276D5403103A6BA6C4DBBE017A9E4159E6E5AC4C28ACD645DB1E8D4551CDC228A0457BEEF49179A081E1FD
-861ECA071AEEF3854005FEC9BF22C7DB76D07B7930968314FFAC70995E28680E473F8A1A7E56E8776EDD1C6E2DD6DD26
-55ADDFBE97BCB0FB43EDEB9CAFF9F32DD788A6306D3702BC2923DA5C69F5F0A5
-AB838DA2B25547AA43DEB7FB40B15E289B9209057BE564E7CB78F0D5DCFC65FD
-21BACE924E522AD0E97F0AAF64A9DB6A5F7BA09B3A1759AAFD4016F3ADD4353D
-4B37D449E44BAE7F377EE5CE52E94882E42617417F77ECE9803D9435892167F2
-E63BA93D98BB3EEEAD34B38C5F271FB777AEABD9E6A05597AE09815E578AA811900AE9F144FBEC7DBFDDEC87D1ED368B
-7DF24DCB7D73F1638FFD22325463B23C101653EE770F086D323BE90868A7E267
-18E533990C408061309323675116429652B3F4D228F00D704310E7AB26F6BAF4
-26042EC21D73490D9E7F968EDCC4CECF3989E6E982427DEB7012478E214CED8797A9BEBC481C81E9646214809A409B4A
-AC4169C26E402720F1E2A0AD690AE2CF708CE203898BC7102178A738C70F361718E794F0D0CB1A2F1938EF35CCA11887
-6962CADB9BD1B86B779DF7F4D7E06E92EB42474C7FD9EA23879F9982D7127357
-23AEC0F6F9FF529DDDCD1CDAA77F7B136CE2CCD3AC8B949954D5D3B2ECFA8CBC
-C6A3A849BC4A8DB438065255BD387DCD77AD7E7FEB3B0E11B6D3A43279AB9087
-CCB71F8BDC8B31F36D6141B3B57BF31B7EDF72B87593B7497871F5738A0B7E00
-345FE0FAD3F60C017D9793406981878EA2226072D624208AC33682793B415C41
-78AF1FCFDB780744708DBB547F7C3F095BA5FAFB34FA83BF4323B32829836ED1
-C2F19F077E71E710D39F5F11C1FE55C2A3CD6F33384CD8603288765F266F1BDF
-084B1A9565AFC88900D0FF25413E659E17AAB649DB2B7A9F0381CB0DF6D2B8E5
-568CECD994676CF3D6B225DEF21D40787DCB41C101F52B0C5AA43ED66709D158
-0742E0AAB6504AC63A9C59FBDD980BD4C4760EFF3E556C8A6241442CDDD23A74
-37BB60EE11BEC7D25A607DE9B0B6D3EAD23321AFEB94995FAB42184A95D1CADA
-42FD71B98A3BEE9CF372B03E158D51181BFAA9CF54F7300A93FE7665402B3D1F
-9346B7D12346E264E84F91145EBF86C53DD0061E0FA6556FAE5F6FBB8CEB799E
-430B0D7FC09C09051AEB667A370E6D9D9BDF0C0C553AD2791682D43CE5DC48B7
-5BBB5129797BC07CDC1D25A8A919A637B9FFF2F920BD42D1721018ABF8D34959AF877AFF450AD91548184E1A0D991CC8
-0BC8D3E1C2D9A8FB445FC55564471007A28C09C9CE602203176F1BFF02AC6328
-1C4CA912791BCD9CB231C64AB479AF240D02EC9F431D7C479B9A172E5B97F5CD
-15A9CDF17E72255DE0942C09E67CD251C3D465246845F9C0B97A7EFEE4AF9110
-F95543395BFF39B0A093AC80D0EF1BEFA218A3769D074250414D1357105A4D34
-138D433824E691C6B67A08CF1DDE55FBCA2D65AC0B7D9320EA1FDCB1742B11BF
-3BE3A385F1C0B8922C4E23EFF6912748DF715A4546CECB5E8972C1D1E47D0D3A
-9ECA2554ED36700326F2E5140C434ADA8DFF55A53382F19541E9AAE45DA5CBF2
-5C75D528678AF199E191C49F310913F401014F97EEA5FA507C7310B48A98FDE3297EA398B08959951FF99EDDB64C5E0D
-22A9C66645B3944925A496D9F2312429CC787B6314948B482EAD9360124F59DA
-DA3A8571664DBBFC1DE97B53E7C141554A2FBCEBA980696D32409CC5ADB7FC41
-20A52AABC518FCC2FC75AE3F5CC7C4838AA4973111DA696B890D884A18098D91
-EBB7163F580A1A5D26F12FBE650A227791193BA9AFCE277584B171F2FE1C77CF
-86369EE5277CB81B9417B6232F8D994FAEAB34D0D5363B143257C62B10CACAFD
-2E2EAB32891E172A3C31D434703480E69793435BB198E6AA06AA066EE8234D85
-745FC576D77C41BAEFF15A822E6B4058A485A2CAA0A3B283928D17AC02299AD9
-1FF8D49F2F7D785D64B6FE365CD9C2BD958E9527F66BB8A85C9AEBC73ECFE064
-3CFB77F3E274C1EB2772CDFA7B5B17255C2554198BE60C058A3405AEC644FABC5AAECC8F9C7F4A4E5B2D5252E8C62628
-AE514C44B55A1A4744E1106FD226C587D1B71CA7B5DCF010265D769E22012866
-2B2D787A4B0F30CAB9CD3DBC7686165637F091B31745CAB53B369A804F76F9EE
-EA4279C80F0B4AC0B32AB9E8B8CFB9C25FF81840BEE65B2160F85E56FA576C48
-E41D853750D68643E929F94F46BCDC050040935883E9A0C45BB238CDE06340DD745BDA7D6C16AE2B028E073EDDC0FC49
+IV: 46 75 72 69 20 63 68 65 63 6B 20 4F 77 4F 21 3F
+796353C129CC2B688FE158D36E82001F7450D58DD763BCF4D6FA1CE6C3D598EA
+1E7DDEB3B54A42B8993C32AF209CBCC9A1137CE334449F016B993D673EB15C69
+F9CB2DDC4E3D45694292C7DE45F1DC0BD74235B36F624AF39E8C3D211A713408
+538F46EF4250801434FEA469EE07E8C8BF71C6179442718A05455BB501D797C4
+F2BF384DBF7F828E025F020E47D1D637B497FB470444F0C6F9DC67C6830EDDE8A26A6EE89A321D3924D9099895AB2EA1
+2CA8A8A4866D5C2B715B520F641B41355A81BA73170842233806D8AA3E3F3D62
+80CF5DEF931CF902EE602319F7CD506D42E5FBC06ABBF9F05D474C8E8A2AAC4E
+15CB465F7A646226C987BB4928E92A61F350ADCDDE355B717730ADDD1B738950
+86B7597ED3EDF6826124ABD7AE419197DC4A93FA064179ACAD853EC670F93995
+28263A286F1ADA0E851E8A27AFD7706CF3513D8A24D41CF7E24A925FE3D86305
+AF29A08AB877F12681706D71B82B8E2447DA18EBF9731EF3CE91FA5ECAC4E98F8FDC817E0F67C3D7348DD2AF128F1E62
+A675C5BB6AC41336B5F5A27FC062FBF30DC39B1E5C498F0FD823261C3177FA58416C5402554742370CB0DAFD2895F6F8
+0073790C26BD0224F5560161A4D4C4F8E05498E995FD2BF12EA9926A5127E9A5
+235ADFE253B51260DCF5C66F9CB9602B91A0C57BE14D1BE1E11EB309643B29DB
+F9C2E3A926AAA108F474075F0B4EDFF3135492B1529EAB150CF78E748BF36E17
+50F442CC9D90B9FF8C786245EC442B911A28A04D829D0E45D7D2D4C5A3F5B864
+9EA00CD21C0BE1BB15A0CAD31097A44CAF42868F259E8ED25F361986C26161514FA85D78F3889B4185D2A1484C1DA88C
+52DFE7D9052F29071922876723C30CF6FE6247D6439590C5C7C0493120ACA096
+D5AF176D59779A92F6EFB34F271D76D60780C3EA83306326E0119CD3B0417687
+C4CC4E589CCCEC609B4DE39F926F83CCFFCC966871B9A998514910A3F59E86FB56C476DFFB4181E3D22E86A760C4C137
+50A64FEDA64B61A5C123906426EF726D98AC70C15F38245A931B5649F0944930679513D9862091275F10A804EBB610DE
+E7938C4F32E571582D73F855ACC40FF0153EFBAB6D184F2DBE8EAC63C4276D92
+7667993F35F1363C0A3AEB5222F07F91904B3F6FA375BF062B269B09706764CB
+9DF764EE4A70D331BA8870F4D27C3E90E811A5E306BC72701A99A0377AC7B189
+324D0FBC096A489983C45E82B2745A83A3725A87D2D2CA676A521075065D5047
+8EA1A30AE08CEBD03A52EB2512C7C69CB824E0B9BE900E25F15FAB17ADBB1188
+CE379182103FC4E0442745F6F202AB6ED8EBC051B5F5537916938D9DB8FCD6BE
+752BD22AA37D030C60E48CB57309AF631682AC4A0D67C3A7D1130EB056717FB6
+9ECFE7D24BF25BD543E1EAE8116D95C110BD4514EE279BCA71234865EB9166BD
+14B3FA8704BA3B284C65F1A6FD114E53B883E12EAFB24B574F84585BD20157DA
+D026E1E2CA70E33291482EEFCE11123540BBF591D400C92CEBB8CAF99A9DE882
+88E618EF5E76D1F5A60926D48D3D58FF67B4A92DE6EECA271EDAFC2419AE787B
+74E14AD8ADE2BC575048325D1B3990669CDB35D840169B913043DAC938862AE4
+BEB5388B6A7D5C9EF65BDD7577D1DD654B7FAECE5A4CF0937BB7D0C0C5494CD0
+761356D494E3C947CBDCA887A30071A675FE1BE6E77FC9016DB9B5659B7FF9E7
+7503725DFC7212F5F719AFC9DF29F07321511BE4896E12D1D10C68BB07C6483A2CE5FFDFD074CFC279E42E6DD860C496
+BD03D78399DE44449AEE9F00EBCABBF419EDEA1701B9979A97D57AECB5139D1E
+E80EB84DF9DA2E34B78F50D6488A30F8EFD11E7C6DBEB7CFEDE83BE5CA86B6DF
+9332A130138F2AC11A12030CF43EFF77E7CABE761EDE14748112E13267496CE9
+E657F3C95EEF0AF92A5C49F66BD9C053A82493C7D6267F1E7C038473AE488116
+6F37491FFE130F90B77D7E5EA4AA75A1DB0CA3644F68B6502DFC302DDB80367B
+3B37C5CCDD510873628D92B352907FEFF0AC2B38C751C2E46C3B97C3E365972B
+A4C845187BEC75669234EE07B839DCFF618678D2EAA5596350F0936A400099A5
+2C961EF4F2454771B2646ECBAA1D0B7DAA2FD8ECC7228037A36E24FE30C43ABAA446C1B5968C0E2DD141C55557A4CCB8
+C4E0D43E9670C2B91F6AF03D60F216625CC19C697331BC443194D2BB88E042DF
+3DC5584F43061AF79907D6342DF3344435B5AA6277B33D7DC56C429D1EB81BC4
+D9186791E907CBB9EF26EDDAEA9F0DBC8D24E213E55942ED5E1790B5A55F8758
+2B54CB727BBFD8567543448D2D24B3865329F89936D3B035ED2185BA88F1DF2E
+A08F0D881AF001E52FF2CF9D232A9A566EB1900B351AFEEFEE666BEC40588F64
+46A11CA89BA1998A247275EEDF504DAFC5F97B41DFF4943F531A9F8F43DF19C5
+EF70A3858E84B13DF606317381B2E9DFFC346E96AF7C1DF0001586B8BF35808F
+38EAF18DB8096C7427EBD36CBC5B0E945A3286278CC0227EB056F7ACB9E450D4
+28278D1DAA263E9A45ED17F67F6B6B0CF00F8C0F58F86C8161F8D4266FE556CB
+0B0C79FDD7C9EA31FAA4AA829EDDD2A3453C05A74F5B53BBEAE83E1F4913FD1C18BD235D14D06D9E567DDB273E4C1F2A
+7D663A93AE1B9A2E00E944B92838DED3376E09C5179C8F3037B2EAE9E7326C2A
+D64EC2C7BD8CFA152368DF6BB75D66EF24EAA9C864A1386184B793C0585D82BC
+51D8EB188E833891CCD15919FAC8FE56ACAB1007699F4FDCB53A6DDAB02E5CAA
+650866D34DECD1D1F3559EFD8D2A4C1DB51C005F5932608CB6062B384D7A1F59C8E3FBF2C0A5AEFFB631D7B88A630AAB
diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c
index a03c194f8..6c3e44894 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_type.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_type.c
@@ -29,6 +29,7 @@ static const char* submenu_names[SetTypeMAX] = {
     [SetTypeAllmatic868] = "KL: Allmatic 868MHz",
     [SetTypeCenturion433] = "KL: Centurion 433MHz",
     [SetTypeMonarch433] = "KL: Monarch 433MHz",
+    [SetTypeJollyMotors433] = "KL: Jolly Mot. 433MHz",
     [SetTypeSommer_FM_434] = "KL: Sommer 434MHz",
     [SetTypeSommer_FM_868] = "KL: Sommer 868MHz",
     [SetTypeSommer_FM238_434] = "KL: Sommer fm2 434Mhz",
@@ -428,6 +429,16 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 .keeloq.cnt = 0x03,
                 .keeloq.manuf = "Monarch"};
             break;
+        case SetTypeJollyMotors433:
+            gen_info = (GenInfo){
+                .type = GenKeeloq,
+                .mod = "AM650",
+                .freq = 433920000,
+                .keeloq.serial = (key & 0x000FFFFF),
+                .keeloq.btn = 0x02,
+                .keeloq.cnt = 0x03,
+                .keeloq.manuf = "Jolly_Motors"};
+            break;
         case SetTypeElmesElectronic:
             gen_info = (GenInfo){
                 .type = GenKeeloq,

From c9bc05199e24e059a394f97cb36f90a2927b2d4d Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:18:51 +0300
Subject: [PATCH 10/14] add auto power off timer setting [ci skip]

by @Dmitry422 with little fixes by @xMasterX
---
 applications/services/desktop/desktop.c       | 55 +++++++++++++++++++
 applications/services/desktop/desktop_i.h     |  3 +
 .../services/desktop/desktop_settings.c       | 40 ++++++++++----
 .../services/desktop/desktop_settings.h       |  3 +
 .../scenes/desktop_settings_scene_start.c     | 35 ++++++++++++
 5 files changed, 124 insertions(+), 12 deletions(-)

diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 1132760d5..8b24e38f0 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -19,6 +19,12 @@ static void desktop_auto_lock_arm(Desktop*);
 static void desktop_auto_lock_inhibit(Desktop*);
 static void desktop_start_auto_lock_timer(Desktop*);
 static void desktop_apply_settings(Desktop*);
+//--- auto_power_off_timer
+#include <power/power_service/power.h>
+static void desktop_start_auto_poweroff_timer(Desktop*);
+static void desktop_auto_poweroff_arm(Desktop*);
+static void desktop_auto_poweroff_inhibit(Desktop*);
+//---
 
 static void desktop_loader_callback(const void* message, void* context) {
     furi_assert(context);
@@ -131,6 +137,9 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
         }
 
         desktop_auto_lock_inhibit(desktop);
+        //--- auto_power_off_timer
+        desktop_auto_poweroff_inhibit(desktop);
+        //--
         desktop->app_running = true;
 
         furi_semaphore_release(desktop->animation_semaphore);
@@ -138,6 +147,9 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
     } else if(event == DesktopGlobalAfterAppFinished) {
         animation_manager_load_and_continue_animation(desktop->animation_manager);
         desktop_auto_lock_arm(desktop);
+        //--- auto_power_off_timer
+        desktop_auto_poweroff_arm(desktop);
+        //---
         desktop->app_running = false;
 
     } else if(event == DesktopGlobalAutoLock) {
@@ -179,6 +191,9 @@ static void desktop_input_event_callback(const void* value, void* context) {
     Desktop* desktop = context;
     if(event->type == InputTypePress) {
         desktop_start_auto_lock_timer(desktop);
+        //--- m96yda
+        desktop_start_auto_poweroff_timer(desktop);
+        //---
     }
 }
 
@@ -213,6 +228,39 @@ static void desktop_auto_lock_inhibit(Desktop* desktop) {
     }
 }
 
+//--- auto_power_off_timer
+static void desktop_auto_poweroff_timer_callback(void* context) {
+    UNUSED(context);
+    Power* power = furi_record_open(RECORD_POWER);
+    power_off(power);
+}
+
+static void desktop_start_auto_poweroff_timer(Desktop* desktop) {
+    furi_timer_start(
+        desktop->auto_poweroff_timer, furi_ms_to_ticks(desktop->settings.auto_poweroff_delay_ms));
+}
+
+static void desktop_stop_auto_poweroff_timer(Desktop* desktop) {
+    furi_timer_stop(desktop->auto_poweroff_timer);
+}
+
+static void desktop_auto_poweroff_arm(Desktop* desktop) {
+    if(desktop->settings.auto_poweroff_delay_ms) {
+        desktop->input_events_subscription = furi_pubsub_subscribe(
+            desktop->input_events_pubsub, desktop_input_event_callback, desktop);
+        desktop_start_auto_poweroff_timer(desktop);
+    }
+}
+
+static void desktop_auto_poweroff_inhibit(Desktop* desktop) {
+    desktop_stop_auto_poweroff_timer(desktop);
+    if(desktop->input_events_subscription) {
+        furi_pubsub_unsubscribe(desktop->input_events_pubsub, desktop->input_events_subscription);
+        desktop->input_events_subscription = NULL;
+    }
+}
+//---
+
 static void desktop_clock_timer_callback(void* context) {
     furi_assert(context);
     Desktop* desktop = context;
@@ -238,6 +286,9 @@ static void desktop_apply_settings(Desktop* desktop) {
 
     if(!desktop->app_running && !desktop->locked) {
         desktop_auto_lock_arm(desktop);
+        //--- auto_power_off_timer
+        desktop_auto_poweroff_arm(desktop);
+        //---
     }
 
     desktop->in_transition = false;
@@ -373,6 +424,10 @@ static Desktop* desktop_alloc(void) {
 
     desktop->auto_lock_timer =
         furi_timer_alloc(desktop_auto_lock_timer_callback, FuriTimerTypeOnce, desktop);
+    //--- auto_power_off_timer
+    desktop->auto_poweroff_timer =
+        furi_timer_alloc(desktop_auto_poweroff_timer_callback, FuriTimerTypeOnce, desktop);
+    //---
 
     desktop->status_pubsub = furi_pubsub_alloc();
 
diff --git a/applications/services/desktop/desktop_i.h b/applications/services/desktop/desktop_i.h
index 1dc7c7d21..abf5cd579 100644
--- a/applications/services/desktop/desktop_i.h
+++ b/applications/services/desktop/desktop_i.h
@@ -75,6 +75,9 @@ struct Desktop {
 
     FuriTimer* auto_lock_timer;
     FuriTimer* update_clock_timer;
+    //--- auto_power_off_timer
+    FuriTimer* auto_poweroff_timer;
+    //---
 
     AnimationManager* animation_manager;
     FuriSemaphore* animation_semaphore;
diff --git a/applications/services/desktop/desktop_settings.c b/applications/services/desktop/desktop_settings.c
index 828ec5f0d..45b9e5ee3 100644
--- a/applications/services/desktop/desktop_settings.c
+++ b/applications/services/desktop/desktop_settings.c
@@ -6,16 +6,20 @@
 
 #define TAG "DesktopSettings"
 
-#define DESKTOP_SETTINGS_VER_13 (13)
-#define DESKTOP_SETTINGS_VER    (14)
+#define DESKTOP_SETTINGS_VER_14 (14)
+#define DESKTOP_SETTINGS_VER    (15)
 
 #define DESKTOP_SETTINGS_PATH  INT_PATH(DESKTOP_SETTINGS_FILE_NAME)
 #define DESKTOP_SETTINGS_MAGIC (0x17)
 
 typedef struct {
-    uint8_t reserved[11];
-    DesktopSettings settings;
-} DesktopSettingsV13;
+    uint32_t auto_lock_delay_ms;
+    uint8_t displayBatteryPercentage;
+    uint8_t dummy_mode;
+    uint8_t display_clock;
+    FavoriteApp favorite_apps[FavoriteAppNumber];
+    FavoriteApp dummy_apps[DummyAppNumber];
+} DesktopSettingsV14;
 
 // Actual size of DesktopSettings v13
 //static_assert(sizeof(DesktopSettingsV13) == 1234);
@@ -37,21 +41,33 @@ void desktop_settings_load(DesktopSettings* settings) {
                 DESKTOP_SETTINGS_MAGIC,
                 DESKTOP_SETTINGS_VER);
 
-        } else if(version == DESKTOP_SETTINGS_VER_13) {
-            DesktopSettingsV13* settings_v13 = malloc(sizeof(DesktopSettingsV13));
+        } else if(version == DESKTOP_SETTINGS_VER_14) {
+            DesktopSettingsV14* settings_v14 = malloc(sizeof(DesktopSettingsV14));
 
             success = saved_struct_load(
                 DESKTOP_SETTINGS_PATH,
-                settings_v13,
-                sizeof(DesktopSettingsV13),
+                settings_v14,
+                sizeof(DesktopSettingsV14),
                 DESKTOP_SETTINGS_MAGIC,
-                DESKTOP_SETTINGS_VER_13);
+                DESKTOP_SETTINGS_VER_14);
 
             if(success) {
-                *settings = settings_v13->settings;
+                settings->auto_lock_delay_ms = settings_v14->auto_lock_delay_ms;
+                settings->auto_poweroff_delay_ms = 0;
+                settings->displayBatteryPercentage = settings_v14->displayBatteryPercentage;
+                settings->dummy_mode = settings_v14->dummy_mode;
+                settings->display_clock = settings_v14->display_clock;
+                memcpy(
+                    settings_v14->favorite_apps,
+                    settings->favorite_apps,
+                    sizeof(settings_v14->favorite_apps));
+                memcpy(
+                    settings_v14->dummy_apps,
+                    settings->dummy_apps,
+                    sizeof(settings_v14->dummy_apps));
             }
 
-            free(settings_v13);
+            free(settings_v14);
         }
 
     } while(false);
diff --git a/applications/services/desktop/desktop_settings.h b/applications/services/desktop/desktop_settings.h
index ba5a78840..e2e91d2dd 100644
--- a/applications/services/desktop/desktop_settings.h
+++ b/applications/services/desktop/desktop_settings.h
@@ -38,6 +38,9 @@ typedef struct {
 
 typedef struct {
     uint32_t auto_lock_delay_ms;
+    //--- auto_power_off_timer
+    uint32_t auto_poweroff_delay_ms;
+    //---
     uint8_t displayBatteryPercentage;
     uint8_t dummy_mode;
     uint8_t display_clock;
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index 04cb0182b..9954a2c28 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -28,6 +28,15 @@ typedef enum {
     DesktopSettingsDummyOkLong,
 } DesktopSettingsEntry;
 
+// --- auto_power_off_timer
+#define AUTO_POWEROFF_DELAY_COUNT 8
+const char* const auto_poweroff_delay_text[AUTO_POWEROFF_DELAY_COUNT] =
+    {"OFF", "5min", "10min", "15min", "30min", "45min", "60min", "90min"};
+
+const uint32_t auto_poweroff_delay_value[AUTO_POWEROFF_DELAY_COUNT] =
+    {0, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
+// ---
+
 #define AUTO_LOCK_DELAY_COUNT 9
 const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = {
     "OFF",
@@ -86,6 +95,16 @@ static void desktop_settings_scene_start_clock_enable_changed(VariableItem* item
     app->settings.display_clock = index;
 }
 
+// --- auto_power_off_timer
+static void desktop_settings_scene_start_auto_poweroff_delay_changed(VariableItem* item) {
+    DesktopSettingsApp* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, auto_poweroff_delay_text[index]);
+    app->settings.auto_poweroff_delay_ms = auto_poweroff_delay_value[index];
+}
+// ---
+
 static void desktop_settings_scene_start_auto_lock_delay_changed(VariableItem* item) {
     DesktopSettingsApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -115,6 +134,22 @@ void desktop_settings_scene_start_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, auto_lock_delay_text[value_index]);
 
+    // --- auto_power_off_timer
+    item = variable_item_list_add(
+        variable_item_list,
+        "Auto PowerOff",
+        AUTO_POWEROFF_DELAY_COUNT,
+        desktop_settings_scene_start_auto_poweroff_delay_changed,
+        app);
+
+    value_index = value_index_uint32(
+        app->settings.auto_poweroff_delay_ms,
+        auto_poweroff_delay_value,
+        AUTO_POWEROFF_DELAY_COUNT);
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, auto_poweroff_delay_text[value_index]);
+    // ---
+
     item = variable_item_list_add(
         variable_item_list,
         "Battery View",

From d566f650bdf4f8f1669b41ebeb8fbc280cd677ec Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:20:41 +0300
Subject: [PATCH 11/14] fix order [ci skip]

---
 .../desktop_settings/scenes/desktop_settings_scene_start.c       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index 9954a2c28..f674380af 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -9,6 +9,7 @@
 typedef enum {
     DesktopSettingsPinSetup = 0,
     DesktopSettingsAutoLockDelay,
+    DesktopSettingsAutoPowerOff,
     DesktopSettingsBatteryDisplay,
     DesktopSettingsClockDisplay,
     DesktopSettingsChangeName,

From 53fa3f85b30de8c236a768257fe8317143041bc8 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:51:06 +0300
Subject: [PATCH 12/14] upd changelog

---
 CHANGELOG.md                            | 7 ++++++-
 applications/services/desktop/desktop.c | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5058c114..f12e3bd56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,14 @@
 ## Main changes
 - Current API: 78.2
+* SubGHz: Jolly Motors support (with add manually) (Thanks @pkooiman !)
+* Desktop: Auto Power Off Timer (by @Dmitry422 with some fixes by @xMasterX)
+* OFW PR 4025: Increase system stack's reserved memory size (Fix USB UART Bridge Crash) (by @Astrrra)
 * OFW: merged gsurkov/vcp_break_support branch for usb uart bridge (WIP!!!)
 * Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
 ## Other changes
-* No changes yet :(
+* OFW: NFC: Plantain parser Last payment amount fix 
+* OFW: NFC clipper: BART station ids for San Lorenzo, Bay Fair
+* OFW: Fix typo for mf_classic_key_cahce_get_next_key() function
 <br><br>
 #### Known NFC post-refactor regressions list: 
 - Mifare Mini clones reading is broken (original mini working fine) (OFW)
diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 8b24e38f0..9366d6508 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -191,7 +191,7 @@ static void desktop_input_event_callback(const void* value, void* context) {
     Desktop* desktop = context;
     if(event->type == InputTypePress) {
         desktop_start_auto_lock_timer(desktop);
-        //--- m96yda
+        //--- auto_power_off_timer
         desktop_start_auto_poweroff_timer(desktop);
         //---
     }

From 306b7285879abe05b1e3e7bfdca6442c86161b94 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sun, 8 Dec 2024 13:39:34 +0300
Subject: [PATCH 13/14] fix wrong order

---
 applications/services/desktop/desktop_settings.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/applications/services/desktop/desktop_settings.c b/applications/services/desktop/desktop_settings.c
index 45b9e5ee3..7a99dd365 100644
--- a/applications/services/desktop/desktop_settings.c
+++ b/applications/services/desktop/desktop_settings.c
@@ -58,13 +58,11 @@ void desktop_settings_load(DesktopSettings* settings) {
                 settings->dummy_mode = settings_v14->dummy_mode;
                 settings->display_clock = settings_v14->display_clock;
                 memcpy(
-                    settings_v14->favorite_apps,
                     settings->favorite_apps,
-                    sizeof(settings_v14->favorite_apps));
+                    settings_v14->favorite_apps,
+                    sizeof(settings->favorite_apps));
                 memcpy(
-                    settings_v14->dummy_apps,
-                    settings->dummy_apps,
-                    sizeof(settings_v14->dummy_apps));
+                    settings->dummy_apps, settings_v14->dummy_apps, sizeof(settings->dummy_apps));
             }
 
             free(settings_v14);

From bed41647503ca124743783f9e6a9fdd074e20e6f Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 10 Dec 2024 04:07:42 +0000
Subject: [PATCH 14/14] Remove duplicates

---
 .../resources/nfc/assets/mf_classic_dict.nfc  |  6 +---
 scripts/fix_mfc_dict.py                       | 32 +++++++++----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
index 8f4889d70..9762732f5 100644
--- a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
+++ b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
@@ -1,4 +1,4 @@
-# Key dictionary from https://github.com/RfidResearchGroup/proxmark3/
+# Key dictionary from https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_default_keys.dic
 #
 # Mifare Default Keys
 #   -- iceman fork version --
@@ -2507,8 +2507,6 @@ AA034F342A55
 456776908C48
 
 # BusFacil - Brazilian public transport card for some cities
-7b296f353c6b
-3fa7217ec575
 fae9b14365a9
 c567dd4a6004
 c567dd4a6005
@@ -2600,9 +2598,7 @@ b1ea40b2caa6
 # Sector 15 - see above
 # SKGT personalised subscription card
 # Sector 0, 2, 16, key A
-a0a1a2a3a4a5
 # Sector 8-14, 17-39, key A
-ffffffffffff
 # Sector 1, key A
 # blue
 f1df0ca8948b
diff --git a/scripts/fix_mfc_dict.py b/scripts/fix_mfc_dict.py
index f89973d3c..1b2713e1a 100755
--- a/scripts/fix_mfc_dict.py
+++ b/scripts/fix_mfc_dict.py
@@ -2,33 +2,31 @@
 import pathlib
 import string
 
+KEY_LENGTH = 12
+
 file = (
     pathlib.Path(__file__).parent
     / "../applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc"
 )
-try:
-    lines = file.read_text(encoding="ascii").splitlines()
-except UnicodeDecodeError:
-    print(
-        "Fix non-ASCII characters: https://pteo.paranoiaworks.mobi/diacriticsremover/"
-    )
-    exit()
+lines = file.read_text().split("\n")
 
 total = 0
-for i, line in enumerate(lines):
-    lines[i] = line = line.strip()
+for i, line in reversed(list(enumerate(lines))):
     if line.startswith("#"):
         continue
-    lines[i] = line = line.upper()
     if not line:
         continue
-    if len(line) != 12 or any(char not in string.hexdigits for char in line):
+    key = line[:KEY_LENGTH]
+    if len(key) != KEY_LENGTH or any(char not in string.hexdigits for char in key):
         print(f"Line {i + 1} is not correct: {line}")
-    else:
-        total = total + 1
-    for j in reversed(range(i + 1, len(lines))):
-        if lines[j].upper().strip() == line:
-            del lines[j]
+    for check in lines[:i]:
+        if check.upper()[:KEY_LENGTH] == line.upper()[:KEY_LENGTH]:
+            print(f"Line {i + 1} is a duplicate: {line}")
+            del lines[i]
+            break
+    else:  # Didn't break
+        total += 1
 
-file.write_text("\n".join(line for line in lines if line.removeprefix("#")))
+
+file.write_text("\n".join(lines))
 print(f"Total keys: {total}")