Редизайн на основе текущей ветки мейнстрима + новые устройства.

[rtl-433.git] / src / devices / intertechno.c

diff --git a/src/devices/intertechno.c b/src/devices/intertechno.c
index 093e22e71a95d29557a45ea754c9624eec2ff6cb..a07f6d8783bf25ac550df9b26a67e7bad0368d4e 100644 (file)
--- a/src/devices/intertechno.c
+++ b/src/devices/intertechno.c
@@ -1,38 +1,37 @@
 #include "rtl_433.h"
 
-static int intertechno_callback(uint8_t bb[BITBUF_ROWS][BITBUF_COLS], int16_t bits_per_row[BITBUF_ROWS]) {
+static int intertechno_callback(bitbuffer_t *bitbuffer) {
+    bitrow_t *bb = bitbuffer->bb;
 
       //if (bb[1][1] == 0 && bb[1][0] != 0 && bb[1][3]==bb[2][3]){
       if(bb[0][0]==0 && bb[0][0] == 0 && bb[1][0] == 0x56){
-        fprintf(stdout, "SWITCH:TYPE=INTERTECHNO,");
-        fprintf(stdout, "rid0=%x,",bb[1][0]);
-        fprintf(stdout, "rid1=%x,",bb[1][1]);
-        fprintf(stdout, "rid2=%x,",bb[1][2]);
-        fprintf(stdout, "rid3=%x,",bb[1][3]);
-        fprintf(stdout, "rid4=%x,",bb[1][4]);
-        fprintf(stdout, "rid5=%x,",bb[1][5]);
-        fprintf(stdout, "rid6=%x,",bb[1][6]);
-        fprintf(stdout, "rid7=%x,",bb[1][7]);
-        fprintf(stdout, "SLAVE=%i,",bb[1][7] & 0b00001111);
-        fprintf(stdout, "MASTER=%i,",(bb[1][7] & 0b11110000) >> 4);
-       fprintf(stdout, "COMMAND=%i\n",(bb[1][6] & 0b00000111));
+        fprintf(stdout, "Switch event:\n");
+        fprintf(stdout, "protocol       = Intertechno\n");
+        fprintf(stdout, "rid            = %x\n",bb[1][0]);
+        fprintf(stdout, "rid            = %x\n",bb[1][1]);
+        fprintf(stdout, "rid            = %x\n",bb[1][2]);
+        fprintf(stdout, "rid            = %x\n",bb[1][3]);
+        fprintf(stdout, "rid            = %x\n",bb[1][4]);
+        fprintf(stdout, "rid            = %x\n",bb[1][5]);
+        fprintf(stdout, "rid            = %x\n",bb[1][6]);
+        fprintf(stdout, "rid            = %x\n",bb[1][7]);
+        fprintf(stdout, "ADDR Slave     = %i\n",bb[1][7] & 0b00001111);
+        fprintf(stdout, "ADDR Master    = %i\n",(bb[1][7] & 0b11110000) >> 4);
+        fprintf(stdout, "command        = %i\n",(bb[1][6] & 0b00000111));
         fprintf(stdout, "%02x %02x %02x %02x %02x\n",bb[1][0],bb[1][1],bb[1][2],bb[1][3],bb[1][4]);
 
-        if (debug_output)
-            debug_callback(bb, bits_per_row);
-
         return 1;
     }
     return 0;
 }
 
 r_device intertechno = {
-    /* .id             = */ 14,
-    /* .name           = */ "Intertechno 433",
-    /* .modulation     = */ OOK_PWM_D,
-    /* .short_limit    = */ 100,
-    /* .long_limit     = */ 350,
-    /* .reset_limit    = */ 3000,
-    /* .json_callback  = */ &intertechno_callback,
-    /* .json_callback  = */ //&debug_callback,
+    .name           = "Intertechno 433",
+    .modulation     = OOK_PULSE_PPM_RAW,
+    .short_limit    = 400,
+    .long_limit     = 1400,
+    .reset_limit    = 10000,
+    .json_callback  = &intertechno_callback,
+    .disabled       = 1,
+    .demod_arg      = 0,
 };