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

shortening output

Browse source
This commit is contained in:
Denis Bodor 2017-07-20 14:20:45 +02:00 • committed by Benjamin Larsson
parent 47eca07e2d
commit 6fd2bb4da1
1 changed files with 8 additions and 29 deletions

37
src/devices/cardin.c
View file

@ -16,8 +16,7 @@ static int cardin_callback(bitbuffer_t *bitbuffer) {
bitrow_t *bb = bitbuffer->bb; bitrow_t *bb = bitbuffer->bb;
int i, j, k; int i, j, k;
unsigned char dip[10] = {'-','-','-','-','-','-','-','-','-', '\0'}; unsigned char dip[10] = {'-','-','-','-','-','-','-','-','-', '\0'};
char rbuttonJ1[64] = { 0 }; char *rbutton[4] = { "11R", "10R", "01R", "00L?" };
char rbuttonJ2[64] = { 0 };
data_t *data; data_t *data;
char time_str[LOCAL_TIME_BUFLEN]; char time_str[LOCAL_TIME_BUFLEN];
@ -99,31 +98,12 @@ static int cardin_callback(bitbuffer_t *bitbuffer) {
dip[8]='+'; dip[8]='+';
} }
// Jumpers for the right button
if((bb[0][2] & 3) == 3) {
strcpy(rbuttonJ2, "--o (this is right button)");
strcpy(rbuttonJ1, "--o");
}
if((bb[0][2] & 9) == 9) {
strcpy(rbuttonJ2, "--o (this is right button)");
strcpy(rbuttonJ1, "o--");
}
if((bb[0][2] & 12) == 12) {
strcpy(rbuttonJ2, "o-- (this is left button or two buttons on same channel)");
strcpy(rbuttonJ1, "o--");
}
if((bb[0][2] & 6) == 6) {
strcpy(rbuttonJ2, "o-- (this is right button)");
strcpy(rbuttonJ1, "--o");
}
local_time_str(0, time_str); local_time_str(0, time_str);
data = data_make( data = data_make(
"time", "", DATA_STRING, time_str, "time", "", DATA_STRING, time_str,
"model", "", DATA_STRING, "Cardin S466", "model", "", DATA_STRING, "Cardin S466",
"dipswitch", "dipswitch", DATA_STRING, dip, "dipswitch", "dipswitch", DATA_STRING, dip,
"rbuttonJ2", "right button j2", DATA_STRING, rbuttonJ2, "rbutton", "right button switches", DATA_STRING, rbutton[((bb[0][2] & 15) / 3)-1],
"rbuttonJ1", "right button j1", DATA_STRING, rbuttonJ1,
NULL); NULL);
data_acquired_handler(data); data_acquired_handler(data);
@ -133,12 +113,11 @@ static int cardin_callback(bitbuffer_t *bitbuffer) {
return 0; return 0;
} }
static char *csv_output_fields[] = { static char *output_fields[] = {
"time", "time",
"model", "model",
"dipswitch", "dipswitch",
"rbuttonJ2", "rbutton",
"rbuttonJ1",
NULL NULL
}; };
@ -151,5 +130,5 @@ r_device cardin = {
.json_callback = &cardin_callback, .json_callback = &cardin_callback,
.disabled = 0, .disabled = 0,
.demod_arg = 0, .demod_arg = 0,
.fields = csv_output_fields, .fields = output_fields,
}; };