liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1940] SubGuz: fix te pricenton protocol #755

Browse Source
This commit is contained in:
Skorpionm 2021-10-11 23:48:54 +04:00 committed by GitHub
parent 4418e73b26
commit 841e18dfec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/subghz/protocols/subghz_protocol_princeton.c
View File

@ -209,6 +209,7 @@ void subghz_decoder_princeton_parse(
instance->common.parser_step = PrincetonDecoderStepSaveDuration;
instance->common.code_found = 0;
instance->common.code_count_bit = 0;
instance->te = 0;
} else {
instance->common.parser_step = PrincetonDecoderStepReset;
}
@ -217,6 +218,7 @@ void subghz_decoder_princeton_parse(
//save duration
if(level) {
instance->common.te_last = duration;
instance->te += duration;
instance->common.parser_step = PrincetonDecoderStepCheckDuration;
}
break;
@ -226,13 +228,7 @@ void subghz_decoder_princeton_parse(
instance->common.parser_step = PrincetonDecoderStepSaveDuration;
if(instance->common.code_count_bit ==
instance->common.code_min_count_bit_for_found) {
if(instance->common.code_last_found == instance->common.code_found) {
//instance->te = (instance->te+instance->common.te_last)/2; //Option 1 TE averaging
if(instance->te > instance->common.te_last)
instance->te = instance->common.te_last; //Option 2 TE averaging
} else {
instance->te = instance->common.te_last;
}
instance->te /= (instance->common.code_count_bit * 4 + 1);
instance->common.code_last_found = instance->common.code_found;
instance->common.code_last_count_bit = instance->common.code_count_bit;
@ -245,9 +241,12 @@ void subghz_decoder_princeton_parse(
}
instance->common.code_found = 0;
instance->common.code_count_bit = 0;
instance->te = 0;
break;
}
instance->te += duration;
if((DURATION_DIFF(instance->common.te_last, instance->common.te_short) <
instance->common.te_delta) &&
(DURATION_DIFF(duration, instance->common.te_long) <

2
lib/subghz/protocols/subghz_protocol_princeton.h
View File

@ -4,7 +4,7 @@
struct SubGhzDecoderPrinceton {
SubGhzProtocolCommon common;
uint16_t te;
uint32_t te;
};
/** SubGhzEncoderPrinceton anonymous type */