Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ul/dev' into mntm-dev

Browse Source
This commit is contained in:
Willy-JL
2024-10-16 00:04:21 +01:00
parent 97d58c500f 7415873449
commit 2f6faa1b7b
21 changed files with 313 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/subghz/protocols/gangqi.c
View File

@@ -490,23 +490,12 @@ void subghz_protocol_decoder_gangqi_get_string(void* context, FuriString* output
((instance->generic.data >> 24) & 0xFF) -
((instance->generic.data >> 16) & 0xFF) - ((instance->generic.data >> 8) & 0xFF);
// Get 3 bytes sum
uint16_t sum_3bytes_serial = ((instance->generic.serial >> 16) & 0xFF) +
((instance->generic.serial >> 8) & 0xFF) +
(instance->generic.serial & 0xFF);
// Returns true if serial is valid
bool serial_is_valid =
(((!(sum_3bytes_serial & 0x3)) &&
((0xB < sum_3bytes_serial) && (sum_3bytes_serial < 0x141))) &&
(((instance->generic.serial >> 16) & 0xFF) <= 0x3));
furi_string_cat_printf(
output,
"%s %db\r\n"
"Key: 0x%X%08lX\r\n"
"Serial: 0x%05lX CRC: 0x%02X\r\n"
"Btn: 0x%01X - %s\r\n"
"Serial is %s\r\n",
"Btn: 0x%01X - %s\r\n",
instance->generic.protocol_name,
instance->generic.data_count_bit,
(uint8_t)(instance->generic.data >> 32),
@@ -514,6 +503,5 @@ void subghz_protocol_decoder_gangqi_get_string(void* context, FuriString* output
instance->generic.serial,
crc,
instance->generic.btn,
subghz_protocol_gangqi_get_button_name(instance->generic.btn),
serial_is_valid ? "valid" : "invalid");
subghz_protocol_gangqi_get_button_name(instance->generic.btn));
}