Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SubGHz: Princeton - Add check for wrong guard_time values and show guard time in UI #3719

Merged
merged 2 commits into from
Jun 17, 2024
Merged

SubGHz: Princeton - Add check for wrong guard_time values and show guard time in UI #3719

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
decaf11
Add check for wrong guard time values and show guard time in UI
xMasterX Jun 17, 2024
6440f87
Merge branch 'dev' into subghz_princeton_fixes
skotopes Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions lib/subghz/protocols/princeton.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#define TAG "SubGhzProtocolPrinceton"
#define PRINCETON_GUARD_TIME_DEFALUT 30 //GUARD_TIME = PRINCETON_GUARD_TIME_DEFALUT * TE
// Guard Time value should be between 15 -> 72 otherwise default value will be used

static const SubGhzBlockConst subghz_protocol_princeton_const = {
.te_short = 390,
Expand Down Expand Up @@ -172,6 +173,11 @@ SubGhzProtocolStatus
if(!flipper_format_read_uint32(
flipper_format, "Guard_time", (uint32_t*)&instance->guard_time, 1)) {
instance->guard_time = PRINCETON_GUARD_TIME_DEFALUT;
} else {
// Guard Time value should be between 15 -> 72 otherwise default value will be used
if((instance->guard_time < 15) || (instance->guard_time > 72)) {
instance->guard_time = PRINCETON_GUARD_TIME_DEFALUT;
}
}

flipper_format_read_uint32(
Expand Down Expand Up @@ -268,6 +274,10 @@ void subghz_protocol_decoder_princeton_feed(void* context, bool level, uint32_t
instance->generic.data = instance->decoder.decode_data;
instance->generic.data_count_bit = instance->decoder.decode_count_bit;
instance->guard_time = roundf((float)duration / instance->te);
// Guard Time value should be between 15 -> 72 otherwise default value will be used
if((instance->guard_time < 15) || (instance->guard_time > 72)) {
instance->guard_time = PRINCETON_GUARD_TIME_DEFALUT;
}

if(instance->base.callback)
instance->base.callback(&instance->base, instance->base.context);
Expand Down Expand Up @@ -369,7 +379,13 @@ SubGhzProtocolStatus
if(!flipper_format_read_uint32(
flipper_format, "Guard_time", (uint32_t*)&instance->guard_time, 1)) {
instance->guard_time = PRINCETON_GUARD_TIME_DEFALUT;
} else {
// Guard Time value should be between 15 -> 72 otherwise default value will be used
if((instance->guard_time < 15) || (instance->guard_time > 72)) {
instance->guard_time = PRINCETON_GUARD_TIME_DEFALUT;
}
}

} while(false);

return ret;
Expand All @@ -388,12 +404,13 @@ void subghz_protocol_decoder_princeton_get_string(void* context, FuriString* out
"Key:0x%08lX\r\n"
"Yek:0x%08lX\r\n"
"Sn:0x%05lX Btn:%01X\r\n"
"Te:%luus\r\n",
"Te:%luus GT:Te*%lu\r\n",
instance->generic.protocol_name,
instance->generic.data_count_bit,
(uint32_t)(instance->generic.data & 0xFFFFFF),
data_rev,
instance->generic.serial,
instance->generic.btn,
instance->te);
instance->te,
instance->guard_time);
}