mwalbeck/rtl_433
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor bitbuffer_parse

Browse source
This commit is contained in:
Christian W. Zuckschwerdt 2018-01-05 11:25:51 +01:00
parent 813c87a3d4
commit 87ef432f5b
3 changed files with 57 additions and 46 deletions

3
include/bitbuffer.h
View file

@ -49,6 +49,9 @@ void bitbuffer_invert(bitbuffer_t *bits);
/// Print the content of the bitbuffer
void bitbuffer_print(const bitbuffer_t *bits);
/// Parse a string into a bitbuffer
void bitbuffer_parse(bitbuffer_t *bits, const char *code);
// Search the specified row of the bitbuffer, starting from bit 'start', for
// the pattern provided. Return the location of the first match, or the end
// of the row if no match is found.

53
src/bitbuffer.c
View file

@ -12,6 +12,7 @@
#include "bitbuffer.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -171,6 +172,58 @@ void bitbuffer_print(const bitbuffer_t *bits) {
}
}
void bitbuffer_parse(bitbuffer_t *bits, const char *code)
{
const char *c;
int data = 0;
int width = -1;
memset(bits, 0, sizeof(bitbuffer_t));
for (c = code; *c; ++c) {
if (*c == ' ') {
continue;
} else if (*c == '0' && (*(c + 1) == 'x' || *(c + 1) == 'X')) {
++c;
continue;
} else if (*c == '{') {
if (bits->num_rows > 0) {
if (width >= 0) {
bits->bits_per_row[bits->num_rows - 1] = width;
}
bitbuffer_add_row(bits);
}
width = strtol(c + 1, (char **)&c, 0);
continue;
} else if (*c == '/') {
bitbuffer_add_row(bits);
if (width >= 0) {
bits->bits_per_row[bits->num_rows - 2] = width;
width = -1;
}
continue;
} else if (*c >= '0' && *c <= '9') {
data = *c - '0';
} else if (*c >= 'A' && *c <= 'F') {
data = *c - 'A' + 10;
} else if (*c >= 'a' && *c <= 'f') {
data = *c - 'a' + 10;
}
bitbuffer_add_bit(bits, data >> 3 & 0x01);
bitbuffer_add_bit(bits, data >> 2 & 0x01);
bitbuffer_add_bit(bits, data >> 1 & 0x01);
bitbuffer_add_bit(bits, data >> 0 & 0x01);
}
if (width >= 0 && bits->num_rows > 0) {
bits->bits_per_row[bits->num_rows - 1] = width;
}
}
int compare_rows(bitbuffer_t *bits, unsigned row_a, unsigned row_b) {
return (bits->bits_per_row[row_a] == bits->bits_per_row[row_b] &&

47
src/pulse_demod.c
View file

@ -407,53 +407,8 @@ int pulse_demod_string(const char *code, struct protocol_state *device)
{
int events = 0;
bitbuffer_t bits = {0};
const char *c;
int data = 0;
int width = -1;
for(c = code; *c; ++c) {
if (*c == ' ') {
continue;
} else if (*c == '0' && (*(c+1) == 'x' || *(c+1) == 'X')) {
++c;
continue;
} else if (*c == '{') {
if (bits.num_rows > 0) {
if (width >= 0) {
bits.bits_per_row[bits.num_rows - 1] = width;
}
bitbuffer_add_row(&bits);
}
width = strtol(c+1, (char **)&c, 0);
continue;
} else if (*c == '/') {
bitbuffer_add_row(&bits);
if (width >= 0) {
bits.bits_per_row[bits.num_rows - 2] = width;
width = -1;
}
continue;
} else if (*c >= '0' && *c <= '9') {
data = *c - '0';
} else if (*c >= 'A' && *c <= 'F') {
data = *c - 'A' + 10;
} else if (*c >= 'a' && *c <= 'f') {
data = *c - 'a' + 10;
}
bitbuffer_add_bit(&bits, data >> 3 & 0x01);
bitbuffer_add_bit(&bits, data >> 2 & 0x01);
bitbuffer_add_bit(&bits, data >> 1 & 0x01);
bitbuffer_add_bit(&bits, data >> 0 & 0x01);
}
if (width >= 0 && bits.num_rows > 0) {
bits.bits_per_row[bits.num_rows - 1] = width;
}
bitbuffer_parse(&bits, code);
if (device->callback) {
events += device->callback(&bits);