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

[FL-1800] IRDA: enc/decoder refactoring, Add NEC42 (#705)

Browse Source 
* WIP: IRDA: multilen protocol refactoring, NEC42
* IRDA: Refactoring encoder/decoder

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Albert Kharisov
2021-09-15 20:22:58 +03:00
committed by GitHub
parent 4768177cf5
commit 4f233ff0a3
21 changed files with 551 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/irda/encoder_decoder/sirc/irda_decoder_sirc.c
View File

@@ -8,16 +8,7 @@
IrdaMessage* irda_decoder_sirc_check_ready(void* ctx) {
IrdaMessage* message = NULL;
IrdaCommonDecoder* decoder = ctx;
if (irda_decoder_sirc_interpret(decoder)) {
message = &decoder->message;
decoder->timings_cnt = 0;
decoder->databit_cnt = 0;
}
return message;
return irda_common_decoder_check_ready(ctx);
}
bool irda_decoder_sirc_interpret(IrdaCommonDecoder* decoder) {
@@ -57,29 +48,8 @@ void* irda_decoder_sirc_alloc(void) {
return irda_common_decoder_alloc(&protocol_sirc);
}
IrdaMessage* irda_decoder_sirc_decode(void* context, bool level, uint32_t duration) {
IrdaCommonDecoder* decoder = context;
IrdaMessage* message = NULL;
if ((decoder->databit_cnt == 12) || (decoder->databit_cnt == 15)) {
if (!level && (duration >= IRDA_SIRC_MIN_SILENCE)) {
if (irda_decoder_sirc_interpret(decoder)) {
message = &decoder->message;
decoder->timings_cnt = 0;
decoder->databit_cnt = 0;
}
}
}
if (!message) {
message = irda_common_decode(decoder, level, duration);
if (message) { /* 20 bit */
decoder->timings_cnt = 0;
decoder->databit_cnt = 0;
}
}
return message;
IrdaMessage* irda_decoder_sirc_decode(void* decoder, bool level, uint32_t duration) {
return irda_common_decode(decoder, level, duration);
}
void irda_decoder_sirc_free(void* decoder) {

36
lib/irda/encoder_decoder/sirc/irda_encoder_sirc.c
View File

@@ -7,34 +7,27 @@
#include <furi.h>
typedef struct {
IrdaCommonEncoder* common_encoder;
uint8_t databits;
} IrdaSircEncoder;
void irda_encoder_sirc_reset(void* encoder_ptr, const IrdaMessage* message) {
furi_assert(encoder_ptr);
furi_assert(message);
IrdaCommonEncoder* encoder = encoder_ptr;
IrdaSircEncoder* encoder_sirc = encoder->context;
irda_common_encoder_reset(encoder);
uint32_t* data = (void*) encoder->data;
if (message->protocol == IrdaProtocolSIRC) {
encoder_sirc->databits = 12;
*data = (message->command & 0x7F);
*data |= (message->address & 0x1F) << 7;
encoder->bits_to_encode = 12;
} else if (message->protocol == IrdaProtocolSIRC15) {
encoder_sirc->databits = 15;
*data = (message->command & 0x7F);
*data |= (message->address & 0xFF) << 7;
encoder->bits_to_encode = 15;
} else if (message->protocol == IrdaProtocolSIRC20) {
encoder_sirc->databits = 20;
*data = (message->command & 0x7F);
*data |= (message->address & 0x1FFF) << 7;
encoder->bits_to_encode = 20;
} else {
furi_assert(0);
}
@@ -43,9 +36,7 @@ void irda_encoder_sirc_reset(void* encoder_ptr, const IrdaMessage* message) {
IrdaStatus irda_encoder_sirc_encode_repeat(IrdaCommonEncoder* encoder, uint32_t* duration, bool* level) {
furi_assert(encoder);
IrdaSircEncoder* encoder_sirc = encoder->context;
uint32_t timings_in_message = 1 + 2 + encoder_sirc->databits * 2;
uint32_t timings_in_message = 1 + 2 + encoder->bits_to_encode * 2 - 1;
furi_assert(encoder->timings_encoded == timings_in_message);
furi_assert(encoder->timings_sum < IRDA_SIRC_REPEAT_PERIOD);
@@ -61,28 +52,21 @@ IrdaStatus irda_encoder_sirc_encode_repeat(IrdaCommonEncoder* encoder, uint32_t*
}
void* irda_encoder_sirc_alloc(void) {
IrdaCommonEncoder* encoder_common = irda_common_encoder_alloc(&protocol_sirc);
IrdaSircEncoder* encoder_sirc = furi_alloc(sizeof(IrdaSircEncoder));
encoder_sirc->common_encoder = encoder_common;
encoder_common->context = encoder_sirc;
return encoder_common;
return irda_common_encoder_alloc(&protocol_sirc);
}
void irda_encoder_sirc_free(void* encoder_ptr) {
IrdaCommonEncoder* encoder = encoder_ptr;
free(encoder->context);
irda_common_encoder_free(encoder);
irda_common_encoder_free(encoder_ptr);
}
IrdaStatus irda_encoder_sirc_encode(void* encoder_ptr, uint32_t* duration, bool* level) {
IrdaCommonEncoder* encoder_common = encoder_ptr;
IrdaSircEncoder* encoder_sirc = encoder_common->context;
IrdaCommonEncoder* encoder = encoder_ptr;
IrdaStatus status = irda_common_encode(encoder_ptr, duration, level);
if ((status == IrdaStatusOk) && (encoder_common->bits_encoded == encoder_sirc->databits)) {
IrdaStatus status = irda_common_encode(encoder, duration, level);
if ((status == IrdaStatusOk) && (encoder->bits_encoded == encoder->bits_to_encode)) {
furi_assert(!*level);
status = IrdaStatusDone;
encoder_common->state = IrdaCommonEncoderStateEncodeRepeat;
encoder->state = IrdaCommonEncoderStateEncodeRepeat;
}
return status;
}