Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Eng1n33r
2022-07-20 19:03:00 +03:00
2 changed files with 19 additions and 19 deletions
+18 -18
View File
@@ -28,21 +28,21 @@ F053CF5255AD2E1875A5C38635F7BF203B1DAE1433B162C30AE8695AC8A5589D
B7EFC77FFA98B173E429B3566A27842C4DC5E91B0BC01F07A6A98332C4E1F42A
D7C7950FFB2C5E7D9BCDBC230BF5F1BFFC0FE6F1CF5C8C6013DD90E41AE403FE
50667B2E5909FD5F9D6385788A81DE5F72E56512EAD6BF5EACCA959CB6AF0DEF
6435E07E5E952124B0F80F76E0F68265B8289087387E35C6D51831B299335480
D7DE1F7748FB8BF90561151CC6AEADC160CA883FE5228768A3737A89F358AF58
FA206F860C6F981FD4A358FDEA5E1860353406D8416FF2A811D17EBA09C803EA
F2F7B2C6705D1457315F2AAA859AB53592241D63B84C045BC742D220BA110144
3F0E05E572D1DF5E2B0BBB20EF8F3EB4D198CDF2794F86089E1DB0EF975E9337
7D54D088C22AA3BA9A97FAB64371B8D512CDEC2A4355116BE2B74BCEC7FEC852
0FD951F13E19F0FC1A25655DA430640034BE34659C526238E62B6042691998CB
FCA04B0BF98FA89AAEF41A78AE7141EF7783E0D0CBAAB1B6F00C0AD3EAA84A54759D46E1A9BEEDCCE68BA12902802111
6AD801CE08D58A380B689574BD7FCACC5DF768BDD93AD7EE1AA514A2351EF13A
0A820F47699AFC4A5E3285BF521771FC5B6C5FB7C6C08A1990DA3B3A6766E860
A7AAC90972DB24D20B57DDD46DC2624FC6169D529426E64B0544AC383799BB2A
AF6088873BC71ED672FA39D50B386523825218C43CDB35D691B0C5895B7EF5C2
774DFAC8D285241368CB377DA947D7A94951A1520017DF77FE2E6A517D5C6A1FC768BB1E2398F5AF71B10D1806C04CCD
AA788A707E64C40E2A0EB8154FE795EAC68B936FD6BAC5DEF7677A4D5FE344DD
A193EF5D1B223B0FA3C231052EDBDD7A31B0C192BCD8E7E37E11D4D899476ACD
F6986E08949122D46BFA7F218B089E8DB00DCFA6971C5F2468CDDD179E5BBC40
EDC23A07689EF6229081D1AB9E249E68527BD33EB72C242BA97727E64AF15BCC
70CC64359A2A5DE40D5A30E916DE6532BCC511E7489CD3A2E5DEC269D303FDBD83B7EA14BF13B40E3C960C6D3D12774B
6BDDE1EA185EA975343C161DF358E0AE71007DE13EE8CD26683C28B21470B910
8128188D151CB4D465427768BF811B1AF5345801BF6F5C937A11F0485F90CA46
9FF6331E570479788C2D61916DB48DDE534F8C049056D4E3216ADCB37C9556A6
0636731CB79FC7459BAFA37E704D58765551631F3936892FD244CF989127540A
ECB48EF5C599D4A5F1FD39A62A06EF910B1B4973BFBFDFEF61F00C81E87847BA
AAC73DC804600A04BD962F7C5B9ACA99F3769EED9F2DD7AF8338E7220271090F
3EA4D2329D0BA54E80AF71966BD74CB13C21DF8010EE795BCCCE6A580EC05758
F491DE599DA31EA9A51509B69846C6C1FB6AB5BBE3AA5915D51225F205A55EC2
54347F82D73E4B66569DAAB52B03EB5A6440F9FDFD302454B84B4E41E0E7E55C
28BBAB93FEB24CE27C47B068C065A294758CECBC3531FA691D085D2B10D189616DB074AC6F8D75BBE176A9459347968C
61260BD3C4FCEF8208CC88682032E4FE295F8D000998302AD11D8D643A30EC4F
97309829406F5CF8FA15565F8F6CF53DEA0E5C0B59DD657A2BB1F58FBCF3DF7F
EA622706F837A37D84D806F15E73D6B95658129F9E12170587200BFB8BDBAEEA
67EAFE49F7872D6EBDB4127E5107D9EB147393038DBAC4D6C4916AD7668C463D
65D7D3225DEAE1BA33F1EAB6F14E817C9D47646123E02C9D4C1BEAF46DD9DF547FE9AD432E1CD648165AE10D7D240B88
223158904F64C174A87ED14F1CACB86DA9AD7D0ED32AEB2A7E955715498969FB
9CA01D5797B93547F246CB06EDD96CABECE27E0BAB6D090681B63E83AD4F2167
AD0BF3A0C1ECDF869BF3022AAA0065941F1D354CCE346B47740D2794FD042D47
+1 -1
View File
@@ -493,7 +493,7 @@ void subghz_protocol_decoder_faac_slh_get_string(void* context, string_t output)
"Key:%lX%08lX\r\n"
"Fix:%08lX Cnt:%05X\r\n"
"Hop:%08lX Btn:%lX\r\n"
"Sn:%07lX Sd:%8X",
"Sn:%07lX Sd:%08lX",
instance->generic.protocol_name,
instance->generic.data_count_bit,
(uint32_t)(instance->generic.data >> 32),