diff --git a/CHANGELOG.md b/CHANGELOG.md index a126b7e50..d15e2edef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ * Archive: Allow folders to be pinned (by @WillyJL) * Apps: Build tag (**9jan2026p2**) - **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev) ## Other changes +* SubGHz: Rename Sommer(fsk476) to Sommer (Sommer keeloq works better with FM12K) * Docs: Add full list of supported SubGHz protocols and their frequencies/modulations that can be used for reading remotes - [Docs Link](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzSupportedSystems.md) * Desktop: Show debug status (D) if clock is enabled and debug flag is on (PR #942 | by @Dmitry422) * NFC: Fix some typos in Type4Tag protocol (by @WillyJL) diff --git a/ReadMe.md b/ReadMe.md index 9cb6dbda0..7c353fd27 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -143,6 +143,8 @@ Also check the [changelog in releases](https://github.com/DarkFlippers/unleashed ### Current modified and new Sub-GHz protocols list: Thanks to Official team (to their SubGHz Developer, Skorp) for implementing support (decoder + encoder / or decode only) for these protocols in OFW. +[Full list of supported protocols and their frequencies/modulations (to use in Read mode)](/documentation/SubGHzSupportedSystems.md) + > [!NOTE] > Not all Keeloq systems are supported for decoding or emulation! >
@@ -154,7 +156,7 @@ Thanks to Official team (to their SubGHz Developer, Skorp) for implementing supp > | Alligator | Comunello | GSN | Magic_4 | SL_A2-A4 | > | Alligator_S-275 | Dea_Mio | Guard_RF-311A | Mongoose | SL_A6-A9/Tomahawk_9010 | > | APS-1100_APS-2550 | DTM_Neo | Harpoon | Mutanco_Mutancode | SL_B6,B9_dop | -> | Aprimatic | DoorHan | IronLogic | NICE_MHOUSE | Sommer(fsk476) | +> | Aprimatic | DoorHan | IronLogic | NICE_MHOUSE | Sommer | > | Beninca | EcoStar | JCM_Tech | NICE_Smilo | Stilmatic | > | BFT | Elmes_Poland | KEY | Normstahl | Teco | > | Came_Space | FAAC_RC,XT | Kingates_Stylo4k | Pantera | Tomahawk_TZ-9030 | @@ -264,6 +266,7 @@ Enhance your Flipper Zero with apps and plugins created by the community: ## 📁 Where I can find IR, Sub-GHz, ... files, DBs, and other stuff? - [UberGuidoZ Playground - Large collection of files - Github](https://github.com/UberGuidoZ/Flipper) - [Awesome Flipper Zero - Github](https://github.com/djsime1/awesome-flipperzero) +- [IRDB - Infrared remotes database - Github](https://github.com/Lucaslhm/Flipper-IRDB) ## 📘 Instructions diff --git a/applications/main/subghz/helpers/subghz_gen_info.c b/applications/main/subghz/helpers/subghz_gen_info.c index 1f4bc92c6..388327da2 100644 --- a/applications/main/subghz/helpers/subghz_gen_info.c +++ b/applications/main/subghz/helpers/subghz_gen_info.c @@ -426,7 +426,7 @@ void subghz_scene_set_type_fill_generation_infos(GenInfo* infos_dest, SetType ty .keeloq.serial = (key & 0x0000FFFF) | 0x01700000, .keeloq.btn = 0x02, .keeloq.cnt = 0x03, - .keeloq.manuf = "Sommer(fsk476)"}; + .keeloq.manuf = "Sommer"}; break; case SetTypeSommer_FM_868: gen_info = (GenInfo){ @@ -436,7 +436,7 @@ void subghz_scene_set_type_fill_generation_infos(GenInfo* infos_dest, SetType ty .keeloq.serial = (key & 0x0000FFFF) | 0x01700000, .keeloq.btn = 0x02, .keeloq.cnt = 0x03, - .keeloq.manuf = "Sommer(fsk476)"}; + .keeloq.manuf = "Sommer"}; break; case SetTypeSommer_FM12K_434: gen_info = (GenInfo){ @@ -446,7 +446,7 @@ void subghz_scene_set_type_fill_generation_infos(GenInfo* infos_dest, SetType ty .keeloq.serial = key & 0x0000FFFF, .keeloq.btn = 0x02, .keeloq.cnt = 0x03, - .keeloq.manuf = "Sommer(fsk476)"}; + .keeloq.manuf = "Sommer"}; break; case SetTypeSommer_FM12K_868: gen_info = (GenInfo){ @@ -456,7 +456,7 @@ void subghz_scene_set_type_fill_generation_infos(GenInfo* infos_dest, SetType ty .keeloq.serial = key & 0x0000FFFF, .keeloq.btn = 0x02, .keeloq.cnt = 0x03, - .keeloq.manuf = "Sommer(fsk476)"}; + .keeloq.manuf = "Sommer"}; break; case SetTypeDTMNeo433: gen_info = (GenInfo){ diff --git a/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes index b146d0ded..fddea5abd 100644 --- a/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes +++ b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes @@ -1,70 +1,70 @@ Filetype: Flipper SubGhz Keystore File Version: 0 Encryption: 1 -IV: 41 20 46 75 72 72 79 20 48 41 4C 21 4F 77 4F 21 -2CAD19E0C7E482D138AD8EC452C5D9175534F5FD5B8DAB0FF2082A75A9410C60 -87341133DBC22CC39E1952466C1FA6F7DA4215FB3B9D6975CDA16CD0211AEC7E -8D60AA06878EA9EE24D3F2CDC0166373E3CD131CAD016976758B4F5F0DCC4A36 -E455A4EF9016D5682815F4714A678833CD09D6CED6D9D3D796CC700B0FFB79CC -FD5A46DF885486EE89F867BF629B63940AE8A1D0695BE93FCE4385AF523F8809145A3381F2F3F578A38FD40B2546A423 -84F8D5D63DC863490A0B36BC6102FFAA4D0852DE5E92B567B39F0C6F90454029 -8D1A3A7BE24A6F96B3401944435FF5441628B3E60C1CA29F54650BF5912C7E00 -4F2A1A51AC845F91CC8F0AC693CC8D95C4FCF2524317F2576BF1B426332257F2 -6482B6BC4C59F14FC414C4A1E8DEE687E3263FC575646287CF07CE21D5356CB9 -B98C8FE2030F448F80F075EC844311F503B8B4A1048F3EF761AFC695BED8767D -426044078972749851904C762094DC45D8E6DEEEB36232A1489BFBEDC15F6EA0308756673C7494241BCA9BF6216B0C63 -7446FBF891E79C130550E5AEC07BCD6605AB16A16123C7F58B34BA8243567CD29EFBFF44730F36E86A17B97B4CA86BCD -3F76A9C0273C7A344244703F24F625091B1F599A2DDFBD698F33CF7BF7765BD4 -AC491FF039EE8D1548F127AA11863B8CD6B67C37F5DE55D810C04AA1A0207D7D -E14027E544A3B867402F1FD496AD8E173CB6FC55053C3846142882D746C8A3BA -182599DE46C923C4A2A8B1CB07165A8FD5F571BE95A32DA4D517B99378AF618C -5AE341DCF8BFDBA55301555D3300946352CA174F5B0DF6EB239EE997C0E093D1930F6A75996B149199DFFE78B25F5BD5 -A495E957DBE11937C967CEBF99BCFE85CE2E2FFBBD6952352EC7E59FD9ABDC2D -F1F924BD569DD0E6AB7EEC7C880EDE0CE53757A2A183EED3674C10FDE4ADFF17 -B6E32951F4C886371968E5BED5711C05648E87F36FC397E2455B8DD5AFF3865D3BADADF7626D071F792712F6B0FD115B -BC88789A8C037EBCA6F9F6A0FC616D3512474AED1C96270845171CF76F7CDA6D4D2CD42CB8463CE706398B0A9DBEA87A -4A8686B20E1339C81AAE8BBF1C9EABA5BEB61D0A394F314958546FA14A67DEE7 -CA71F413EC992ACFEB03EE1760BE683050FF4D1E1B65ACF9E3A4964F2B3C2B01 -0E05B3BD4854604B6FB82900A13051C0377E85C49A293A39C2A8C75B904D8102 -C9EDE274DD3C5B6DF276565FEE81ED060F0C3BD0CB72EA3E49E9595FAFE77F5C -A33A4B9AD451ACDB5EC4830EFE421AE8929E024108C34343D3D55F098CDE5B0B -9C5C17D4FB32DDD18D88A2B358786E9A941931BE9D645B379412F2E187020C14 -2626DD2FCE983EA3DEAB2FE2A5F378250F1644BE24BDCC2C5FAFDBA68D4F1872 -9F1E27964102BFCEFBF6F5FE7DA8C3B102E97ED0CEE074625175FB02674D5EF2 -7E1745495E213781ABCA814552046470EA41F0EBE8BDD64592DDFA7319AFCD69 -EB6C3B1F4265C71A0DD74847588A89CCF57539CF20711233A221C9BE1F9EB6C9 -4C1A2768E44F9DD2E4AEE9C18DE5449B92CD4DFE5BDA7F65F5A654C86544B2E1 -4F1835CDBDA4128324F4B92E709201502852892699EC0C84B1E4A4B841542C3C -E0EBE4B259B61F05475FFE07EAC8E2A9D013D4471DC7CF3481E1334006F7FB02 -20342B2D84CD3936DEA5058CE07F3F3DB6178C6BF0AC72CF8F807503B3AC8F88 -DC775129215670CD8B81A5335190F6544687D38A70E758348578B0B3A1389300 -208F0D588404D9BDD6E310F16B7460BDB2A8B284CA6E59E24F5FACFD55D48AACC5D86C886A9EF5F06DC2AADE76EFF35F -5CD70EFEAB4B5345531102A0DA1453F857AC93F3456E81C305111626CE084627 -341E61A3AB6BA3F71F5215905149E2D3E84260CC77C068C92D71C6DD9067F633 -0342C01D966663D7542F2D5D7635758EC65CDDE5E7FD5884846D675D06C59363 -2E9F77AD044F9C8C23CA239E71303D6682A2A86C3B4D44831DB4B1BC377043CD -3A11CBA6703808A36911F036E9042198950C2C82269D892F5C87DFD32C101BCA -6E75A69923DFC22957705A624368CFB657B77C11D7F831704BCC76A87377AB26 -21F70436CF950862D306829B542E307EF327F23870D4FBF42869A3BF0891F9DB -4A00DFB119C12D86B953BEC9F41DFB3D4AE3A9BE984CD8C3606CC1ED4B9020ED82922BCED5AE8A2A88DD2995A0D28EFE -12E2B40E49B0FC157203286B39ED852EDC2B444527472A8C07E78A70722DB825 -91A106AF60685D56D19D2E58C9F902F2B3B80A1CFCBC1B84316FBAF69DB47730 -58B5AF1BB0EF318CC3026041A3403B025980FB4DE06C3F2B804800B8578295B7 -FA7C4461C2F0BECADB414694B04E7A89BC99433A635E2905DC3A40A947EC9846 -DF356AFF3212088F223EC32E5FE9D5D73701F25B2075BC50E0F0B45195F28365 -2D099AE3FB0AE7B92976E02E2F01A9D6821D7C15CC04DCA881E05D50BC46EB11 -1FE9F8D29A77CD399B068A8AD890ECB85A957438855F85223B16E3B83A655213 -07DFA64C22CF6DB1E36D16F763BDD822AF3991BDE07C30B4F4084BD13CDEF012 -3BA563F522243D807151BC2EF1B524C174058888D9DE852AA0E9C15F1EA22950 -475979BC2EA05EE2443F65F2372E36D780A34EC8AC1D70BB2480FF519C6C84C1 -7275E88766DCA0EB3725641E950EEC094129361D280AE963D89A9B5403136B06 -65202C209229A36A2B80ED69DEEA285A7273BAA007365AC2E7F438C7AE428BBA -C83ABA33828918FB80D92D8217BB8AE6B5AA4017D0CD7F37C39925F7F96B9BD2 -AAEF1B708581570F87D1FB016FE23FF2804CB6942E576C40165D9F81A4E7AB04 -F7434FBA076E677D71A584341A77D54BFEF4DEBDCADA67D23DB50AA5902DA4EE -5480CB40AB7CA50ABA5EED094281282D5302C38E5EF0B8AF7AE51B5C702574F2 -1C90B716E8AF97DEADB0199C4BBDE7E3669FB4D6794A27F716D523DDFC74905ECEB64509C073405B38A271B7FBFEA3DD -36036999661471644E50D56532DA3D82F2713035BDBDA399E6B121B15E2FDCD5 -DCD61BB556CD42849B99C7A1916005305E57723555CD24F6F1D67D30224A275F -4E3662D52FB2396DCC0D76E7ECFFECF5E581492FA520D8427F772C61435FF925 -7F33462CB81E81DDF8284A6EA121401EEA6301277ABDF2D5C39EDB818AE973F0D51527BA6146C3178624F61E38F220D2 +IV: 46 75 72 72 79 20 49 56 20 4F 77 4F 20 55 77 55 +30A13FCF86676F7027AF9D7BECBAA6A08C83B0DB00E4FFFB6F53249D0EA057AD +2D3AA216E454121B2C4DAC9EEE2502ECADCDC0B29C383102CDD7A078ED813A6C +B08365492BC7FBAE96B0A38FFAE7DF72E86BA1979860585582D69FF740E85C1A +7FA151F83A3550AB4EF7710325E54525A59DC499F2CE53885F886C1E848C6A18 +CFAB501321D7EF01946308915B43EBB7FDACBDBFC7BDD797437B6F2797225609E13738CD0D90A2C4A1432FA9E34618C3 +322A0030702A3930977D1AD1C762356161F3402BFA6435F184F14BFBDAEC3F4A +BAB2E4702DA0FC7D0BA9581A04A1728D2FD9B986E4B180550BBC59DF1B04BC0A +CD87059AE7E0CA962065FBDF55EDBBD45253D5A01B714EDF28F7744F11A35C65 +6226EDFC8F7C7C51A06FADAF98241EE92CA2E827217AEB7A2C917DE431BC91A4 +057FEF7D36FF24D3C5F6C59FBA9C09197575E1A6E674A73692CCF8118C6B3C6E +5BA3EB99D621A7DD9D2EBBC4A24CE935D29A78EB200D82ED295B4ABBB6425525F82A502A09ECC9C310401BEF7E354CDD +8303490AC2E6576FF1E159342754AC45B38323836D1164AFDEE2578F5B70C70229A7DB64FB5283DA4F83A616AB11E394 +79208032CC01AA421851310727CCF2E81448671AFA07D7156C2C40707787C856 +9846F3ACF236D210A0AD138B3949A3CDA9A2E841F11BF9F531F299B33FD97B40 +6BD0CCA70D86E2D71645D2E6C223B2AF501ED9A5EDA24643FC90AAC7C3840E4E +69D9A4E90065AA5A1D7A6E40FBB2FC6BF4A72CF591E1FD51822A8B59CB6DBB22 +9032CDF1F5AF42EEE6121DFFA12F578F2088D25B9F260357E02590B19560462980D11A81462AD23D61A7927D2ECCF49B +1528C0F81E0F0510AA65D07C61EB29149C7238F474B3512F4BEDB0C4BA4966BB +80ADFA97303DA2907FC982E705DB45902BB251E08EC322B5429F70EDC6D7E2C9 +561F49B1A85F2FD839FC022ABD22A11E036891FC8B52220BFDE7194192C43F173637F76FFA1AEE4A4344647886EE3E3B +0AAFA120E57966064AFCD0B3F3571CE92118379160131C646B0E46262E4844883111DF28B2B17A46750D481216375055 +45E76A7B85593DCA6E0A9A71067AA0031590CA4C60161887D8E6BE54F254128A +537091AC4E7FD1841E03B352B1E62855AD26233DE167087A7F818804EA9DA56D +84DE10BB68269D0BF1723F29A683569F0D17FE247898C76523E6155AD4931195 +CF16625381ADFBEA6D89142A13CDA19FEA8345511692A0FBBA66E178BAF8126E +D25962A77350E7B7222983150A1C92053364F9954142A85AEA4FEC1D3B524C71 +A76F292F18E464511FD3232B604893985F9A823BBD9D73B2D84E43D4BDF7C5A8 +F92496E57B1B0F57C155ED15A6CBDDBF6A9C309A3A3B2B2D3118E51F8B8B718B +E59C00F03AA3DA0B961E04ACE90E85005DB3C4E402BF9A280775BCE9FC7EDE05 +494CB3B66A924E90DD180A96F77182F708C7CCC3E379D302D436FED839EBEEDB +D93838B8AC08491FE0F29EC5077F5BAB6F75DAE77C6F305A963F0555346B9EE1 +569E5F5EA968A636C657D009525BB3C416546D19ADDC05B9D005B023B0957DFA +A16CE196104A013E064663AE9DD0393BBF87E4FAFA1489C6ABA367928A2905F7 +4FF57FB9C064CCC452473D0713E0EE17EA85726CD00203F359252ABE613BF054 +C489D64C0CF7535117D21461EDC3FEBEDAFD2D2E55C0DC87943E9E8D0461EB60 +F9BB5CBF9E514F5B2918880D8336C2552D67346C5365DFAB816517F1793D26E3 +7258ACEBE2090849F6756E6033A7F92AD3D75D753C0438F266B22F270FA5535A +0B4CF3F92742FF775A14B66540FBC214F455CD992DFCEEF925EB0E38B21745A3 +5B17E197557BACB4C355F23D28C22280F9860A756CE2FC0959F1B07B9A6572A9 +0067A9EB86AEE637DA8E9E03512D1129252F5C530602B03D5C3383E0744F23BD +658FEA8B449D1EC5530FACBCDE3E3DF6CB0644B49D96C3FE1231FCDACE266BC1 +11325D0A765463419D6623C69961A0071EDA461E14C940326F1CA36339C946CD +007D6143BABAFFF19D77CC57E15AB4351C1D102856CB182F3F512EEFCD6FDF4F +CB97161DDE414D6D4D96FF726F73FF3AD0D71F9768EA6BBBFF08ABABB33A15B2 +A558FB601E42FAC986D0421446C7C898A9BDB0711FFB872B333CBEE9FC560DB9D7C790C502E59A29F493A2EC1EBA3FA5 +65E772E08F92E50C8151AA99FCA8D27F35D5F90C1CD45D098C5654C8046649F0 +DCB929C33CB3E4D28029D0E50C146074714CEFC765BE475B324F4D8DCBCDA931 +0ACC1EC04B63A689270904860E1EC3BF8E7F1DB1B18FBDD460AAE6148641894F +CE96406CECA957184499060DEF5FA7F0E956BC6B120B60DB1DCCB0F665F455E4 +D8C0B7CFDD3D20F58112660C08B236040242BCB1CF1FA5CFC66A6382282D2340 +D5E0F33DDD03D11AC90D33A230AA77A9ACB7C239520EE5A95587700CD87AF5C7 +D095F39B66EFAEECAAA2B9D4EC0AAEE6EA0749B2F12C17B38D96DC0197DECAD9 +E52D638ADD750B0231738F751EB97C2724877E184C365F9761F5995BCFD6F812 +EFA069F75B0A4B3FD6E6B8845E4A466BE092C746F6F574118AE435A32550464E +6FBFBD47F3EC4846E946121A54042E418C4A98E5EEF4F8D8C667EC2A774EBEA2 +0A73F468C6F8C4E8CF4934A28DF83972CCF41905562A2AEE79BCADD9CFC11F00 +73AD62A6660287252396902D6F80557772B64E4D6B16E1635489F985E54CFBED +942F89D0520D08B20973D8560F89C8DA8111842DB867EBC51B9F5451AC942EE7 +4FFA3EC48275D44C1A3FE528546FCA0D6E44262BADDA765B71E19863F0337C59 +484C420725B919EF3F2D3D9887175C3EE58CA17E8AD9588AC4EC241A7B91FB96 +39C3E86438AC72575B8BC7F9C2108D1C40AD56D920C0F820D6D92416AFB6244B +D0B3CD5D299820AF61BB4782746750056A7D212B9595424D6E50BFAEBCB089951090BD09D4C0B1F4D357C3FAFE6E73A9 +BB441902B1078F7F3D5E1F2BC5546E242C4E27B49149D3E1A54C20B6FD9EC56A +78C4CF85F6DB0CD63CB72A9B118C5DCE8EE7E6CC15A4312ACEC0B6503738325C +DE92516887651C73E89E2CE0D64DEE236E235C7CCBF0D14FE291D8793782616D +74F855306E36A0DA5B0FFF097CB69AAB34DEF3CF3D2DFFCF1A80447D6CC057A438AA4FBCB631F476FE568E9BA941ED2B diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c index 8a3a81c75..599b542e5 100644 --- a/lib/subghz/protocols/keeloq.c +++ b/lib/subghz/protocols/keeloq.c @@ -518,7 +518,7 @@ static bool klq_last_custom_btn = 0x9; } else if( (strcmp(instance->manufacture_name, "EcoStar") == 0) || - (strcmp(instance->manufacture_name, "Sommer(fsk476)") == 0)) { + (strcmp(instance->manufacture_name, "Sommer") == 0)) { klq_last_custom_btn = 0x6; } else if((strcmp(instance->manufacture_name, "AN-Motors") == 0)) { klq_last_custom_btn = 0xC;