Bugfixes

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

diff --git a/src/devices/rubicson.c b/src/devices/rubicson.c
index f58a213b3853702a2364a2bf199bdfe5a59eac0c..c89d7c5644b0fef8a1e0c4710303ab5393825d0e 100644 (file)
--- a/src/devices/rubicson.c
+++ b/src/devices/rubicson.c
@@ -1,58 +1,134 @@
 #include "rtl_433.h"
 #include "rtl_433.h"

-
+#include "data.h"
+#include "util.h"

 /* Currently this can decode the temperature and id from Rubicson sensors
  *
  * the sensor sends 36 bits 12 times pwm modulated
  * the data is grouped into 9 nibles
 /* Currently this can decode the temperature and id from Rubicson sensors
  *
  * the sensor sends 36 bits 12 times pwm modulated
  * the data is grouped into 9 nibles

- * [id0] [id1], [unk0] [temp0], [temp1] [temp2], [unk1] [unk2], [unk3]
+ * [id0] [id1], [bat|unk1|chan1|chan2] [temp0], [temp1] [temp2], [F] [crc1], [crc2]

  *
  * The id changes when the battery is changed in the sensor.
  *
  * The id changes when the battery is changed in the sensor.

- * unk0 is always 1 0 0 0, most likely 2 channel bits as the sensor can recevice 3 channels
- * unk1-3 changes and the meaning is unknown
+ * bat bit is 1 if battery is ok, 0 if battery is low
+ * chan1 and chan2 forms a 2bit value for the used channel
+ * unk1 is always 0 probably unused

  * temp is 12 bit signed scaled by 10
  * temp is 12 bit signed scaled by 10

+ * F is always 0xf
+ * crc1 and crc2 forms a 8-bit crc

  *
  * The sensor can be bought at Kjell&Co
  */
 
  *
  * The sensor can be bought at Kjell&Co
  */
 

-static int rubicson_callback(uint8_t bb[BITBUF_ROWS][BITBUF_COLS],int16_t bits_per_row[BITBUF_ROWS]) {
+
+/* Working routine for checking the crc, lots of magic but it works */
+
+//static uint8_t rp[] = {0xb8, 0x80, 0xea, 0xfe, 0x80};
+static uint8_t rp[] = {0xea, 0x8f, 0x6a, 0xfa, 0x50};
+
+int rubicson_crc_check(bitrow_t *bb) {
+    uint8_t crc, w;
+    uint8_t diff[9];
+    int i, ret;
+
+    // diff against ref packet
+
+    diff[0] = rp[0]^bb[1][0];
+    diff[1] = rp[1]^bb[1][1];
+    diff[2] = rp[2]^bb[1][2];
+    diff[3] = rp[3]^bb[1][3];
+    diff[4] = rp[4]^bb[1][4];
+
+//    fprintf(stdout, "%02x %02x %02x %02x %02x\n",rp[0],rp[1],rp[2],rp[3],rp[4]);
+//    fprintf(stdout, "%02x %02x %02x %02x %02x\n",bb[1][0],bb[1][1],bb[1][2],bb[1][3],bb[1][4]);
+//    fprintf(stdout, "%02x %02x %02x %02x %02x\n",diff[0],diff[1],diff[2],diff[3],diff[4]);
+
+    for (crc = 0, w = 0xf1, i = 0; i<7 ; i++){
+        uint8_t c = diff[i/2];
+        unsigned digit = (i&1) ? c&0xF : (c&0xF0)>>4;
+        unsigned j;
+        for (j=4; j-->0; ) {
+            if ((digit >> j) & 1)
+                crc ^= w;
+            w = (w >> 1) ^ ((w & 1) ? 0x98: 0);
+        }
+    }
+    if (crc == (((diff[3]<<4)&0xF0) | (diff[4]>>4)))
+//      printf ("\ncrc ok: %x\n", crc);
+        ret = 1;
+    else
+//      printf ("\ncrc fail: %x\n", crc);
+        ret = 0;
+
+       return ret;
+};
+
+static int rubicson_callback(bitbuffer_t *bitbuffer) {
+    bitrow_t *bb = bitbuffer->bb;

     int temperature_before_dec;
     int temperature_before_dec;

-    int temperature_after_dec;
+    int temperature_after_dec, i;

     int16_t temp;
     int16_t temp;

+    int8_t rh, csum, csum_calc, sum=0;
+    unsigned bits = bitbuffer->bits_per_row[0];
+    data_t *data;
+
+    char time_str[LOCAL_TIME_BUFLEN];
+    uint8_t channel;
+    uint8_t sensor_id;
+    uint8_t battery;
+    float temp_c;
+
+    if (!(bits == 36))
+        return 0;

 
 

-    /* FIXME validate the received message better, figure out crc */
-    if (bb[1][0] == bb[2][0] && bb[2][0] == bb[3][0] && bb[3][0] == bb[4][0] &&
-        bb[4][0] == bb[5][0] && bb[5][0] == bb[6][0] && bb[6][0] == bb[7][0] && bb[7][0] == bb[8][0] &&
-        bb[8][0] == bb[9][0] && (bb[5][0] != 0 && bb[5][1] != 0 && bb[5][2] != 0)) {
+    if (rubicson_crc_check(bb)) {
+        local_time_str(0, time_str);

 
         /* Nible 3,4,5 contains 12 bits of temperature
          * The temerature is signed and scaled by 10 */
         temp = (int16_t)((uint16_t)(bb[0][1] << 12) | (bb[0][2] << 4));
         temp = temp >> 4;
 
 
         /* Nible 3,4,5 contains 12 bits of temperature
          * The temerature is signed and scaled by 10 */
         temp = (int16_t)((uint16_t)(bb[0][1] << 12) | (bb[0][2] << 4));
         temp = temp >> 4;
 

-        temperature_before_dec = abs(temp / 10);
-        temperature_after_dec = abs(temp % 10);
+        channel = ((bb[0][1]&0x30)>>4)+1;
+        battery = (bb[0][1]&0x80);
+        sensor_id = bb[0][0];
+        temp_c = (float) temp / 10.0;

 
 

-        fprintf(stdout, "SENSOR:TYPE=RUBICSON,");
-        fprintf(stdout, "ID=%x,",bb[0][0]);
-        fprintf(stdout, "TEMPERATURE=%s%d.%d\n",temp<0?"-":"",temperature_before_dec, temperature_after_dec);
-        fprintf(stderr, "%02x %02x %02x %02x %02x\n",bb[1][0],bb[0][1],bb[0][2],bb[0][3],bb[0][4]);
-
-        if (debug_output)
-            debug_callback(bb, bits_per_row);
+        data = data_make("time",         "",            DATA_STRING, time_str,
+                        "model",         "",            DATA_STRING, "Rubicson Temperature Sensor",
+                        "id",            "House Code",  DATA_INT,    sensor_id,
+                        "channel",       "Channel",     DATA_INT,    channel,
+                        "battery",       "Battery",     DATA_STRING, battery ? "OK" : "LOW",
+                        "temperature_C", "Temperature", DATA_FORMAT, "%.1f C", DATA_DOUBLE, temp_c,
+                        "crc",           "CRC",         DATA_STRING, "OK",
+                        NULL);
+       data_acquired_handler(data);

 
         return 1;
     }
     return 0;
 }
 
 
         return 1;
     }
     return 0;
 }
 

+static char *output_fields[] = {
+       "time",
+       "model",
+       "id",
+       "channel",
+       "battery",
+       "temperature_C",
+        "crc",
+       NULL
+};
+
+

 // timings based on samp_rate=1024000
 r_device rubicson = {
 // timings based on samp_rate=1024000
 r_device rubicson = {

-    /* .id             = */ 1,
-    /* .name           = */ "Rubicson Temperature Sensor",
-    /* .modulation     = */ OOK_PWM_D,
-    /* .short_limit    = */ 1744/4,
-    /* .long_limit     = */ 3500/4,
-    /* .reset_limit    = */ 5000/4,
-    /* .json_callback  = */ &rubicson_callback,
+    .name           = "Rubicson Temperature Sensor",
+    .modulation     = OOK_PULSE_PPM_RAW,
+    .short_limit    = 488+970,      // Gaps:  Short 976µs, Long 1940µs, Sync 4000µs
+    .long_limit     = 970+2000,     // Pulse: 500µs (Initial pulse in each package is 388µs)
+    .reset_limit    = 4800,             // Two initial pulses and a gap of 9120µs is filtered out
+    .json_callback  = &rubicson_callback,
+    .disabled       = 0,
+    .demod_arg      = 0,
+    .fields         = output_fields,

 };
 
 };