Merge branch 'pr/385' into 420

assets/resources/subghz/assets/keeloq_mfcodes

@@ -1,52 +1,55 @@
 Filetype: Flipper SubGhz Keystore File
 Version: 0
 Encryption: 1
-IV: 3B 23 A4 B0 BA B1 BA 2C 45 B7 3D AF AE B1 D8 53
-7C22D7C0AD9099E4DD9BE3DD97F4E5171F0502B89FF7CA7B63A218EC70EA66FC
-8468A45C97CC0718E3FE756DE72584C1C7F9FEB3E2873C6DE27A753017D69883
-A5983C8C10314C8BED1258B3CF7B81A43CFDAE0CB4A7E94EBDEC6B9876709157
-7B5C74E9011244735DB27F6D57BE32DA1DB26E1F60CE7C8D1029FDDCE3B12695
-940EF169CA9FE65E7E76FC4B3C8D67DF879D7D165A02E602DAF0B31FA0426B785D0E2500288603346505251D993F28F3
-639BBF96DBBA66408ABB04775689E7C85F4CBE3B1D94B834E4D371F6A262FF75
-1B4935A15D4C019C08E215025E6C1F2C89890C307CEF2ABAD9C1A1C84745B4FB
-5796A104EA1D22A0B9000DA4630248635D1772FDB620B937963D1C8454CD2927
-661EBB18ECC20A236C0AE6BB0AE21B2BF3BDE64A42BA7616D2D87C2992C157FB
-804352D4445CF4E08A7C7CEEA21DCCE0E2A0E436BA148C1E24DDDDA0B8ED3A67
-92D9D6C16DECD2E320D42818CC509FB3C22B8CA096630A50344FB2969653A6696FD46940C347205946358689D80F101E
-02176E6C111509AB74FC6C88FE578F1C035A2676D93FA0AD595771A8A9BC536A842141B6FC0B56EFE1601614B931064A
-5210722EA559F6F8ADD0E79F99A83265C2661DFDD7D1B1EEDAC02F641027EFCE
-CCF01357E399E4F7F2FB32D1E697BF777948FF875A954F55F31BF02C6790EDDC
-98E7CE7D325ED70B32200D809C109718DE633A5A286A3CDC889D9A241475AA4B
-A7ECDEE650749FB4A7764F459AD49EE9F8FDC54B0E83A385BDB6413DD2D5DED1
-B2303659591EE6E9BDF56C1E70AEE6FAF21B97D7FEC026A96CFD780A7C3BC1FF5A4F868DC8BD4DD9160C3C8F715C6DC0
-869316BD6BB3E641A4C2BE32EF160E1B1405B16DD53A3042464CF5E07BBB7AC0
-72D442A018CD2875143AAFAE3D7C4AD1467BCBE0BE71119D123A7941EB0A56EA
-32CC4E29CB6E03ECAE66BC38046D4BB1BDA7E3D0580F3F141008077EE906FA2EE6D2329706B96F49FA4E1E63EA974490
-791E004A574CC7A934DDE0ECAA097593721D71B9EE67995197CAB8349F166E230E5BA6488527C2BB55EA3E5BFD059F44
-2229CC65C99F31E6DB19B29CB625BF4EB95B5EB4AACC60BBB8C65BB7CBB07C2C
-EA04BAF7B59B8D93678544D97BB0EDF81D043C97B740435AFA9EA9F3414829D6
-300A9BD3E912C5D09EFDB50F96704B8287BFDCBA82EF5D0E9D2306A4995B13BF
-0C2EB6DBCB583977789DA234BCF186A0BE3008131360E46A85C13F7EA96469BC
-2417D60848938A3DEAFC63344B4F49A68DC168FD6CE9D7F1CB7A0D70B2ABE32A
-DF14D34ED4B03638926F1C4FF217AD3512A2C94C2A7B518CFCEB161FE9E0860E
-AF920E82A02B46F3743626DB0FCB8F7EC1B444FA82F213C19F68E6A745BA5A8D
-D7A5A38C2CEDA048F9FA5F091E3F36DC564698EF9BDC2B68A31188DF6294CA09
-5358679FC5EB2BC8C85ACA2957B24ACFD966FE53B9E9003264B06CDF900417F8
-D10608BCB41260D5A74E3224C820700E4D03C1CDC379E20D7C03564B3019189B
-EE8EEA79570BB81660ED133D470E051FF45B4E5E8442D5931275353F6A434D66
-019AC0D9AF968B5CE43DA3FC1A6B11770B2CA801829BC05F88BB8A68AC074EDB
-44EF315DA7310A4EE926B734B8F29A2241AAF631AF605B1FA9DD6C2AB2786695
-536FBE9BDD6FDED8F29CB6DC2935781874F8408DF6DB622CE8335B1BD21AB1C7
-76245B84908ECBC102E2F09FAB668D36A68D3C8BD2AB04A4FA119EBECAF232CA80A71D8BB379E59C62B6FB92717DB2FB
-9EA362345970E8CA049119E5211BA78FDBCB33F5FD4B93B4189BE7FFA690ADA9
-40228619492D62DE5D98333265B2AF50773BDD0AC2C192A7C11073A37507CD12
-F6D31A4C37F591CD1C6FD2004501662549319C1862954A10CF5970099381BECC
-8F917EAB00A545F6DEBF67A5DE9C12AA87AFE3C70C832EB4CC4F377A464F43C4
-E78E7F43A40C9AB1EA9DC9F9D2D7381ED037169928F8FEA2299C98C4B0F22569
-983E86FFEE7252E47AB1E0A0FB3CEEC901FF9627DD5242C9A688186F9889BEF0
-2B477C1E5DCD318DD039810D78879185BD8F1DF8C7BB0E330316A4D85A46A7BE
-645F7E9A2EC08168432B3B9D80F45D30BA27E35C1D7075D14882EF50D00C811ED37E39F87C2115B47E302D7A90B2EC4F
-20713989A6FAFC8B4F43A141AED90A67CA4C49D858EEB6E9BC802EA395D5553C
-AB312E5A23E5804D089224BFC62252C92BC23F712C9426DEA1B3742F2A6A3502
-AAE727A60B82B21EA9E7E8111C048581F11F770AF34C619E85932C63C8636895
-1FE3C9BD1241B49E2737B6D760040050D984E4EBF39B5F7C04D16FD84604129C
+IV: AA FF DE 54 A1 BB F1 21 83 46 FE 2A 1E B7 3D 33
+95B8CD65BBAC95EACE67CA94F679B82877A921396D461ECB479722F8A369454A
+61065C41297B9FF8F8168814F49A03D1FE7B4CB79DFFCBBF0402AAA6A2211E84
+A1557AC139188FF105D1081A4B688C5CA440FB5DA7F40901B541120AD08A544F
+AF0A6056D7F0D97DAD6C16C4E63204E4B3B1C5A20AC82B983B516F4F718EE29F
+6861BFAE46A1AADB1DB2D6DFAA7E39D21D5B3E46A41BD50F4F2828879EB328EF0A406F2B9C79A031AB361257E6D69756
+0DDB3DAC53678541981CC46C22CED245CBA314C9BBE1BA9383B8505B75AC5E40
+99AB5D9404934F2D257ED04D9F8CCEE06D00F38157B121AFD63101E4E5C08268
+5114A6C42B342C7D933A76F9052FF963C2047E85EA524497C21B4C35C38EF6E7
+88CA2A1907D94B972FF93DBB9B88CB576F3E1BB0FE8F85A5B2CCA7D44B00374D
+349C4153FE7CA8AE044E9F75F77D9694304474CE3F127CF968662B5F78A7F421
+62AA02E20CA7E691EFC0B55CA41C9BDF889FB23868289284241CD31AA1A0E499AE2A770B6B5AB3170CDCCDB8A246D36C
+97901B5EB76228ADF8E5073F1BAB1502878DEFF1C4EBF12A43D105556CB7E80F947A8BD7831666BD838C57CDF64A6F3F
+B05959D210B500943A93BDFAF783D9DB215FC84503B152EAFBCFB5B6237E3888
+B393DE4489BCAFD5DB80592A12E329E18913E185D2042580048029A8C4C3A257
+B4B30492A5F0C3C763E2F43C02D1451A5B9CFB468CFE62BE85B1F56FF49DAB9A
+CE5D57C0EE3D717FC717EB725970A9F25D211546EE7AC5C237950CEA323D85D4
+4E9028944813FD40A17AF6DF5A97E76179B48EE79265BBD38B07E3A270587A813DADB51B3367479AC5644F754B5613F8
+3B3C3000B9D1361711ECE3DB77C90A059576F738CB167679DA36DD3D128B27A1
+997023148148DE7B9CBA47D3FD48DEF73AA1715FF4BC1E7A1DBA6D52A0DCB2C0
+C8428D18E69FB92486434FCE470F1FF37D40507F27D824679C132A70D516530367277F02DDB5C464D03450FF6B425A24
+3701200DF5DA7235971FD95844056E74C7D61A8EB12A8772E04F52037C63D50B6229A7F905F3E6F84C565FCC7632870C
+BB392A464CDC0D5D923AA9EF8ECC3C6F020D0AD82165462DF0DE7C5025AAAAAC
+999C82209B30638506E5D708471676D2CBB4A432E5AF86ABD61179111EDAE636
+FDE2A452A6B47261338117EC20FC57731DA492562ECD21BBC61F098A5442CF20
+D923BABB5C4DFB48E3F763898B2796C7830D3EE9A91DF904AC2223A0F4736507
+0987DDAC695DD5E4607048DF1D4EF96599E17ED52F41785E676AA048AB7213FE
+26CB3E6CFA10338A8DDD99BFF6957C53DEF435CB0FF977B71B5164ADFE11292A
+097908FD07A0A093CA80E6FF59524707C1A11169D0CB6F8E4967D8DAA725FE7A
+8C629E70A5CC6FCB039DFA1A6AC58CB7B7E92C85BDA66266AB49E6B1285FC7A6
+39A2052350CD446EDC1B9AD0C2DD51C78B2E5F3A76AAD0EC200F74B40ACD4AC5
+A1685CF8C4A5401F2CA0C8172CB5B4B5726C61CE68A72AE834B0A472CEB2F3DE
+1F5ED5793DB381D1B501BA8A4DF3E74FB11FC1A922DDC8AE62E5BA8934C37EA8
+D80EF661BF36E2F6C179E253CE5BC3732684ACBC7C65E526A628442A2EBF8FAA
+7785BF721F21E19A8CFBFBBB56BD76B96A4E8EF9F8A2344009B14AB385909598F834A5533B648DA7D62BD6D4314A43A5
+C8F6F943DE615B5827569B283577344C0455B3279C73634FC4E0E9A8088DF633
+FB4F4C786FC51BBDA679A212B4A05EF120AC62F7EBFFE8263BD50A4D9BC9C6E0
+16EEC35CF69BA86DB3BE999CDF9B39F5736F3727B2AA2C5AB9141A48F176D831
+AD1AD6DE813E7710DA3AF546D4F9EA085831E6B3FA17B64F1B8765F48134EA54
+345D743BC35B4A8614632ADD11E809C0D1E6C78F9469256B9A738DA0B648B2B8
+7C876CECAC839EBB4609C3996966C3EC454F51C8ABCC51097E405370C4B6F086
+0F857C031FD3047607647148C534F969567F207FF1691D8D06DCDF4C2514695D
+EC0630EDC82241C1952F49B6B1B0C1A954A7DDD6BDB1326ACC54AD449D1BF985
+286EF9F7FD0D09F2604CCE867C52144CD0C4773A3D8183066C61B8BF9860AE7C
+EA55424097A08722A66966E3177E09DE91AC65175E5C68CB47B6153E6585DF85
+D54FCDF9EA4BD1FE4F316DB6D5CE4A2675F2D0144772865EDC781FBA7DFD23E4
+7A2F5C5CA9F97FE9527BAA760E64B930C407A27DE036476737E6BDD9422F4056A5F1F414F12F0982109FD7C30E8CC1CB
+06BAD9B4EEEEB1BCF8C97672D271534FE84D772282EE9642698788D3842D7641
+101C1B2DBD963E23777294C22E553D145D5B40838F91355CA86D571A0CEFF68F
+1B148C2B502B3E0A5BD40858E019C513DD4CCAF2A114CBB29C59BFB018079285
+8DF4D07EC20FF873EA989ACEF4AF96E9787FE6E0F71965858B4186C3AF302A31
+2317DC8C098CD60F3467B3644A19CCE887339708820CD37F6F5277D6648F837512F70CE90E23D7339CDDE002BD8D83DB

lib/subghz/protocols/keeloq_common.c

@@ -109,6 +109,34 @@ inline uint64_t
 
 inline uint64_t
     subghz_protocol_keeloq_common_magic_serial_type1_learning(uint32_t data, uint64_t man) {
-    return man | ((uint64_t)data << 40) |
+    return (man & 0xFFFFFFFF) | ((uint64_t)data << 40) |
            ((uint64_t)(((data & 0xff) + ((data >> 8) & 0xFF)) & 0xFF) << 32);
 }
+
+/** Magic_serial_type2 Learning
+ * @param data - btn+serial number (32bit)
+ * @param man - magic man (64bit)
+ * @return manufacture for this serial number (64bit)
+ */
+
+inline uint64_t
+    subghz_protocol_keeloq_common_magic_serial_type2_learning(uint32_t data, uint64_t man) {
+    uint8_t* p = (uint8_t*)&data;
+    uint8_t* m = (uint8_t*)&man;
+    m[7] = p[0];
+    m[6] = p[1];
+    m[5] = p[2];
+    m[4] = p[3];
+    return man;
+}
+
+/** Magic_serial_type3 Learning
+ * @param data - serial number (24bit)
+ * @param man - magic man (64bit)
+ * @return manufacture for this serial number (64bit)
+ */
+
+inline uint64_t
+    subghz_protocol_keeloq_common_magic_serial_type3_learning(uint32_t data, uint64_t man) {
+    return (man & 0xFFFFFFFFFF000000) | (data & 0xFFFFFF);
+}

lib/subghz/protocols/keeloq_common.h

@@ -80,3 +80,19 @@ uint64_t subghz_protocol_keeloq_common_faac_learning(const uint32_t seed, const
  */
 
 uint64_t subghz_protocol_keeloq_common_magic_serial_type1_learning(uint32_t data, uint64_t man);
+
+/** Magic_serial_type2 Learning
+ * @param data - btn+serial number (32bit)
+ * @param man - magic man (64bit)
+ * @return manufacture for this serial number (64bit)
+ */
+
+uint64_t subghz_protocol_keeloq_common_magic_serial_type2_learning(uint32_t data, uint64_t man);
+
+/** Magic_serial_type3 Learning
+ * @param data - btn+serial number (32bit)
+ * @param man - magic man (64bit)
+ * @return manufacture for this serial number (64bit)
+ */
+
+uint64_t subghz_protocol_keeloq_common_magic_serial_type3_learning(uint32_t data, uint64_t man);