From e7c3da1da9bbbd454b1a863e336dce3fbd5e6553 Mon Sep 17 00:00:00 2001
From: Skorpionm <85568270+Skorpionm@users.noreply.github.com>
Date: Sun, 17 Jul 2022 13:45:21 +0400
Subject: [PATCH] [FL-2658, FL-2657] SubGhz: add new protocol (IronLogic,
 Comunello, Sommer(fsk476), Normstahl, KEY, EcoStar, Gibidi, Mutancode)
 (#1404)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Subghz: fix cli  no load keeloq_mfcodes_user
* SubGhz: add new protocol (IronLogic, Comunello, Sommer(fsk476), Normstahl, KEY, EcoStar, Gibidi, Mutancode)
* SubGhz: fix syntax
* SubGhz: fix error build

Co-authored-by: あく <alleteam@gmail.com>
---
 applications/subghz/subghz_cli.c              | 12 ++-
 assets/resources/subghz/assets/keeloq_mfcodes | 82 ++++++++++---------
 2 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/applications/subghz/subghz_cli.c b/applications/subghz/subghz_cli.c
index 6c92a5d6..20930df2 100644
--- a/applications/subghz/subghz_cli.c
+++ b/applications/subghz/subghz_cli.c
@@ -246,6 +246,7 @@ void subghz_cli_command_rx(Cli* cli, string_t args, void* context) {
 
     SubGhzEnvironment* environment = subghz_environment_alloc();
     subghz_environment_load_keystore(environment, "/ext/subghz/assets/keeloq_mfcodes");
+    subghz_environment_load_keystore(environment, "/ext/subghz/assets/keeloq_mfcodes_user");
     subghz_environment_set_came_atomo_rainbow_table_file_name(
         environment, "/ext/subghz/assets/came_atomo");
     subghz_environment_set_nice_flor_s_rainbow_table_file_name(
@@ -353,9 +354,16 @@ void subghz_cli_command_decode_raw(Cli* cli, string_t args, void* context) {
 
         SubGhzEnvironment* environment = subghz_environment_alloc();
         if(subghz_environment_load_keystore(environment, "/ext/subghz/assets/keeloq_mfcodes")) {
-            printf("SubGhz test: Load_keystore \033[0;32mOK\033[0m\r\n");
+            printf("SubGhz decode_raw: Load_keystore keeloq_mfcodes \033[0;32mOK\033[0m\r\n");
         } else {
-            printf("SubGhz test: Load_keystore \033[0;31mERROR\033[0m\r\n");
+            printf("SubGhz decode_raw: Load_keystore keeloq_mfcodes \033[0;31mERROR\033[0m\r\n");
+        }
+        if(subghz_environment_load_keystore(
+               environment, "/ext/subghz/assets/keeloq_mfcodes_user")) {
+            printf("SubGhz decode_raw: Load_keystore keeloq_mfcodes_user \033[0;32mOK\033[0m\r\n");
+        } else {
+            printf(
+                "SubGhz decode_raw: Load_keystore keeloq_mfcodes_user \033[0;31mERROR\033[0m\r\n");
         }
         subghz_environment_set_came_atomo_rainbow_table_file_name(
             environment, "/ext/subghz/assets/came_atomo");
diff --git a/assets/resources/subghz/assets/keeloq_mfcodes b/assets/resources/subghz/assets/keeloq_mfcodes
index c969b592..f9771285 100644
--- a/assets/resources/subghz/assets/keeloq_mfcodes
+++ b/assets/resources/subghz/assets/keeloq_mfcodes
@@ -1,40 +1,48 @@
 Filetype: Flipper SubGhz Keystore File
 Version: 0
 Encryption: 1
-IV: 2A 44 FE 5A A3 63 F5 11 83 A6 FE DA 1E B7 3D F1
-BF22677F79DF533C83FFE485B5F9CFABA24352FDEBED14B6FFA16EE9F00D6AC4
-B9343EDBB8B8C6EEFDA7AE9934445E27B04950DBB4F31ECCD1735CCB8C1600DE
-54CC71AF6794D47FFC49823DA6C4CCAD94EC5540515FD6F537A078BFD736105C
-4A3A12125D4F1186369B3B0ECB86B28A6EE4A0AF49DD4C42743A5C2C9BD1F5FC
-190D7746CDC7782157E95532070BCFE8637CF9A7BE03F9382A435ACAAA7A5F5E6BEB8E34A320BDB6E492D793E470CAB4
-59ABF9B68B31BF9CCF2CCCC0A6B3182FA2772691A400B2BFB5E2490DA2BCD2A4
-304DF68472EC9C78341218C10242DC3D62887A5281B52061BC0C9D117CDE1185
-D146050F90D30FA166615706FBC8D5B3573BDCB081E2445930CE1B71F5BDB7AE
-9386C94D044CCCBEE7972319191933328A06B20138C432B86C76EB909BB06019
-CFC23206853E9D01C3986FD849908686A2442287277C06574928A362F988CE1B
-534B351BE03A98B56ED622D37B9BBCD871CA76EB6EF250B1615105FA496E991C8F195293F83EE38AE5831D95F45238E3
-AFF90EC99CF4278D79DA9B1163FF07C83203AD34F9C4228423B4B58FF3F6978C605CC282FB1E37C0946D86C51809222C
-44C9EF18971905D2207F62D3365CB4A31D449FA215F950CEB67368D13181959C
-0CF10950D8A3EDEEEEA9AA4E41354373584FBFE6BB2E8A52C3149757C133445C
-4FBE939E87B8438AFC86773DADA39FE3856A3518A5159C9BF6B2EFA752F5B3F5
-CBFD648024823A33481B8A7381CD28930765265A1CA9BBDE1879F0827273A860
-8D3C70EF2E4ED2EF23752046538BF30F6DA8266F2B10A4BAD8549B3D20298F08EF9E6C21F78DDA9CA6EBB1E3CDF82C78
-D31EBB7C994C397776777D4904661C6F8DF5CDA9F828CA19378CAA397555F8C0
-FDA58BA7B0CD5C9090FE891029A3773EA16DB77EB5FA06A4C443C01B537B2615
-5CEE7A27D0D1B1AB5BAAC93D78121BC6D5FCD589C093A22C71E81C390045C85FDE98C202340FDD2046FF906A035E31E9
-C3121624E5B91EDCF651B8A89C2EEF4379876D0E0D918596F3E5CED9F3C92AB689D609AA1FB5362F57738A0AF62E3C92
-25F715B4CEA880E4879C6C03DC61875A43FB314AB4F21AE1CF7C933172B4A29D
-574166A278E2FA4AB8A09078152929E631E4E182E20CCF803250A0A2D4BB62F3
-B0D1C7AA1752135BA7627D8F65EC9651B810EC29BA01C8D9BC5B3EB20B1A0939
-E3E9D30E4F7003E63917DF3B5FC4E03863E37AFD6C5987CCFEC8129C692474EF
-67A35F2E3C400953EC1CD1874A35A4734D3E9F116F7E334276BF898E48C21AFE
-BC8D612FA363AB364BB9D2701273C4FA587B2F8D8CD039DEFB72BAD00360149F
-9A88BBDA111C9185EE5BBA610574D46A4D53EC79B63D5FB57BAB5A6609F2160F
-9512A1F77A4C46BD7F79D792B1578AC1FA41F15F6D7C72BC952BD89262C85327
-182685E3E0A23055025F7218AB16F7AE3A7F9DD71761AAE3B5E4AB85E2EFBF929D640258AEBC9F0BB167985A1E4B132D
-1DD9156B6BF97424DC639708ACEE21DD1D64FC5BC0DD5252DDDDE7832C2B7B6F
-109BB4D660897DB00676093B585535D267426310CDE81F05793ACB46B9F6176E
-D7A2D468DF76A8E5C495D5280524B2996254B94458485B11CCAB36CD1EE3918F
-9F445C93FF382433015BEAE6D78F70AE2C02E0C961E1B9576D66E64978D984D0
-195CB755E6AC710B5AF10761AC2B13F8CA57355443B593BC59AAF3A819070568028BBAE75C0DA4BA6B90D63E679098B7
-C6ECD39EC47DFFD1ABC55F47AC8E2C26A8DB5EB8184153746F7D9AD5F0015E85
+IV: F2 D4 F5 5A B3 CC 3F 21 28 3A AF ED D1 EB 73 DF
+BBFA4D79A73C384D6E07E717F761F32A625F28AA1DB2261B8B19A18261E30AB6
+CE4004AB56111B0B3D486770705FAD8BD616A80957EA2C537BAF1FD09E552DA3
+F974561612C9C751237C64D978F706B41873FDBE38851306574F436CB02D9ECA
+E29CAB7C2C2D9853D0F4DF69F582562E8182234E78B355540F6FE3F78C73D518
+97ABE18993A700A607E37DC88E1434F84DDD1C2771693978C9D2FA4CE4F2AB7BBC7C3EB3E8545B37FBBE1C1F1CA03543
+E86ABD0AAE5A4B4A9414C9CB6112CA49B3A8EC29723B14DCA85902F41B05ADDC
+C1FBE921035F408C59DA6AD5E76E3887AC9BC90146619B3CAE445BED556E96AC
+232C9F86915B927888352797B45F159268FE78956CF09B8D241CDC393D3B0225
+3D9E2A3C701C9D4DD4D72038D4536CA6F515C547CAB0AD18BA71204BD2ABFB74
+4D69A4506D2C97EF8EC68F90CF1AD1065A1EB909793EEB3AF71B0D75E55B9E76
+5A7F4595DFA181C3E946EBEE4974DBD6DA85AF6FCAD0B3725FDD28667175A421D69A2122853E57927C38CCF368732476
+6A946FAEDE134155B5A88EC01AA535E7A778947D360218B560381A64CAF9ACE896079D04C14718D5AD5C0D4EE3005F52
+88AC0C723AAA875A1885C8392A616FA43B205119B0E8D299193979A1921FC8B3
+40588AADA5E1A8BE214B2CCF32D268B48C6B783AE0DD10D88BDF3FF88E921E09
+A7BE05D05DEC9B9A3AE1575D411BF7B12366AD78B726F3E3E843E7BF199961A4
+79F973A155A4367F0EAA078AA0857A2A2A82FC4C8A5AE9E567E7CBF62C2A5CE2
+C38296EEABDA1F95D0C401CC6DDC8656476DC19248588EEF1CB93773D94CDB02A40C902970C4FCB14FABEFFB4F8BC208
+B0B7699B3C3573EE4D88D8CE65FAF3532B5A741D1F20892C0F38BAA2BCE98F2D
+6E401D6BDB1B33A404DEB668F3FB353166475487BAADE4A348E3CFDEB3B1B54B
+0E44B87878617559783CC6A7C65BE9F99950FE8956ED4BB04894BC53085E3A09CA19915B1E8C143A68D1B7A97F5D1ECB
+AC19E55638429C65E6E567C0E96DA9648F8FB80215CF693D7FD5DD86FE7989AC7AC7BAE86BBD4FFF7161AFFB405FFA98
+BCE70C69D90AD639A737813FC8FD26F40F803137BD36E47651C266A671428D6F
+F053CF5255AD2E1875A5C38635F7BF203B1DAE1433B162C30AE8695AC8A5589D
+B7EFC77FFA98B173E429B3566A27842C4DC5E91B0BC01F07A6A98332C4E1F42A
+D7C7950FFB2C5E7D9BCDBC230BF5F1BFFC0FE6F1CF5C8C6013DD90E41AE403FE
+50667B2E5909FD5F9D6385788A81DE5F72E56512EAD6BF5EACCA959CB6AF0DEF
+6435E07E5E952124B0F80F76E0F68265B8289087387E35C6D51831B299335480
+D7DE1F7748FB8BF90561151CC6AEADC160CA883FE5228768A3737A89F358AF58
+FA206F860C6F981FD4A358FDEA5E1860353406D8416FF2A811D17EBA09C803EA
+F2F7B2C6705D1457315F2AAA859AB53592241D63B84C045BC742D220BA110144
+3F0E05E572D1DF5E2B0BBB20EF8F3EB4D198CDF2794F86089E1DB0EF975E9337
+7D54D088C22AA3BA9A97FAB64371B8D512CDEC2A4355116BE2B74BCEC7FEC852
+0FD951F13E19F0FC1A25655DA430640034BE34659C526238E62B6042691998CB
+FCA04B0BF98FA89AAEF41A78AE7141EF7783E0D0CBAAB1B6F00C0AD3EAA84A54759D46E1A9BEEDCCE68BA12902802111
+6AD801CE08D58A380B689574BD7FCACC5DF768BDD93AD7EE1AA514A2351EF13A
+0A820F47699AFC4A5E3285BF521771FC5B6C5FB7C6C08A1990DA3B3A6766E860
+A7AAC90972DB24D20B57DDD46DC2624FC6169D529426E64B0544AC383799BB2A
+AF6088873BC71ED672FA39D50B386523825218C43CDB35D691B0C5895B7EF5C2
+774DFAC8D285241368CB377DA947D7A94951A1520017DF77FE2E6A517D5C6A1FC768BB1E2398F5AF71B10D1806C04CCD
+AA788A707E64C40E2A0EB8154FE795EAC68B936FD6BAC5DEF7677A4D5FE344DD
+A193EF5D1B223B0FA3C231052EDBDD7A31B0C192BCD8E7E37E11D4D899476ACD
+F6986E08949122D46BFA7F218B089E8DB00DCFA6971C5F2468CDDD179E5BBC40
+EDC23A07689EF6229081D1AB9E249E68527BD33EB72C242BA97727E64AF15BCC
+70CC64359A2A5DE40D5A30E916DE6532BCC511E7489CD3A2E5DEC269D303FDBD83B7EA14BF13B40E3C960C6D3D12774B