From c88329ab40cf8e18c56fdaec426242d13ee45cb2 Mon Sep 17 00:00:00 2001
From: matthias-bs <83612361+matthias-bs@users.noreply.github.com>
Date: Thu, 23 Nov 2023 17:20:24 +0000
Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20@=20matthias?=
=?UTF-8?q?-bs/BresserWeatherSensorReceiver@f53d2fa1fc0e748fa027364fbea78e?=
=?UTF-8?q?4c49eb07de=20=F0=9F=9A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
_weather_sensor_8h_source.html | 359 +++++++++---------
navtreeindex0.js | 25 +-
...ct_weather_sensor_1_1_weather-members.html | 3 +-
struct_weather_sensor_1_1_weather.html | 12 +-
struct_weather_sensor_1_1_weather.js | 1 -
5 files changed, 196 insertions(+), 204 deletions(-)
diff --git a/_weather_sensor_8h_source.html b/_weather_sensor_8h_source.html
index 73ae27d4..64bd97d9 100644
--- a/_weather_sensor_8h_source.html
+++ b/_weather_sensor_8h_source.html
@@ -243,210 +243,205 @@
-
-
-
-
-
+
+
+
+
+
213 #ifdef WIND_DATA_FLOATINGPOINT
- 214 float wind_direction_deg;
- 215 float wind_gust_meter_sec;
- 216 float wind_avg_meter_sec;
+ 214 float wind_direction_deg = 0.0;
+ 215 float wind_gust_meter_sec = 0.0;
+ 216 float wind_avg_meter_sec = 0.0;
218 #ifdef WIND_DATA_FIXEDPOINT
- 222 uint16_t wind_direction_deg_fp1;
- 223 uint16_t wind_gust_meter_sec_fp1;
- 224 uint16_t wind_avg_meter_sec_fp1;
+ 222 uint16_t wind_direction_deg_fp1 = 0;
+ 223 uint16_t wind_gust_meter_sec_fp1 = 0;
+ 224 uint16_t wind_avg_meter_sec_fp1 = 0;
-
-
-
- 229 memset(
this, 0,
sizeof(*
this));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 286 memset(
this, 0,
sizeof(*
this));
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 281 memset(
this, 0,
sizeof(*
this));
+
+
+
+
+
+
+
-
-
-
-
-
- 300 bool genMessage(
int i, uint32_t
id = 0xff, uint8_t s_type = 1, uint8_t channel = 0, uint8_t startup = 0);
-
-
-
-
- 313 for (
int i=0; i< NUM_SENSORS; i++) {
- 314 if ((type == 0xFF) || (
sensor[i].s_type == type)) {
-
-
-
-
-
-
-
-
-
- 339 int findType(uint8_t type, uint8_t channel = 0xFF);
-
-
-
-
- 352 struct Sensor *pData;
-
- 371 int findSlot(uint32_t
id, DecodeStatus * status);
-
-
- 374 #ifdef BRESSER_5_IN_1
- 384 DecodeStatus decodeBresser5In1Payload(
const uint8_t *msg, uint8_t msgSize);
-
- 386 #ifdef BRESSER_6_IN_1
- 398 DecodeStatus decodeBresser6In1Payload(
const uint8_t *msg, uint8_t msgSize);
-
- 400 #ifdef BRESSER_7_IN_1
- 410 DecodeStatus decodeBresser7In1Payload(
const uint8_t *msg, uint8_t msgSize);
-
- 412 #ifdef BRESSER_LIGHTNING
- 422 DecodeStatus decodeBresserLightningPayload(
const uint8_t *msg, uint8_t msgSize);
-
- 424 #ifdef BRESSER_LEAKAGE
- 434 DecodeStatus decodeBresserLeakagePayload(
const uint8_t *msg, uint8_t msgSize);
-
-
-
- 441 uint16_t lfsr_digest16(uint8_t
const message[],
unsigned bytes, uint16_t gen, uint16_t key);
-
- 451 int add_bytes(uint8_t
const message[],
unsigned num_bytes);
-
- 463 uint16_t crc16(uint8_t
const message[],
unsigned nBytes, uint16_t polynomial, uint16_t init);
-
- 465 #if CORE_DEBUG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
- 477 void log_message(
const char *descr,
const uint8_t *msg, uint8_t msgSize) {
-
- 479 const char txt[] =
"Byte #: ";
-
- 481 int len1 = strlen(txt);
- 482 int len2 = strlen(descr) + 2;
- 483 int prefix_len = max(len1, len2);
-
- 485 memset(buf,
' ', prefix_len);
- 486 buf[prefix_len] =
'\0';
- 487 offs = (len1 < len2) ? (len2 - len1) : 0;
- 488 strcpy(&buf[offs], txt);
-
-
- 491 for (
size_t i = 0 ; i < msgSize; i++) {
- 492 sprintf(&buf[strlen(buf)],
"%02d ", i);
-
-
-
- 496 memset(buf,
' ', prefix_len);
- 497 buf[prefix_len] =
'\0';
- 498 offs = (len1 > len2) ? (len1 - len2) : 0;
- 499 sprintf(&buf[offs],
"%s: ", descr);
-
- 501 for (
size_t i = 0 ; i < msgSize; i++) {
- 502 sprintf(&buf[strlen(buf)],
"%02X ", msg[i]);
-
-
-
-
-
-
-
-
+ 295 bool genMessage(
int i, uint32_t
id = 0xff, uint8_t s_type = 1, uint8_t channel = 0, uint8_t startup = 0);
+
+
+
+
+ 308 for (
int i=0; i< NUM_SENSORS; i++) {
+ 309 if ((type == 0xFF) || (
sensor[i].s_type == type)) {
+
+
+
+
+
+
+
+
+
+ 334 int findType(uint8_t type, uint8_t channel = 0xFF);
+
+
+
+
+ 347 struct Sensor *pData;
+
+ 366 int findSlot(uint32_t
id, DecodeStatus * status);
+
+
+ 369 #ifdef BRESSER_5_IN_1
+ 379 DecodeStatus decodeBresser5In1Payload(
const uint8_t *msg, uint8_t msgSize);
+
+ 381 #ifdef BRESSER_6_IN_1
+ 393 DecodeStatus decodeBresser6In1Payload(
const uint8_t *msg, uint8_t msgSize);
+
+ 395 #ifdef BRESSER_7_IN_1
+ 405 DecodeStatus decodeBresser7In1Payload(
const uint8_t *msg, uint8_t msgSize);
+
+ 407 #ifdef BRESSER_LIGHTNING
+ 417 DecodeStatus decodeBresserLightningPayload(
const uint8_t *msg, uint8_t msgSize);
+
+ 419 #ifdef BRESSER_LEAKAGE
+ 429 DecodeStatus decodeBresserLeakagePayload(
const uint8_t *msg, uint8_t msgSize);
+
+
+
+ 436 uint16_t lfsr_digest16(uint8_t
const message[],
unsigned bytes, uint16_t gen, uint16_t key);
+
+ 446 int add_bytes(uint8_t
const message[],
unsigned num_bytes);
+
+ 458 uint16_t crc16(uint8_t
const message[],
unsigned nBytes, uint16_t polynomial, uint16_t init);
+
+ 460 #if CORE_DEBUG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
+ 472 void log_message(
const char *descr,
const uint8_t *msg, uint8_t msgSize) {
+
+ 474 const char txt[] =
"Byte #: ";
+
+ 476 int len1 = strlen(txt);
+ 477 int len2 = strlen(descr) + 2;
+ 478 int prefix_len = max(len1, len2);
+
+ 480 memset(buf,
' ', prefix_len);
+ 481 buf[prefix_len] =
'\0';
+ 482 offs = (len1 < len2) ? (len2 - len1) : 0;
+ 483 strcpy(&buf[offs], txt);
+
+
+ 486 for (
size_t i = 0 ; i < msgSize; i++) {
+ 487 sprintf(&buf[strlen(buf)],
"%02d ", i);
+
+
+
+ 491 memset(buf,
' ', prefix_len);
+ 492 buf[prefix_len] =
'\0';
+ 493 offs = (len1 > len2) ? (len1 - len2) : 0;
+ 494 sprintf(&buf[offs],
"%s: ", descr);
+
+ 496 for (
size_t i = 0 ; i < msgSize; i++) {
+ 497 sprintf(&buf[strlen(buf)],
"%02X ", msg[i]);
+
+
+
+
+
+
+
+
Receive, decode and store Bresser Weather Sensor Data Uses CC1101 or SX1276 radio module for receivin...
Definition: WeatherSensor.h:146
DecodeStatus getMessage(void)
Tries to receive radio message (non-blocking) and to decode it. Timeout occurs after a multitude of e...
Definition: WeatherSensor.cpp:227
int findId(uint32_t id)
Definition: WeatherSensor.cpp:442
bool is_decode3in1(uint32_t id)
Definition: WeatherSensor.cpp:468
-float rssi
received signal strength indicator in dBm
Definition: WeatherSensor.h:292
+float rssi
received signal strength indicator in dBm
Definition: WeatherSensor.h:287
bool getData(uint32_t timeout, uint8_t flags=0, uint8_t type=0, void(*func)()=NULL)
Wait for reception of data or occurrance of timeout. With BRESSER_6_IN_1, data is distributed across ...
Definition: WeatherSensor.cpp:170
int16_t begin(void)
Constructor.
Definition: WeatherSensor.cpp:106
int findType(uint8_t type, uint8_t channel=0xFF)
Definition: WeatherSensor.cpp:455
-sensor_t sensor[NUM_SENSORS]
sensor data array
Definition: WeatherSensor.h:291
+sensor_t sensor[NUM_SENSORS]
sensor data array
Definition: WeatherSensor.h:286
bool genMessage(int i, uint32_t id=0xff, uint8_t s_type=1, uint8_t channel=0, uint8_t startup=0)
Generates data otherwise received and decoded from a radio message.
Definition: WeatherSensor.cpp:313
-struct Sensor sensor_t
Shortcut for struct Sensor.
Definition: WeatherSensor.h:290
-void clearSlots(uint8_t type=0xFF)
Clear sensor data.
Definition: WeatherSensor.h:311
+struct Sensor sensor_t
Shortcut for struct Sensor.
Definition: WeatherSensor.h:285
+void clearSlots(uint8_t type=0xFF)
Clear sensor data.
Definition: WeatherSensor.h:306
DecodeStatus decodeMessage(const uint8_t *msg, uint8_t msgSize)
Decode message Tries the available decoders until a decoding was successful.
Definition: WeatherSensor.cpp:269
Mapping of sensor IDs to names.
Definition: WeatherSensor.h:133
std::string name
Name of sensor (e.g. for MQTT topic)
Definition: WeatherSensor.h:135
uint32_t id
ID if sensor (as transmitted in radio message)
Definition: WeatherSensor.h:134
-Definition: WeatherSensor.h:256
-uint16_t pm_2_5
air quality PM2.5 in µg/m³
Definition: WeatherSensor.h:258
-uint16_t pm_10
air quality PM10 in µg/m³
Definition: WeatherSensor.h:259
-Definition: WeatherSensor.h:251
-bool alarm
water leakage alarm (only water leakage)
Definition: WeatherSensor.h:253
-Definition: WeatherSensor.h:242
-uint16_t unknown1
unknown part 1
Definition: WeatherSensor.h:246
-uint8_t strike_count
lightning strike counter (only lightning)
Definition: WeatherSensor.h:245
-uint8_t distance_km
lightning distance in km (only lightning)
Definition: WeatherSensor.h:244
-uint16_t unknown2
unknown part 2
Definition: WeatherSensor.h:247
-sensor data and status flags
Definition: WeatherSensor.h:267
-bool battery_ok
battery o.k.
Definition: WeatherSensor.h:273
-float rssi
received signal strength indicator in dBm
Definition: WeatherSensor.h:269
-bool complete
data is split into two separate messages is complete (only 6-in-1 WS)
Definition: WeatherSensor.h:275
-uint8_t s_type
sensor type
Definition: WeatherSensor.h:270
-bool startup
startup after reset / battery change
Definition: WeatherSensor.h:272
-uint32_t sensor_id
sensor ID (5-in-1: 1 byte / 6-in-1: 4 bytes / 7-in-1: 2 bytes)
Definition: WeatherSensor.h:268
-uint8_t chan
channel
Definition: WeatherSensor.h:271
-bool valid
data valid (but not necessarily complete)
Definition: WeatherSensor.h:274
-Definition: WeatherSensor.h:234
-float temp_c
temperature in degC
Definition: WeatherSensor.h:238
-uint8_t moisture
moisture in % (only 6-in-1)
Definition: WeatherSensor.h:239
+Definition: WeatherSensor.h:251
+uint16_t pm_2_5
air quality PM2.5 in µg/m³
Definition: WeatherSensor.h:253
+uint16_t pm_10
air quality PM10 in µg/m³
Definition: WeatherSensor.h:254
+Definition: WeatherSensor.h:246
+bool alarm
water leakage alarm (only water leakage)
Definition: WeatherSensor.h:248
+Definition: WeatherSensor.h:237
+uint16_t unknown1
unknown part 1
Definition: WeatherSensor.h:241
+uint8_t strike_count
lightning strike counter (only lightning)
Definition: WeatherSensor.h:240
+uint8_t distance_km
lightning distance in km (only lightning)
Definition: WeatherSensor.h:239
+uint16_t unknown2
unknown part 2
Definition: WeatherSensor.h:242
+sensor data and status flags
Definition: WeatherSensor.h:262
+bool battery_ok
battery o.k.
Definition: WeatherSensor.h:268
+float rssi
received signal strength indicator in dBm
Definition: WeatherSensor.h:264
+bool complete
data is split into two separate messages is complete (only 6-in-1 WS)
Definition: WeatherSensor.h:270
+uint8_t s_type
sensor type
Definition: WeatherSensor.h:265
+bool startup
startup after reset / battery change
Definition: WeatherSensor.h:267
+uint32_t sensor_id
sensor ID (5-in-1: 1 byte / 6-in-1: 4 bytes / 7-in-1: 2 bytes)
Definition: WeatherSensor.h:263
+uint8_t chan
channel
Definition: WeatherSensor.h:266
+bool valid
data valid (but not necessarily complete)
Definition: WeatherSensor.h:269
+Definition: WeatherSensor.h:229
+float temp_c
temperature in degC
Definition: WeatherSensor.h:233
+uint8_t moisture
moisture in % (only 6-in-1)
Definition: WeatherSensor.h:234
Definition: WeatherSensor.h:201
float light_klx
Light KLux (only 7-in-1)
Definition: WeatherSensor.h:209
bool light_ok
light o.k. (only 7-in-1)
Definition: WeatherSensor.h:204
diff --git a/navtreeindex0.js b/navtreeindex0.js
index c77d4495..497a2a81 100644
--- a/navtreeindex0.js
+++ b/navtreeindex0.js
@@ -81,19 +81,18 @@ var NAVTREEINDEX0 =
"struct_weather_sensor_1_1_soil.html#a593b5edcdee32762132c39a143aaf1ff":[1,0,5,4,1],
"struct_weather_sensor_1_1_soil.html#adb04b7368a78fae492a87b3bd0b734da":[1,0,5,4,0],
"struct_weather_sensor_1_1_weather.html":[1,0,5,5],
-"struct_weather_sensor_1_1_weather.html#a042b16928c1f70aef7959ad9907c60a0":[1,0,5,5,3],
-"struct_weather_sensor_1_1_weather.html#a05f15236075cc6e7ddadddccbc748456":[1,0,5,5,5],
-"struct_weather_sensor_1_1_weather.html#a22385566341d9280c7a0ef13d18e74ee":[1,0,5,5,4],
-"struct_weather_sensor_1_1_weather.html#a299d804cac6fa03dc1a472adff068e87":[1,0,5,5,9],
-"struct_weather_sensor_1_1_weather.html#a34f8c565f99fab4c868f58aa60baf215":[1,0,5,5,8],
-"struct_weather_sensor_1_1_weather.html#a6d6b2a367f2d206722bb93486679f19b":[1,0,5,5,1],
-"struct_weather_sensor_1_1_weather.html#a8b9670aa7c3219426a2a319ce2e1d75e":[1,0,5,5,10],
-"struct_weather_sensor_1_1_weather.html#a9ab54478c197fa9cfded3e5d7699a919":[1,0,5,5,2],
-"struct_weather_sensor_1_1_weather.html#a9f9b44070c4984c96c92c5fd4f4fce8f":[1,0,5,5,0],
-"struct_weather_sensor_1_1_weather.html#aa3808f22671713aa03bf42aa0cc86e9d":[1,0,5,5,12],
-"struct_weather_sensor_1_1_weather.html#abb7e6eac7b062270ec7e2bbcb7d1d0f5":[1,0,5,5,11],
-"struct_weather_sensor_1_1_weather.html#abdf1192fe5832df7fd58bd6a2bae5f89":[1,0,5,5,6],
-"struct_weather_sensor_1_1_weather.html#af1d64d0082a746f487b71134dc6eb186":[1,0,5,5,7],
+"struct_weather_sensor_1_1_weather.html#a042b16928c1f70aef7959ad9907c60a0":[1,0,5,5,2],
+"struct_weather_sensor_1_1_weather.html#a05f15236075cc6e7ddadddccbc748456":[1,0,5,5,4],
+"struct_weather_sensor_1_1_weather.html#a22385566341d9280c7a0ef13d18e74ee":[1,0,5,5,3],
+"struct_weather_sensor_1_1_weather.html#a299d804cac6fa03dc1a472adff068e87":[1,0,5,5,8],
+"struct_weather_sensor_1_1_weather.html#a34f8c565f99fab4c868f58aa60baf215":[1,0,5,5,7],
+"struct_weather_sensor_1_1_weather.html#a6d6b2a367f2d206722bb93486679f19b":[1,0,5,5,0],
+"struct_weather_sensor_1_1_weather.html#a8b9670aa7c3219426a2a319ce2e1d75e":[1,0,5,5,9],
+"struct_weather_sensor_1_1_weather.html#a9ab54478c197fa9cfded3e5d7699a919":[1,0,5,5,1],
+"struct_weather_sensor_1_1_weather.html#aa3808f22671713aa03bf42aa0cc86e9d":[1,0,5,5,11],
+"struct_weather_sensor_1_1_weather.html#abb7e6eac7b062270ec7e2bbcb7d1d0f5":[1,0,5,5,10],
+"struct_weather_sensor_1_1_weather.html#abdf1192fe5832df7fd58bd6a2bae5f89":[1,0,5,5,5],
+"struct_weather_sensor_1_1_weather.html#af1d64d0082a746f487b71134dc6eb186":[1,0,5,5,6],
"structnv_data__t.html":[1,0,1],
"structnv_data__t.html#a05848747a63f4d3219f26e357a2664ee":[1,0,1,10],
"structnv_data__t.html#a159baf80e4c8becbe2f6572f1587784a":[1,0,1,2],
diff --git a/struct_weather_sensor_1_1_weather-members.html b/struct_weather_sensor_1_1_weather-members.html
index a2724fee..8bd233d2 100644
--- a/struct_weather_sensor_1_1_weather-members.html
+++ b/struct_weather_sensor_1_1_weather-members.html
@@ -100,8 +100,7 @@
temp_ok | WeatherSensor::Weather | |
uv | WeatherSensor::Weather | |
uv_ok | WeatherSensor::Weather | |
- Weather() (defined in WeatherSensor::Weather) | WeatherSensor::Weather | inline |
- wind_ok | WeatherSensor::Weather | |
+ wind_ok | WeatherSensor::Weather | |
diff --git a/struct_weather_sensor_1_1_weather.html b/struct_weather_sensor_1_1_weather.html
index b90150db..b0561740 100644
--- a/struct_weather_sensor_1_1_weather.html
+++ b/struct_weather_sensor_1_1_weather.html
@@ -117,27 +117,27 @@
| rain gauge level o.k.
|
|
-float | temp_c |
+float temp_c = 0.0 |
| temperature in degC
|
|
-float | light_klx |
+float light_klx = 0.0 |
| Light KLux (only 7-in-1)
|
|
-float | light_lux |
+float light_lux = 0.0 |
| Light lux (only 7-in-1)
|
|
-float | uv |
+float uv = 0.0 |
| uv radiation (only 6-in-1)
|
|
-float | rain_mm |
+float rain_mm = 0.0 |
| rain gauge level in mm
|
|
-uint8_t | humidity |
+uint8_t humidity = 0 |
| humidity in %
|
|
diff --git a/struct_weather_sensor_1_1_weather.js b/struct_weather_sensor_1_1_weather.js
index cbe1f0ec..624c5b7e 100644
--- a/struct_weather_sensor_1_1_weather.js
+++ b/struct_weather_sensor_1_1_weather.js
@@ -1,6 +1,5 @@
var struct_weather_sensor_1_1_weather =
[
- [ "Weather", "struct_weather_sensor_1_1_weather.html#a9f9b44070c4984c96c92c5fd4f4fce8f", null ],
[ "humidity", "struct_weather_sensor_1_1_weather.html#a6d6b2a367f2d206722bb93486679f19b", null ],
[ "humidity_ok", "struct_weather_sensor_1_1_weather.html#a9ab54478c197fa9cfded3e5d7699a919", null ],
[ "light_klx", "struct_weather_sensor_1_1_weather.html#a042b16928c1f70aef7959ad9907c60a0", null ],