Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-23 21:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

hollarm button codes and gangqi validator allow more serials [ci skip]

Browse source
This commit is contained in:
MX 2024-09-16 18:01:38 +03:00
parent 521de2bc04
commit 2af87cdb70
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/subghz/protocols/gangqi.c
View file

@ -496,8 +496,8 @@ void subghz_protocol_decoder_gangqi_get_string(void* context, FuriString* output
bool serial_is_valid = bool serial_is_valid =
(((!(sum_3bytes_serial & 0x3)) && (((!(sum_3bytes_serial & 0x3)) &&
((0xB < sum_3bytes_serial) && (sum_3bytes_serial < 0x141))) && ((0xB < sum_3bytes_serial) && (sum_3bytes_serial < 0x141))) &&
((((instance->generic.serial >> 16) & 0xFF) == 0x2) || ((((instance->generic.serial >> 16) & 0xFF) >= 0x0) ||
(((instance->generic.serial >> 16) & 0xFF) == 0x3))); (((instance->generic.serial >> 16) & 0xFF) <= 0x3)));
furi_string_cat_printf( furi_string_cat_printf(
output, output,

12
lib/subghz/protocols/hollarm.c
View file

@ -402,16 +402,16 @@ static const char* subghz_protocol_hollarm_get_button_name(uint8_t btn) {
"Disarm", // B (2) "Disarm", // B (2)
"Arm", // A (1) "Arm", // A (1)
"0x3", "0x3",
"Alarm", // C (3) "Ringtone/Alarm", // C (3)
"0x5", "0x5",
"0x6", "0x6",
"0x7", "0x7",
"Ring", // D (4) "Ring", // D (4)
"0x9", "Settings mode",
"0xA", "Exit settings",
"0xB", "Vibro sens. setting",
"0xC", "Not used\n(in settings)",
"0xD", "Volume setting",
"0xE", "0xE",
"0xF"}; "0xF"};
return btn <= 0xf ? name_btn[btn] : name_btn[0]; return btn <= 0xf ? name_btn[btn] : name_btn[0];