diff --git a/lib/subghz/protocols/gangqi.c b/lib/subghz/protocols/gangqi.c index 9cbb71763..55998dd2b 100644 --- a/lib/subghz/protocols/gangqi.c +++ b/lib/subghz/protocols/gangqi.c @@ -496,8 +496,8 @@ 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) >= 0x0) || + (((instance->generic.serial >> 16) & 0xFF) <= 0x3))); furi_string_cat_printf( output, diff --git a/lib/subghz/protocols/hollarm.c b/lib/subghz/protocols/hollarm.c index 5cf5a6ef8..ed94cb7a9 100644 --- a/lib/subghz/protocols/hollarm.c +++ b/lib/subghz/protocols/hollarm.c @@ -402,16 +402,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];