diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e9eff410..feb903787 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,23 +1,25 @@ ## Main changes - Current API: 86.0 -* SubGHz: V2 Phoenix full support (button switch, add manually, counter decrypt/encrypt) (by @xMasterX & @RocketGod-git, original code by @Skorpionm) -* SubGHz: Reduce less popular freqs in default hopper preset, make it faster -* SubGHz: Marantec protocol implement crc verification display and add manually support (by @xMasterX & @li0ard, original code by @Skorpionm) -* SubGHz: Keeloq: Comunello - add manually support -* iButton: TM01x Dallas write support (PR #899 | by @Leptopt1los) -* SubGHz: Rename and extend Alarms, Sensors, Cars ignore options (Alarms: Hollarm, GangQi | Cars: Kia, Starline, ScherKhan | Sensors: Magellan, Honeywell, Honeywell WDB (doorbells), Legrand (doorbells), Feron (RGB lights)) +* SubGHz: **Roger (static 28 bit) with add manually support** (by @xMasterX & @mishamyte) +* SubGHz: **V2 Phoenix full support** (button switch, add manually, counter decrypt/encrypt) (by @xMasterX & @RocketGod-git, original code by @Skorpionm) +* SubGHz: **Keeloq: Add support for - Motorline (with add manually support), Rosh, Pecinin, Rossi, Merlin, Steelmate** (by @xMasterX & @RocketGod-git) +* SubGHz: Reduce less popular freqs in default hopper preset, **make it faster** +* SubGHz: **Marantec protocol implement crc verification display and add manually support** (by @xMasterX & @li0ard, original code by @Skorpionm) +* SubGHz: **Keeloq: Comunello - add manually support** +* iButton: **TM01x Dallas write support** (PR #899 | by @Leptopt1los) +* SubGHz: Rename and **extend Alarms, Sensors, Cars ignore options** (Alarms: Hollarm, GangQi | Cars: Kia, Starline, ScherKhan | Sensors: Magellan, Honeywell, Honeywell WDB (doorbells), Legrand (doorbells), Feron (RGB lights)) * SubGHz: V2 Phoenix show counter value -* SubGHz: Add keeloq ironlogic (aka il100) smart clone cloners support (thanks to Vitaly for RAWs) -* SubGHz: Fix CAME 24bit decoder +* SubGHz: **Add keeloq ironlogic (aka il100) smart clone cloners support** (thanks to Vitaly for RAWs) +* SubGHz: **Fix CAME 24bit decoder** * SubGHz: Add 462.750 MHz & 868.46 MHz to default subghz freqs list -* SubGHz: Tune holtek ht12x to decode holtek only and not conflict with came 12bit +* SubGHz: **Tune holtek ht12x to decode holtek only** and not conflict with came 12bit * SubGHz: Fix Rename scene bug, that was replacing file name with random name when Rename is opened then closed then opened again * Display: Backlight option "always on" and RGB bug removed (PR #900 | by @Dmitry422) * NFC: Ultralight C - Attempt of authentication with default key (PR #898 | by @mishamyte) * System: Loader - Fix misplaced ApplicationBeforeLoad events (PR #905 | by @WillyJL) * OFW PR 4210: Infrared: Add text scroll to remote buttons (by @956MB) * NFC: - - NFC Type 4 support + many other improvements (by @WillyJL) + - **NFC Type 4 support + many other improvements** (by @WillyJL) - New Type 4 Tag (NDEF on NTAG4xx / MIFARE DESFire) protocol, full support - New NTAG4xx (NTAG413 DNA / NTAG424 DNA) protocol, only detection and basic info support - NDEF parsing plugin supports Type 4 Tag protocol diff --git a/ReadMe.md b/ReadMe.md index 395222fff..eaa221ea7 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -127,7 +127,7 @@ Before getting started: > - Battery percentage display with different styles `Settings -> Desktop -> Battery View` > - More games in Dummy Mode → click or hold any of arrow buttons > - Lock device with pin (or regular lock if pin not set) by holding UP button on main screen [(by an4tur0r)](https://github.com/DarkFlippers/unleashed-firmware/pull/107) -> - **BadKB** plugin [(by Willy-JL, ClaraCrazy, XFW contributors)](https://github.com/Flipper-XFW/Xtreme-Firmware/tree/dev/applications/main/bad_kb) - (See in Applications → Tools) - (aka BadUSB via Bluetooth) +> - **BadKB** (BadUSB) [(by Willy-JL, ClaraCrazy, XFW contributors)](https://github.com/Flipper-XFW/Xtreme-Firmware/tree/dev/applications/main/bad_kb) - (Integrated into BadUSB app now!) - (aka BadUSB via Bluetooth) > - BadUSB → Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout) > - Custom community plugins and games added + all known working apps can be downloaded in extra pack in every release > - Other small fixes and changes throughout @@ -157,8 +157,9 @@ Thanks to Official team (to their SubGHz Developer, Skorp) for implementing supp > | Cenmax | FAAC_SLH | KGB/Subaru | Pantera_CLK | Tomahawk_Z,X_3-5 | > | Cenmax_St-5 | Faraon | Leopard | Pantera_XS/Jaguar | ZX-730-750-1055 | > | Cenmax_St-7 | Genius_Bravo | Magic_1 | Partisan_RX | IL-100(Smart) | -> | Centurion | Gibidi | Magic_2 | Reff | | -> | Monarch | Jolly Motors | Magic_3 | Sheriff | | +> | Centurion | Gibidi | Magic_2 | Reff | Merlin | +> | Monarch | Jolly Motors | Magic_3 | Sheriff | Steelmate | +> | Motorline | Rosh | Pecinin | Rossi | | >
@@ -166,6 +167,9 @@ Thanks to Official team (to their SubGHz Developer, Skorp) for implementing supp Decoders/Encoders or emulation (+ programming mode) support made by @xMasterX
+- Roger (static 28 bit) with add manually support (by @xMasterX & @mishamyte) +- V2 Phoenix (Phox) (dynamic 52 bit) (by @xMasterX & @RocketGod-git) +- Marantec (static 49 bit) (add manually support and CRC verify) (by @xMasterX & @li0ard) - Feron (static 32 bit) - ReversRB2 / RB2M (static 64 bit) with add manually support - Marantec24 (static 24 bit) with add manually support @@ -174,7 +178,7 @@ Thanks to Official team (to their SubGHz Developer, Skorp) for implementing supp - Hay21 (dynamic 21 bit) with button parsing - Nero Radio 57bit (+ 56bit support) - CAME 12bit/24bit encoder fixes (Fixes are now merged in OFW) -- Keeloq: Dea Mio, Genius Bravo, GSN, HCS101, AN-Motors, JCM Tech, MHouse, Nice Smilo, DTM Neo, FAAC RC,XT, Mutancode, Normstahl, Beninca + Allmatic, Stilmatic, CAME Space, Aprimatic (model TR and similar), Centurion Nova (thanks Carlos !), Hormann EcoStar, Novoferm, Sommer, Monarch (thanks @ashphx !), Jolly Motors (thanks @pkooiman !), IL-100(Smart) (thx Vitaly for RAWs) +- Keeloq: Dea Mio, Genius Bravo, GSN, HCS101, AN-Motors, JCM Tech, MHouse, Nice Smilo, DTM Neo, FAAC RC,XT, Mutancode, Normstahl, Beninca + Allmatic, Stilmatic, CAME Space, Aprimatic (model TR and similar), Centurion Nova (thanks Carlos !), Hormann EcoStar, Novoferm, Sommer, Monarch (thanks @ashphx !), Jolly Motors (thanks @pkooiman !), IL-100(Smart) (thx Vitaly for RAWs), Motorline (with add manually support), Rosh, Pecinin, Rossi, Merlin, Steelmate (thanks @RocketGod-git)
diff --git a/applications/main/subghz/helpers/subghz_custom_event.h b/applications/main/subghz/helpers/subghz_custom_event.h index e971bd056..cffad2929 100644 --- a/applications/main/subghz/helpers/subghz_custom_event.h +++ b/applications/main/subghz/helpers/subghz_custom_event.h @@ -75,6 +75,7 @@ typedef enum { SetTypeANMotorsAT4, SetTypeAlutechAT4N, SetTypePhoenix_V2_433, + SetTypeMotorline433, SetTypeHCS101_433_92, SetTypeDoorHan_315_00, SetTypeDoorHan_433_92, diff --git a/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes index 3f3e825af..62135c0b9 100644 --- a/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes +++ b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes @@ -1,63 +1,69 @@ Filetype: Flipper SubGhz Keystore File Version: 0 Encryption: 1 -IV: 4E 6F 20 66 75 72 69 20 63 68 65 63 6B 3F 21 3F -2F0767B5B190608EB032D12BFA937D760A77D08D37F851E940767F1915E97ACF -332F8DCCFDBF0485EC2EEED0C279F277E52A86A93BC5E4E96BE5F7276CC66713 -D9A02CC785FC0495063C424B0B1BAE7C120A2C24D4C0EE743F5D216718B16490 -4D9DD617090BDB100986B6987CAAC3652D2ADAB1AD9E368C5806D98562FF6B2F -28D21748FF3826FA13C785A6721CC5927C81EDAB0C5CF31C92EAFF12AA91608298485D8A3AB443640237372ADF0DDC49 -5058E12C0A41EDCB5C0812554F619DADFB6E895B94421952ECD9255A04EE5E1A -83A3EB8B22D94487A6B0F37856FB6AE9F42272BF25E1AE06DE03AA881A12D15F -D0E207DE64402B43ECD0C341216B6BCDC449508116E81D8ACDE7FA0BFBEA56F7 -6C4F723DE3B775D4C07E12ED3C369250B4D2089ADE2207816DED130D4B498CDF -B041911C56555E5F4676BF16819F61BF7A92402EB0427B8C2E7367B0AEA6B53C -1AD460260F20146A763BF6D4CD26DF5139EE29FFF8B53F6C5367EA779E1BEE56D5DFD872EA0268FE27204175925079AA -B1A9331AED36137CD078536A67775E2880D3CD7305373BC44A5649435E466AD2DC9FDE8AC1F572EF094D4B438C9509EA -105819300A9152F16E3478151799ECBBB7CCCE63DADA3F6C6D16D46830E1E035 -354186E04BC90D672F76A427FC1CD35C2EFAE8D4D1C36247FFB71ACB862A3601 -84B533148282D0D8121E5BBBBD39DE16F398365B015E02417ECC535C88EB9C57 -E899C9DC779F82E798EE923D257D5F051E1254DCDA2A6A955882727AA8E98ED8 -B8EC34F9B75E61D34E9C075A5316FAFC395E8FBA4F76B215620C5B5C76C53DB7BF316E53582161AD20F64CAB8E3347B2 -966C3B0873F48889B51D7D9DACC0674CBC95B06E231E30F235C826285D529A54 -370DED014764D7278E342D3AB631AB37D8F8A8FAE08987E03D7FC279DEEEB913 -2318A2DA42EEA2A35FFC9BDFBB244DF3FF6933010D74B3465336C0E37FFDC48A200568F8D6003AB215388734B8AC1F20 -475B35437FECEE9792F53A671252E78566AA9894DE7A4DEC9AED70834864E804E87478009F424CE1424C00F162BB03C5 -01CE6251ED9682BA6366075081167196CD740D346C4DAC4E0012C7951C475AE7 -CB225891F937CA491B711AA942B04C61C7CFA6A8E912D91D0906B401737E03B4 -F35D279815DEF19C9C5BC9ED55E7C1A0366E37DCD0A93E6E168B5A2602201C7B -3569D8DF2490797D40978F8325B94CC707383FEA1B46240BFDAECFEFB1F8176D -3D7BAF13573BBF3102757C68D52236638CC57126FF3795A604CFFA2D3F1B9C26 -B9102C87D7DBCF35463F38B6B80B70408968B6E01A47F6A7E8A3E87A0577B4ED -7673FAC14D94ABF72800A78E2DC4CAF2166FBB24719C22CFC1010492F4C87734 -1AF74DA07EA3A418EB86BB7ABAD6192B8E5A53F61B3E74CB898CB3EE4A7E244A -832D18C44062DDE856384E19D1417FA48D809C2CB2107CDEC5281943559791A6 -CD482A8FAB2A2CBE25A0B4A4788F274CA7095AA24508C00DBB78DD12BFB11C37 -EAC52E802DB76B51058752D7EFA91BCB1212AB96B589F9A88465195C1DE3242E -96CC75952A513AB5FE62A69AB6CDDA93C2156A3EA607C25B3201CE7284B3DAA9 -986E71EE87E860192141A1453929E575706E3FE72B7A9FEF5ACA696388649EB6 -FFF89FECC1C01FA3F266B95BDEF61A16F514E59599DAA07E908C604E9FE686C0 -ACC159D4AE78E26B5A1468F69D961028D0BF962D03E865415E7FE746553FEF15 -0FF46B2F9D4E907B9924675081D17C38C09957AA2F4C3C1F5568461DBA850F6301328CDC0FCEE83C7E8BA00CF8FC0F97 -7FD793C05E499739C3C4F8CC1D2D205A55928AB5BC60752A81D86DFBE30C50BD -CE444F4A1BEB38C9E93579E1B7FB3E90B4F85D8DA94DFC622272DED093A35192 -C7C31D8AB9D717FAF842F850A3E0D6B404EB9A980D9679362ABA90594B1957AB -1D48A6CFFBB6F14DD5BED1F8E74E6CC0292150546EDD76361792677434A8FE5F -F7335B8877DDF17F0737ECF77E2E6286E78534CE28E72077360E8E24D7750DFE -51051D9A8D5941661EBCF437B4640E6DA0B9B27518D761F3EF26BF7EABC691D4 -79F279733E18393FEDB50D654A0D0A532A64BED5ACBD13319439EEC007BC359C -646666FDB75D439C0427A9E3EF47F145DBD4FF5FE2E244909D74F075B24FF5A9B47E7AF98271210057D937A0E4B1F46D -DE7E814A2BD4D8823D9F2380EFAFFA1380A90391F87CBF24CE46BD46205EABAB -1335C4C3E819E942F5C212E9BEFAF5D984316C0A2FF6E9886886B565625618A9 -65386F906F18FF9C3A20AB57F3241D4975FE312ACDEB7FB1B91F2B816CAA46E7 -DF8A8B33782D56667F4C98F8F91B49B71A9E83AF015D8841986D41663233A0DC -27264455248878BB226FA1DED0922BD10313FF65F8A6A0E3CCDFB77890C838BB -43A08F784F36A3E8049BA63A401F3F15B3CA2ED263F8638595B5F22A0B081369 -F9F82F89C15AD970320E3D7A83B272EB00CD0ED657E4D230AB33C995859EA77F -70AD020D172E18E1011DF88E5F934F03F34DCE8148F8053B4FFA6F92CAC9FC93 -2B845F67BAB432CED64F2D68454A2B4B3BC46FFDC2A16D3340360C7BEA110BBB -B85F16A2370B278FDB3C85E6455B8DA239D6413B727839DEFBCB5628A6C747266291AB9D9F4F5DA1826B219C1A29F956 -FFB7B10D96F241FDB994008AF85EC85D147A97AA599D05F5EE1BB2FC27644A26 -0BD42CA312CBBCAE556AA0159EC2CC2FA70BBB00D8DF7B63BBEA60A282481AED -9CC73810056A21EA6F311B01BA7F44655A075D1F60947FBC9B6924C3BD0ED819 -024FCB96977ECA1C0D4B9C7C461361329D96E5AFF315124FEFC0DF2A400DE312F45D602DB40CD4EB088F144EB0B8DF41 +IV: 46 75 72 72 79 20 52 6F 63 6B 65 74 21 21 21 30 +05176EEFAC177FE261FE3EB5C8E103BE7CF9F2FEB32BDD6BB63D22EE9C17B9D2 +B645E3CAC0D5E26891249D326BCEB09850E4FB8F8E86A466E97E83437A9E0041 +AA4255FFA1ADE8FB840F80A93F8F1A2D1E39051131D24DE7258D66A8CF2066CF +13ACA390FD5254B024084D5D1F41B8DDF5304FF00C3C85A9C26CD13A7A268654 +4CFBF498D5E2C85496985E83D91B0F4229A925E16A90C6712750032C3699EE0AA5D04123E579B6121573FC61766E89AD +93DADC2AE4235470E171E0E85D24D04A84C37187284C38D1CBB48666FDA8CD6C +DB13D8CCC0CB07685F29F33AE07DA2FD14C2AE4F4D001DB88465D5CFE8CFDAA9 +E51CD1B5074B63D26E274218A0AB3B2E435454EE094DCA5679F35477658A72F9 +10AFD5FD9C296E67EDD9504A60BA9EF84556F40213DEC4DE44F99B088BCC6A57 +EF7AA55F6A473DE093D648240D5FCEB05F8B3295DC37B3E83239A4AF320CD688 +A22892E71B9D0D7FAF92B27C724E76C4A6824DBE5F083F1006D11E42D153C4AC98D0A11C6A8D62F5921A24ECC7437485 +7A25416E390D81DA68A59C3BA30D4B7FC8269B5E0DAF77CA3A857B6F478A050585918485AEE72D375F02D177CB296E31 +94004BA0BB1E47965E60025949EF4CC2738C463F57C97FD2A89C76CCCDEA5397 +111CB1C19863A0165521D974F838CE718DA07948A8D9A8A7490E75032A62ECA2 +17B6E27C69FA002F6CF23D719DFE595140BEFA5083D12E774CF89E2CED53D68D +73311E0FF8ABB3E9461AD14A4F52791647A50E2102D3B74188A73C35BC14EB55 +54E15840A6A6DCA85275E38E4218EE2B539E9E468E24C49428DA363C955C5FC81ACEE79EEB941B83EE4147A0817043BD +7D0FBB417B99B3C6AB18C7B2DC82582D2DCD1E10515028874E73254188F7FEE9 +3F6E89BBCC133B85945234A8201539ECD8796909CC81FE67673F8DE1ECA63045 +39554C0DC1C3694FAAFF65537FF710D9593B7B461E011FC39D014F253F0432533A40276D8259AFD8C957A378237D574F +E60F6CD7063B85F0F20ACB7E7A42B03DE4A9F6CCA54CB7F036AFA23A27D3E9E006BD523E5356260AA78206D9276E6E57 +9EB252EDA9352B966EC4F053D5B013772361D2AD4B217EF33F46A5CEC97A00F3 +AA6773E79BC6D76314BB523FDF203358E01ECB2BBCF3B5DD1EBD043663C74B05 +29B29A50F3F27F4D8C7B0FADA98CC004A7871078DAD1CBAC4846862C3DF82E02 +6E3A479D4334FF05606899B0383116125056A316621B279F904A02B842918C59 +3991732015F4A213E9912E34AC92515D88010C07DA0B118AD6F64A05DC38D2C5 +550B1866F7493C75812DF85DDADC38AF21D9B58189E4EE99A021328523881A9D +77960CA031D28362586100F17DF94FF4E7D6EFAFAF23952887F9DF0507825A99 +01E6FC89E97B7729BF4D1ED8041F69005181BF3639F939C5833B009E96B9F2F7 +D1CC7C536706ECFC5826C8933135D2B110996F1CB13388A702B8453DA40E40AD +B64D2F1E1A80E6DAB92283A512B40DB7FFC519F394AA94CC86C8532F69949723 +6399409A0AC0298DEDA76037C83042FC0870132CFF7F82E54AD0966BE16AC882 +D310536FA78F95BB0B408676990AA937117717BADE9D3B975C0ECE10FB586A1B +A8149C0581DCC291D037E96EF321DB6214BD7CB25F1696226A9FE750AA23B334 +BA3BEBD564D8F571202CD6FE89BC33F89C8E01C03AE0814F2BEF37C33CE874B4 +88CD81AC7605A7F6EFF85FD62C65E0C9945335CFC085B92B27B69648C6E5BF6B +8057C7CB5071DFFFAE4804FD9EC1EC1D3F54D06514906A34B17F6B6CB45A9D473992DF6BC8A9F9E146E39D6163209CC6 +9ABC8814C8FD1AB254374150177616F5C7B43049473C84329BEC855578B96002 +8BCA39A498B00245C71D94E3160CEE8ACA5BEB18AE0AD64A385AFCC018E99744 +5AD75C51CA5AE5FA9BBC6A41576C745F265CC28FC4DA2AD230B6692CF151FD61 +E86092E04CD72D874A92DE838035E811E75E411049C0A7BD0FE2AA9C802BE5AB +CE70ADB22E85747FDC064F0B5974385CD57D41D376CE1C7490C1BEC8A3FC5A7A +8F096E0A11682DB315825213D3DB5D725555C1CDF444169EB919E47E0F0FA6F7 +AD9C9A694D807BA77E5A54B248A88B55000757203D931506255BF8F4215C00D3 +F0E804B6C6B6E91916CB73EB44FB2D1992400BC90ED8B22DF5D038317588341207D74E08C00E529DF2CF2A64F2C7C0FF +72212FCEED35E9C3A176B67DCDB84B284F4DFDCD0ECE8D3F6089C58C2B8A616C +000F9F746BFB47FC10B23E3F08C2A84BCB3870D0C5AE974472849699884BC929 +7B8F9AB04E5F86D6DDCF6164A25EA927788A03F57977FC5C55E1D565279B09C4 +0E9CDCD07D1D4F1429E59F81B524960A75F19A464798C7E822E52728AC83784A +F2DE2B108A1476BB6F85DD3CCB0F0527627B45179092BA7A56D5971490E3875C +7F307358D988FEA12648739F58DD249EBDF0B1C44B73BA547C50EB576C071DAE +2DFBA988592CEF3B62A76183DBA727E734359B89F53AFF3160441EF8709FC633 +57F7DC38DDC87C19CE956BC44C638DEF34D814A7BAB0AC8AD61855143FD984FD +A8AADB687251FA6AC2BBC8EF1E3FA621893293DFBD8C1D07971BF82F22A00DC3 +65AEA1EE34E316C769E551AC2309D07FC2ED92EA044674E3A99CD7B543C730EB +968ECC790E5590E7EB22AFD3546C28F4EB87EA4CEE35F72DDFE7153F74611EAA +0F937930D4E1BDF0B729277CF94A47064BCB959938C70CDB3AC3C65DA68DA1FB +A8AB66375D59E112104CD81B819D618BE43D6A6F159BAD35583653EF3547D25D +A81D5DE2102F05D50750DC37C26E9C9502FA89EF98A2EB1EA546EE48C628E9C4 +EAFDE0A8936AF8EF718027937BC17CEF691E570996B403CF4762240D267EB305 +C48686348F0A94B07BC60AB825C1A0791C20DBBDD7DAE0ED47E8A7FBD9334EACF8E33DCEC36963E87929260DF769520B +493D53BD7BB2B3E081AE793A3BADB3AB0F33C95B83677715D6DE2922F2BEC892 +63FFD3D8CAB980E45D49253A69C99A6813CBE6013992EFBC862173BAD0E26373 +2EF88F43C5A76EC87E02B780585B10957F4EA386F96710FAB98BC2C1E214DBFA +A021CFA0E72AADFD75BC67FBE9345082B0A8B31782E933E81196F84B1797D83E8B2F81E1CF5C3F026D11B9DFC95222E2 diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c index 3f2fd9eff..b6ff75768 100644 --- a/applications/main/subghz/scenes/subghz_scene_set_type.c +++ b/applications/main/subghz/scenes/subghz_scene_set_type.c @@ -30,6 +30,7 @@ static const char* submenu_names[SetTypeMAX] = { [SetTypeComunello868] = "KL: Comunello 868MHz", [SetTypeAllmatic433] = "KL: Allmatic 433MHz", [SetTypeAllmatic868] = "KL: Allmatic 868MHz", + [SetTypeMotorline433] = "KL: Motorline 433MHz", [SetTypeCenturion433] = "KL: Centurion 433MHz", [SetTypeMonarch433] = "KL: Monarch 433MHz", [SetTypeJollyMotors433] = "KL: Jolly Mot. 433MHz", @@ -680,6 +681,16 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { .somfy_telis.btn = 0x02, .somfy_telis.cnt = 0x03}; break; + case SetTypeMotorline433: + gen_info = (GenInfo){ + .type = GenKeeloq, + .mod = "AM650", + .freq = 433920000, + .keeloq.serial = key & 0x0FFFFFFF, + .keeloq.btn = 0x01, + .keeloq.cnt = 0x03, + .keeloq.manuf = "Motorline"}; + break; case SetTypeDoorHan_433_92: gen_info = (GenInfo){ .type = GenKeeloq, diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c index a774e5825..e1ccf8c2f 100644 --- a/lib/subghz/protocols/keeloq.c +++ b/lib/subghz/protocols/keeloq.c @@ -237,9 +237,15 @@ static bool subghz_protocol_keeloq_gen_data( (strcmp(instance->manufacture_name, "Mutanco_Mutancode") == 0) || (strcmp(instance->manufacture_name, "Came_Space") == 0) || (strcmp(instance->manufacture_name, "Genius_Bravo") == 0) || - (strcmp(instance->manufacture_name, "GSN") == 0)) { + (strcmp(instance->manufacture_name, "GSN") == 0) || + (strcmp(instance->manufacture_name, "Rosh") == 0) || + (strcmp(instance->manufacture_name, "Rossi") == 0) || + (strcmp(instance->manufacture_name, "Pecinin") == 0) || + (strcmp(instance->manufacture_name, "Steelmate") == 0)) { // DTM Neo, Came_Space uses 12bit serial -> simple learning // FAAC_RC,XT , Mutanco_Mutancode, Genius_Bravo, GSN 12bit serial -> normal learning + // Rosh, Rossi, Pecinin -> 12bit serial - simple learning + // Steelmate -> 12bit serial - normal learning decrypt = btn << 28 | (instance->generic.serial & 0xFFF) << 16 | instance->generic.cnt; } else if( @@ -249,9 +255,12 @@ static bool subghz_protocol_keeloq_gen_data( // Nice Smilo, MHouse, JCM -> 8bit serial - simple learning decrypt = btn << 28 | (instance->generic.serial & 0xFF) << 16 | instance->generic.cnt; - } else if(strcmp(instance->manufacture_name, "Beninca") == 0) { + } else if( + (strcmp(instance->manufacture_name, "Beninca") == 0) || + (strcmp(instance->manufacture_name, "Merlin") == 0)) { decrypt = btn << 28 | (0x000) << 16 | instance->generic.cnt; // Beninca / Allmatic -> no serial - simple XOR + // Merlin -> no serial - simple XOR } else if(strcmp(instance->manufacture_name, "Centurion") == 0) { decrypt = btn << 28 | (0x1CE) << 16 | instance->generic.cnt; // Centurion -> no serial in hop, uses fixed value 0x1CE - normal learning