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 --nobuild

Browse Source
This commit is contained in:
Willy-JL
2024-09-17 22:02:44 +01:00
parent d1bc8e53f3 31df2c0655
commit 8d43f8f7cc
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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