Merge pull request #61 from matthias-bs/fix-7in1-raingauge

Fix 7in1 raingauge

examples/BresserWeatherSensorMQTTCustom/src/WeatherSensor.cpp

@@ -56,6 +56,9 @@
 // 20230114 Modified decodeBresser6In1Payload() to distinguish msg type based on 'flags' (msg[16])
 // 20230228 Added Bresser 7 in 1 decoder by Jorge Navarro-Ortiz ([email protected])
 // 20230329 Fixed issue introduced with 7 in 1 decoder
+// 20230412 Added workaround for Professional Wind Gauge / Anemometer, P/N 7002531
+// 20230412 Fixed 7 in 1 decoder (valid/complete flags were not set)
+// 20230613 Fixed rain value in 7 in 1 decoder
 //
 // ToDo:
 // -
@@ -79,6 +82,10 @@ uint32_t const sensor_ids_exc[] = SENSOR_IDS_EXC;
 // List of sensor IDs to be included - if empty, handle all available sensors
 uint32_t const sensor_ids_inc[] = SENSOR_IDS_INC;
 
+// List of sensor IDs of the model "BRESSER 3-in-1 Professional Wind Gauge / Anemometer"
+// P/N 7002531 - requiring special heandling in decodeBresser5In1Payload()
+uint32_t const sensor_ids_decode3in1[] = SENSOR_IDS_DECODE3IN1;
+
 int16_t WeatherSensor::begin(void) {
     // https://github.com/RFD-FHEM/RFFHEM/issues/607#issuecomment-830818445
     // Freq: 868.300 MHz, Bandwidth: 203 KHz, rAmpl: 33 dB, sens: 8 dB, DataRate: 8207.32 Baud
@@ -385,6 +392,22 @@ int WeatherSensor::findType(uint8_t type, uint8_t ch)
     return -1;
 }
 
+//
+// Check if sensor is in sensor_ids_decode3in1[]
+//
+bool WeatherSensor::is_decode3in1(uint32_t id)
+{
+    uint8_t n_3in1 = sizeof(sensor_ids_decode3in1)/4;
+    if (n_3in1 != 0) {
+       for (int i=0; i<n_3in1; i++) {
+           if (id == sensor_ids_decode3in1[i]) {
+               log_v("ID %08X is a Professional Wind Gauge", id);
+               return true;
+           }
+       }
+    }
+    return false;
+}
 
 //
 // From from rtl_433 project - https://github.com/merbanan/rtl_433/blob/master/src/util.c
@@ -651,6 +674,7 @@ DecodeStatus WeatherSensor::decodeBresser6In1Payload(uint8_t *msg, uint8_t msgSi
     bool wind_ok     = false;
     bool rain_ok     = false;
     bool moisture_ok = false;
+    bool f_3in1      = false;
 
     // LFSR-16 digest, generator 0x8810 init 0x5412
     int chkdgst = (msg[0] << 8) | msg[1];
@@ -685,20 +709,28 @@ DecodeStatus WeatherSensor::decodeBresser6In1Payload(uint8_t *msg, uint8_t msgSi
     sensor[slot].s_type      = type_tmp;
     sensor[slot].chan        = chan_tmp;
 
+    f_3in1 = is_decode3in1(id_tmp);
 
     // temperature, humidity(, uv) - shared with rain counter
     temp_ok = humidity_ok = (flags == 0);
     if (temp_ok) {
         bool  sign     = (msg[13] >> 3) & 1;
         int   temp_raw = (msg[12] >> 4) * 100 + (msg[12] & 0x0f) * 10 + (msg[13] >> 4);
-        float temp     = ((sign) ? (temp_raw - 1000) : temp_raw) * 0.1f;
-
+        float temp;
+
+        // Workaround for 3-in-1 Professional Wind Gauge / Anemometer 
+        if (f_3in1) {
+            temp     = ((sign) ? -temp_raw : temp_raw) * 0.1f;
+        } else {
+            temp     = ((sign) ? (temp_raw - 1000) : temp_raw) * 0.1f;
+        }
+
         sensor[slot].temp_c      = temp;
         sensor[slot].battery_ok  = (msg[13] >> 1) & 1; // b[13] & 0x02 is battery_good, s.a. #1993
         sensor[slot].humidity    = (msg[14] >> 4) * 10 + (msg[14] & 0x0f);
 
         // apparently ff01 or 0000 if not available, ???0 if valid, inverted BCD
-        uv_ok  = (~msg[15] & 0xff) <= 0x99 && (~msg[16] & 0xf0) <= 0x90;
+        uv_ok  = (~msg[15] & 0xff) <= (0x99 && (~msg[16] & 0xf0) <= 0x90) && !f_3in1;
         if (uv_ok) {
             int uv_raw    = ((~msg[15] & 0xf0) >> 4) * 100 + (~msg[15] & 0x0f) * 10 + ((~msg[16] & 0xf0) >> 4);
                 sensor[slot].uv = uv_raw * 0.1f;
@@ -768,8 +800,10 @@ DecodeStatus WeatherSensor::decodeBresser6In1Payload(uint8_t *msg, uint8_t msgSi
 
     sensor[slot].valid    = true;
 
-    // Weather station data is split into two separate messages
-    sensor[slot].complete = ((sensor[slot].s_type == SENSOR_TYPE_WEATHER1) && sensor[slot].temp_ok && sensor[slot].rain_ok) || (sensor[slot].s_type != SENSOR_TYPE_WEATHER1);
+    // Weather station data is split into two separate messages (except for Professional Wind Gauge)
+    sensor[slot].complete = ((sensor[slot].s_type == SENSOR_TYPE_WEATHER1) && sensor[slot].temp_ok && sensor[slot].rain_ok) ||
+                            f_3in1 ||
+                            (sensor[slot].s_type != SENSOR_TYPE_WEATHER1);
 
     // Save rssi to sensor specific data set
     sensor[slot].rssi = rssi;
@@ -833,8 +867,7 @@ DecodeStatus WeatherSensor::decodeBresser7In1Payload(uint8_t *msg, uint8_t msgSi
   int wdir     = (msgw[4] >> 4) * 100 + (msgw[4] & 0x0f) * 10 + (msgw[5] >> 4);
   int wgst_raw = (msgw[7] >> 4) * 100 + (msgw[7] & 0x0f) * 10 + (msgw[8] >> 4);
   int wavg_raw = (msgw[8] & 0x0f) * 100 + (msgw[9] >> 4) * 10 + (msgw[9] & 0x0f);
-  //int rain_raw = (msgw[10] >> 4) * 100000 + (msgw[10] & 0x0f) * 10000 + (msgw[11] >> 4) * 1000 + (msgw[11] & 0x0f) * 100 + (msgw[12] >> 4) * 10 + (msgw[12] & 0x0f) * 1; // 6 digits
-  int rain_raw = (msgw[10] >> 4) * 1000 + (msgw[10] & 0x0f) * 100 + (msgw[11] >> 4) * 10 + (msgw[11] & 0x0f) * 1; // 4 digits
+  int rain_raw = (msgw[10] >> 4) * 100000 + (msgw[10] & 0x0f) * 10000 + (msgw[11] >> 4) * 1000 + (msgw[11] & 0x0f) * 100 + (msgw[12] >> 4) * 10 + (msgw[12] & 0x0f) * 1; // 6 digits
   float rain_mm = rain_raw * 0.1f;
   int temp_raw = (msgw[14] >> 4) * 100 + (msgw[14] & 0x0f) * 10 + (msgw[15] >> 4);
   float temp_c = temp_raw * 0.1f;

examples/BresserWeatherSensorMQTTCustom/src/WeatherSensor.h

@@ -53,6 +53,8 @@
 // 20220110 Added WEATHER0_RAIN_OV/WEATHER1_RAIN_OV
 // 20230228 Added Bresser 7 in 1 decoder by Jorge Navarro-Ortiz ([email protected])
 // 20230328 Added MSG_BUF_SIZE
+// 20230330 Added changes for Adafruit Feather 32u4 LoRa Radio
+// 20230412 Added workaround for Professional Wind Gauge / Anemometer, P/N 7002531
 //
 // ToDo:
 // -
@@ -63,7 +65,9 @@
 #define WeatherSensor_h
 
 #include <Arduino.h>
-#include <string>
+#if defined(ESP32) || defined(ESP8266)
+  #include <string>
+#endif
 #include <RadioLib.h>
 
 
@@ -103,6 +107,7 @@ typedef enum DecodeStatus {
 } DecodeStatus;
 
 
+#if defined(ESP32) || defined(ESP8266)
 /*!
  * \struct SensorMap
  *
@@ -112,6 +117,7 @@ typedef struct SensorMap {
     uint32_t        id;    //!< ID if sensor (as transmitted in radio message)
     std::string     name;  //!< Name of sensor (e.g. for MQTT topic)
 } SensorMap;
+#endif
 
 
 /*!
@@ -266,6 +272,16 @@ class WeatherSensor {
          */
         int findType(uint8_t type, uint8_t channel = 0xFF);
 
+        /*!
+         * Check if sensor ID is in sensor_ids_decode3in1[]
+         *
+         * \param id        sensor ID
+         *
+         * \returns         true if sensor is in sensor_ids_decode3in1[],
+         *                  false otherwise 
+         */
+        bool is_decode3in1(uint32_t id);
+
     private:
         struct Sensor *pData; //!< pointer to slot in sensor data array
 

library.properties

@@ -1,5 +1,5 @@
 name=BresserWeatherSensorReceiver
-version=0.9.2
+version=0.9.3
 author=Matthias Prinke <[email protected]>
 maintainer=Matthias Prinke <[email protected]>
 sentence=Bresser 5-in-1/6-in-1/7-in-1 868 MHz Weather Sensor Radio Receiver for Arduino based on CC1101 or SX1276/RFM95W.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "BresserWeatherSensorReceiver",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Bresser 5-in-1/6-in-1/7-in-1 868 MHz Weather Sensor Radio Receiver for Arduino based on CC1101 or SX1276/RFM95W",
   "main": "WeatherSensor.cpp",
   "frameworks": "arduino",

src/WeatherSensor.cpp

@@ -57,6 +57,8 @@
 // 20230228 Added Bresser 7 in 1 decoder by Jorge Navarro-Ortiz ([email protected])
 // 20230329 Fixed issue introduced with 7 in 1 decoder
 // 20230412 Added workaround for Professional Wind Gauge / Anemometer, P/N 7002531
+// 20230412 Fixed 7 in 1 decoder (valid/complete flags were not set)
+// 20230613 Fixed rain value in 7 in 1 decoder
 //
 // ToDo:
 // -
@@ -865,8 +867,7 @@ DecodeStatus WeatherSensor::decodeBresser7In1Payload(uint8_t *msg, uint8_t msgSi
   int wdir     = (msgw[4] >> 4) * 100 + (msgw[4] & 0x0f) * 10 + (msgw[5] >> 4);
   int wgst_raw = (msgw[7] >> 4) * 100 + (msgw[7] & 0x0f) * 10 + (msgw[8] >> 4);
   int wavg_raw = (msgw[8] & 0x0f) * 100 + (msgw[9] >> 4) * 10 + (msgw[9] & 0x0f);
-  //int rain_raw = (msgw[10] >> 4) * 100000 + (msgw[10] & 0x0f) * 10000 + (msgw[11] >> 4) * 1000 + (msgw[11] & 0x0f) * 100 + (msgw[12] >> 4) * 10 + (msgw[12] & 0x0f) * 1; // 6 digits
-  int rain_raw = (msgw[10] >> 4) * 1000 + (msgw[10] & 0x0f) * 100 + (msgw[11] >> 4) * 10 + (msgw[11] & 0x0f) * 1; // 4 digits
+  int rain_raw = (msgw[10] >> 4) * 100000 + (msgw[10] & 0x0f) * 10000 + (msgw[11] >> 4) * 1000 + (msgw[11] & 0x0f) * 100 + (msgw[12] >> 4) * 10 + (msgw[12] & 0x0f) * 1; // 6 digits
   float rain_mm = rain_raw * 0.1f;
   int temp_raw = (msgw[14] >> 4) * 100 + (msgw[14] & 0x0f) * 10 + (msgw[15] >> 4);
   float temp_c = temp_raw * 0.1f;