Fix #158

Author: ojousima

libraries/ruuvi_sensor_formats/sensortag.c

@@ -82,19 +82,30 @@ void encodeToRawFormat3(uint8_t* data_buffer, const ruuvi_sensor_t* data)
 {
     //serialize values into a string
     data_buffer[0] = SENSOR_TAG_DATA_FORMAT;
-    data_buffer[1] = data->humidity /512;
-    data_buffer[2] = (data->temperature)/100;
-    data_buffer[3] = (data->temperature)%100;
+    uint32_t humidity = data->humidity;
+    if(data->humidity == HUMIDITY_INVALID) { humidity = 0; }
+    data_buffer[1] = humidity / 512;
+    int32_t temperature = data->temperature;
+    if(data->temperature == TEMPERATURE_INVALID) { temperature = 0; }
+    data_buffer[2] = temperature / 100;
+    data_buffer[3] = temperature % 100;
     uint32_t pressure = data->pressure;
+    if(data->pressure == PRESSURE_INVALID) { pressure = 50000<<8; }
     pressure = (uint16_t)((pressure >> 8) - 50000); //Scale into pa, Shift by -50000 pa as per Ruu.vi interface.
     data_buffer[4] = (pressure)>>8;
     data_buffer[5] = (pressure)&0xFF;
-    data_buffer[6] = (data->accX)>>8;
-    data_buffer[7] = (data->accX)&0xFF;
-    data_buffer[8] = (data->accY)>>8;
-    data_buffer[9] = (data->accY)&0xFF;
-    data_buffer[10] = (data->accZ)>>8;
-    data_buffer[11] = (data->accZ)&0xFF;
+    int32_t accX = data->accX;
+    if(data->accX == ACCELERATION_INVALID) { accX = 0; }
+    data_buffer[6] = (accX)>>8;
+    data_buffer[7] = (accX)&0xFF;
+    int32_t accY = data->accY;
+    if(data->accY == ACCELERATION_INVALID) { accY = 0; }
+    data_buffer[8] = (accY)>>8;
+    data_buffer[9] = (accY)&0xFF;
+    int32_t accZ = data->accZ;
+    if(data->accZ == ACCELERATION_INVALID) { accZ = 0; }
+    data_buffer[10] = (accZ)>>8;
+    data_buffer[11] = (accZ)&0xFF;
     data_buffer[12] = (data->vbat)>>8;
     data_buffer[13] = (data->vbat)&0xFF;
 }

ruuvi_examples/ruuvi_firmware/bluetooth_application_config.h

@@ -5,7 +5,7 @@
 #define APP_DEVICE_NAME                 APPLICATION_DEVICE_NAME         /**< TODO: Refactoring **/
 #define APP_DEVICE_NAME_LENGTH          APPLICATION_DEVICE_NAME_LENGTH
 #define APP_TX_POWER                    4                               /**< dBm **/
-#define INIT_FWREV                      "2.5.5"                         /**< Github tag. Do not include specifiers such as "alpha" so you can accept ready binaries as they are **/
+#define INIT_FWREV                      "2.5.6"                         /**< Github tag. Do not include specifiers such as "alpha" so you can accept ready binaries as they are **/
 #define INIT_SWREV                      INIT_FWREV                      /**< FW and SW are same thing in this context **/                             
 
 // milliseconds until main loop timer function is called. Other timers can bring

ruuvi_examples/ruuvi_firmware/main.c

@@ -354,11 +354,7 @@ static void main_sensor_task(void* p_data, uint16_t length)
                           .pressure = PRESSURE_INVALID,
                           .temperature = TEMPERATURE_INVALID
                         };
-  int32_t  raw_t  = 0;
-  uint32_t raw_p = 0;
-  uint32_t raw_h = 0;
   lis2dh12_sensor_buffer_t buffer;
-  int32_t acc[3] = {0};
 
   if (fast_advertising && ((millis() - fast_advertising_start) > ADVERTISING_STARTUP_PERIOD))
   {
@@ -383,7 +379,7 @@ static void main_sensor_task(void* p_data, uint16_t length)
     int32_t temp;                                        // variable to hold temp reading
     (void)sd_temp_get(&temp);                            // get new temperature
     temp *= 25;                                          // SD returns temp * 4. Ruuvi format expects temp * 100. 4*25 = 100.
-    raw_t = (int32_t) temp;
+    data.temperature = temp;
   }
 
   if(lis2dh12_available)
@@ -395,9 +391,6 @@ static void main_sensor_task(void* p_data, uint16_t length)
     data.accZ = buffer.sensor.z;
   }
 
-  NRF_LOG_DEBUG("temperature: %d, pressure: %d, humidity: %d x: %d y: %d z: %d\r\n", raw_t, raw_p, raw_h, acc[0], acc[1], acc[2]);
-  NRF_LOG_DEBUG("VBAT: %d send %d \r\n", vbat, data.vbat);
-
   switch(tag_mode)
   {
     case RAWv2_FAST: