From cae1a6cc0828041f16d869de967c1c989cff4200 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 30 Mar 2023 04:51:52 +0300 Subject: [PATCH] SubGHz: ScherKhan more informative messages instead of "Unknown" may be not correct, because we guessing type by bits --- CHANGELOG.md | 1 + lib/subghz/protocols/scher_khan.c | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27aa033d1..4e26ff744 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### New changes * Plugins: Show External CC1101 module status in Weather Station and in POCSAG Pager plugins * SubGHz: Fix false detections of StarLine 72bit, flipper can decode only 64bit +* SubGHz: ScherKhan, more informative messages instead of "Unknown", may be not correct, because we guessing type by bits * SubGHz: Clear code in "Add Manually" scene (by @gid9798 | PR #403) * Infrared: Universal remote assets updated (by @amec0e | PR #404) * Plugins: GPS NMEA (UART) modifications diff --git a/lib/subghz/protocols/scher_khan.c b/lib/subghz/protocols/scher_khan.c index b68e3c869..3c94ded93 100644 --- a/lib/subghz/protocols/scher_khan.c +++ b/lib/subghz/protocols/scher_khan.c @@ -220,18 +220,30 @@ static void subghz_protocol_scher_khan_check_remote_controller( */ switch(instance->data_count_bit) { - // case 35: //MAGIC CODE, Static - // instance->protocol_name = "MAGIC CODE, Static"; - // break; + case 35: //MAGIC CODE, Static + *protocol_name = "MAGIC CODE, Static"; + instance->serial = 0; + instance->btn = 0; + instance->cnt = 0; + break; case 51: //MAGIC CODE, Dynamic *protocol_name = "MAGIC CODE, Dynamic"; instance->serial = ((instance->data >> 24) & 0xFFFFFF0) | ((instance->data >> 20) & 0x0F); instance->btn = (instance->data >> 24) & 0x0F; instance->cnt = instance->data & 0xFFFF; break; - // case 57: //MAGIC CODE PRO / PRO2 - // instance->protocol_name = "MAGIC CODE PRO / PRO2"; - // break; + case 57: //MAGIC CODE PRO / PRO2 + *protocol_name = "MAGIC CODE PRO / PRO2"; + instance->serial = 0; + instance->btn = 0; + instance->cnt = 0; + break; + case 81: //MAGIC CODE PRO / PRO2 Response + *protocol_name = "MAGIC CODE PRO, Response"; + instance->serial = 0; + instance->btn = 0; + instance->cnt = 0; + break; default: *protocol_name = "Unknown";