From 589e1851533214c9d768bf5cc2b703f24d5e3f3a Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Sun, 25 Nov 2018 21:39:00 +0100 Subject: [PATCH] BSEC optimization --- .../config/generic_18v_300s_28d/bsec_iaq.config | Bin 0 -> 458 bytes .../config/generic_18v_300s_28d/bsec_iaq.csv | 1 + .../bsec_serialized_configurations_iaq.c | 5 +++++ .../bsec_serialized_configurations_iaq.h | 4 ++++ .../config/generic_18v_300s_4d/bsec_iaq.config | Bin 0 -> 458 bytes .../config/generic_18v_300s_4d/bsec_iaq.csv | 1 + .../bsec_serialized_configurations_iaq.c | 5 +++++ .../bsec_serialized_configurations_iaq.h | 4 ++++ .../config/generic_18v_3s_28d/bsec_iaq.config | Bin 0 -> 458 bytes .../config/generic_18v_3s_28d/bsec_iaq.csv | 1 + .../bsec_serialized_configurations_iaq.c | 5 +++++ .../bsec_serialized_configurations_iaq.h | 4 ++++ .../config/generic_18v_3s_4d/bsec_iaq.config | Bin 0 -> 458 bytes .../config/generic_18v_3s_4d/bsec_iaq.csv | 1 + .../bsec_serialized_configurations_iaq.c | 5 +++++ .../bsec_serialized_configurations_iaq.h | 4 ++++ .../config/generic_33v_300s_28d/bsec_iaq.config | Bin 0 -> 458 bytes .../config/generic_33v_300s_28d/bsec_iaq.csv | 1 + .../bsec_serialized_configurations_iaq.c | 5 +++++ .../bsec_serialized_configurations_iaq.h | 4 ++++ .../config/generic_33v_300s_4d/bsec_iaq.config | Bin 0 -> 458 bytes .../config/generic_33v_300s_4d/bsec_iaq.csv | 1 + .../bsec_serialized_configurations_iaq.c | 5 +++++ .../bsec_serialized_configurations_iaq.h | 4 ++++ .../config/generic_33v_3s_28d/bsec_iaq.config | Bin 0 -> 458 bytes .../config/generic_33v_3s_28d/bsec_iaq.csv | 1 + .../bsec_serialized_configurations_iaq.c | 5 +++++ .../bsec_serialized_configurations_iaq.h | 4 ++++ .../config/generic_33v_3s_4d/bsec_iaq.config | Bin 0 -> 458 bytes .../config/generic_33v_3s_4d/bsec_iaq.csv | 1 + .../bsec_serialized_configurations_iaq.c | 5 +++++ .../bsec_serialized_configurations_iaq.h | 4 ++++ platformio.ini | 6 +++--- src/bme680mems.cpp | 8 ++++---- 34 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 lib/Bosch-BSEC/config/generic_18v_300s_28d/bsec_iaq.config create mode 100644 lib/Bosch-BSEC/config/generic_18v_300s_28d/bsec_iaq.csv create mode 100644 lib/Bosch-BSEC/config/generic_18v_300s_28d/bsec_serialized_configurations_iaq.c create mode 100644 lib/Bosch-BSEC/config/generic_18v_300s_28d/bsec_serialized_configurations_iaq.h create mode 100644 lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_iaq.config create mode 100644 lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_iaq.csv create mode 100644 lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_serialized_configurations_iaq.c create mode 100644 lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_serialized_configurations_iaq.h create mode 100644 lib/Bosch-BSEC/config/generic_18v_3s_28d/bsec_iaq.config create mode 100644 lib/Bosch-BSEC/config/generic_18v_3s_28d/bsec_iaq.csv create mode 100644 lib/Bosch-BSEC/config/generic_18v_3s_28d/bsec_serialized_configurations_iaq.c create mode 100644 lib/Bosch-BSEC/config/generic_18v_3s_28d/bsec_serialized_configurations_iaq.h create mode 100644 lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_iaq.config create mode 100644 lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_iaq.csv create mode 100644 lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_serialized_configurations_iaq.c create mode 100644 lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_serialized_configurations_iaq.h create mode 100644 lib/Bosch-BSEC/config/generic_33v_300s_28d/bsec_iaq.config create mode 100644 lib/Bosch-BSEC/config/generic_33v_300s_28d/bsec_iaq.csv create mode 100644 lib/Bosch-BSEC/config/generic_33v_300s_28d/bsec_serialized_configurations_iaq.c create mode 100644 lib/Bosch-BSEC/config/generic_33v_300s_28d/bsec_serialized_configurations_iaq.h create mode 100644 lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_iaq.config create mode 100644 lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_iaq.csv create mode 100644 lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_serialized_configurations_iaq.c create mode 100644 lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_serialized_configurations_iaq.h create mode 100644 lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_iaq.config create mode 100644 lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_iaq.csv create mode 100644 lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_serialized_configurations_iaq.c create mode 100644 lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_serialized_configurations_iaq.h create mode 100644 lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_iaq.config create mode 100644 lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_iaq.csv create mode 100644 lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_serialized_configurations_iaq.c create mode 100644 lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_serialized_configurations_iaq.h diff --git a/lib/Bosch-BSEC/config/generic_18v_300s_28d/bsec_iaq.config b/lib/Bosch-BSEC/config/generic_18v_300s_28d/bsec_iaq.config new file mode 100644 index 0000000000000000000000000000000000000000..f6c7b918f3b95beb55d121534326599c71eedbb7 GIT binary patch literal 458 zcmX@c$iTqJ&cbNR00HZOd;VFh50B$49f&Y2OyllXiy4)DGVTp wV1rl?F=SB)8zip7h#PXS + +extern const uint8_t bsec_config_iaq[454]; + diff --git a/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_iaq.config b/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_iaq.config new file mode 100644 index 0000000000000000000000000000000000000000..b0fff47ac22c6b3f89d7ec2b0b35e9fb8a5204fa GIT binary patch literal 458 zcmX@c$iTqJ&cbNR00HZOd;*t#zVC* z$S^Q5FnnQr$RNqU(BQzppx`(GXi9-2P~KjEfti8p`eGZd>&n(3%*ntC*2WmYz{$Y= zVH(U{2AP_Nwk8eN?HL#r0F8ivvuAkh(yyx9J+t>Y027<|)@J{2D+l|H0nH9DvDkl) z?aXXi_X8d4z{9`=6J~hI@Q;Csk=39yg+Yh0KzurT3-eKi7?uf)4nR18(V!FpQy4%H w!3MD)V#uNpHb`8D5jW&u#|;a_al`*maEBEHAshq?CW}cMl!APF_&);!0B5g)-~a#s literal 0 HcmV?d00001 diff --git a/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_iaq.csv b/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_iaq.csv new file mode 100644 index 00000000..318c0691 --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_iaq.csv @@ -0,0 +1 @@ +454,1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,192,168,71,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,7,240,150,61,0,0,0,0,0,0,0,0,28,124,225,61,52,128,215,63,0,0,160,64,0,0,0,0,0,0,0,0,205,204,12,62,103,213,39,62,230,63,76,192,0,0,0,0,0,0,0,0,145,237,60,191,251,58,64,63,177,80,131,64,0,0,0,0,0,0,0,0,93,254,227,62,54,60,133,191,0,0,64,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,48,117,0,0,0,0,195,255,0,0 diff --git a/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_serialized_configurations_iaq.c b/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_serialized_configurations_iaq.c new file mode 100644 index 00000000..85884b30 --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_serialized_configurations_iaq.c @@ -0,0 +1,5 @@ +#include "bsec_serialized_configurations_iaq.h" + +const uint8_t bsec_config_iaq[454] = + {1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,192,168,71,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,7,240,150,61,0,0,0,0,0,0,0,0,28,124,225,61,52,128,215,63,0,0,160,64,0,0,0,0,0,0,0,0,205,204,12,62,103,213,39,62,230,63,76,192,0,0,0,0,0,0,0,0,145,237,60,191,251,58,64,63,177,80,131,64,0,0,0,0,0,0,0,0,93,254,227,62,54,60,133,191,0,0,64,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,48,117,0,0,0,0,195,255,0,0}; + diff --git a/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_serialized_configurations_iaq.h b/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_serialized_configurations_iaq.h new file mode 100644 index 00000000..1986e2be --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_18v_300s_4d/bsec_serialized_configurations_iaq.h @@ -0,0 +1,4 @@ +#include + +extern const uint8_t bsec_config_iaq[454]; + diff --git a/lib/Bosch-BSEC/config/generic_18v_3s_28d/bsec_iaq.config b/lib/Bosch-BSEC/config/generic_18v_3s_28d/bsec_iaq.config new file mode 100644 index 0000000000000000000000000000000000000000..3a2fcdf2dc3646d6db0f936d2c9dcaf25e06fa31 GIT binary patch literal 458 zcmX@c$iTqJ&cbNR00HZOd;VFh50B$49f&Y2OyllXiy4)DGVTp xV1rl?F=SB)8zip7h#PXS + +extern const uint8_t bsec_config_iaq[454]; + diff --git a/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_iaq.config b/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_iaq.config new file mode 100644 index 0000000000000000000000000000000000000000..7bd1e535ac45b2dffd805d568ea0e9e683008987 GIT binary patch literal 458 zcmX@c$iTqJ&cbNR00HZOd;*t#zVC* z$S^Q5FnnQr$RNqU(BQzppx`(GXi9-2P~KjEfti8p`eGZd>&n(3%*ntC*2WmYz{$Y= zVH(U{2AP_Nwk8eN?HL#r0F8ivvuAkh(yyx9J+t>Y027<|)@J{2D+l|H0nH9DvDkl) z?aXXi_X8d4z{9`=6J~hI@Q;Csk=39yg+Yh0KzurT3-eKi7?uf)4nR18(V!FpQy4%H x!3MD)V#uNpHb`8D5jW&u#|;a_al`*maEBEHAshq?CW}ey07IIAA@Cam0{~%=f$abQ literal 0 HcmV?d00001 diff --git a/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_iaq.csv b/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_iaq.csv new file mode 100644 index 00000000..5eeae615 --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_iaq.csv @@ -0,0 +1 @@ +454,1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,192,168,71,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,7,240,150,61,0,0,0,0,0,0,0,0,28,124,225,61,52,128,215,63,0,0,160,64,0,0,0,0,0,0,0,0,205,204,12,62,103,213,39,62,230,63,76,192,0,0,0,0,0,0,0,0,145,237,60,191,251,58,64,63,177,80,131,64,0,0,0,0,0,0,0,0,93,254,227,62,54,60,133,191,0,0,64,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,44,1,0,0,0,0,81,246,0,0 diff --git a/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_serialized_configurations_iaq.c b/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_serialized_configurations_iaq.c new file mode 100644 index 00000000..625cdc4e --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_serialized_configurations_iaq.c @@ -0,0 +1,5 @@ +#include "bsec_serialized_configurations_iaq.h" + +const uint8_t bsec_config_iaq[454] = + {1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,192,168,71,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,7,240,150,61,0,0,0,0,0,0,0,0,28,124,225,61,52,128,215,63,0,0,160,64,0,0,0,0,0,0,0,0,205,204,12,62,103,213,39,62,230,63,76,192,0,0,0,0,0,0,0,0,145,237,60,191,251,58,64,63,177,80,131,64,0,0,0,0,0,0,0,0,93,254,227,62,54,60,133,191,0,0,64,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,44,1,0,0,0,0,81,246,0,0}; + diff --git a/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_serialized_configurations_iaq.h b/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_serialized_configurations_iaq.h new file mode 100644 index 00000000..1986e2be --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_18v_3s_4d/bsec_serialized_configurations_iaq.h @@ -0,0 +1,4 @@ +#include + +extern const uint8_t bsec_config_iaq[454]; + diff --git a/lib/Bosch-BSEC/config/generic_33v_300s_28d/bsec_iaq.config b/lib/Bosch-BSEC/config/generic_33v_300s_28d/bsec_iaq.config new file mode 100644 index 0000000000000000000000000000000000000000..e518942bce7d902e4287ca62b80126af75750591 GIT binary patch literal 458 zcmX@c$iTqJ&cbNR00HZOd;%han1rug?%J7eYiILTyG=)Kju|Rw}dkgbXh8UI!j1E9JfzhB80#g`3 x5WxnqAY#a(5H?6$hY>gAV8;y$#Bsy_P;iG81R)#*3nq(68 + +extern const uint8_t bsec_config_iaq[454]; + diff --git a/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_iaq.config b/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_iaq.config new file mode 100644 index 0000000000000000000000000000000000000000..698c69fe0a808342219419ce56fdc1e7e8934954 GIT binary patch literal 458 zcmX@c$iTqJ&cbNR00HZOd;*t#zVC* z$S^Q5FnnQr$RNqU(BQzppx`(GXi9-2P~KjEfti8p`eGZd>&n(3%*ntC*2WmYz{&9R zf)daI2)HFZ$L=AwvjYRe0w9KfIB$==vH#{fIN2@O4--?A-?Fc3L!yJ@$K-u5vE`NS zwoCVF9@rtb*MWzD3nt9)l;Ix(6C)&3^6Pd7#)Cc0;54G1g0>6 xAc75ILBxJ!Hydih~tL;q2LZH2tqgr7EBhCHYf%8w$_b-0RVX@g8Kjf literal 0 HcmV?d00001 diff --git a/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_iaq.csv b/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_iaq.csv new file mode 100644 index 00000000..223adff0 --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_iaq.csv @@ -0,0 +1 @@ +454,1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,192,168,71,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,229,208,34,62,0,0,0,0,0,0,0,0,218,27,156,62,225,11,67,64,0,0,160,64,0,0,0,0,0,0,0,0,94,75,72,189,93,254,159,64,66,62,160,191,0,0,0,0,0,0,0,0,33,31,180,190,138,176,97,64,65,241,99,190,0,0,0,0,0,0,0,0,167,121,71,61,165,189,41,192,184,30,189,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,48,117,0,0,0,0,125,70,0,0 diff --git a/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_serialized_configurations_iaq.c b/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_serialized_configurations_iaq.c new file mode 100644 index 00000000..f76832cc --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_serialized_configurations_iaq.c @@ -0,0 +1,5 @@ +#include "bsec_serialized_configurations_iaq.h" + +const uint8_t bsec_config_iaq[454] = + {1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,192,168,71,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,229,208,34,62,0,0,0,0,0,0,0,0,218,27,156,62,225,11,67,64,0,0,160,64,0,0,0,0,0,0,0,0,94,75,72,189,93,254,159,64,66,62,160,191,0,0,0,0,0,0,0,0,33,31,180,190,138,176,97,64,65,241,99,190,0,0,0,0,0,0,0,0,167,121,71,61,165,189,41,192,184,30,189,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,48,117,0,0,0,0,125,70,0,0}; + diff --git a/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_serialized_configurations_iaq.h b/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_serialized_configurations_iaq.h new file mode 100644 index 00000000..1986e2be --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_33v_300s_4d/bsec_serialized_configurations_iaq.h @@ -0,0 +1,4 @@ +#include + +extern const uint8_t bsec_config_iaq[454]; + diff --git a/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_iaq.config b/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_iaq.config new file mode 100644 index 0000000000000000000000000000000000000000..f2ff51895c7f644cf1acf40fd623b91b7b11d45c GIT binary patch literal 458 zcmX@c$iTqJ&cbNR00HZOd;%han1rug?%J7eYiILTyG=)Kju|Rw}dkgbXh8UI!j1E9JfzhB80#g`3 y5WxnqAY#a(5H?6$hY>gAV8;y$#Bsy_P;iG81R)#*3nq(6>i|QVfx#%6fdK$uqJg3S literal 0 HcmV?d00001 diff --git a/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_iaq.csv b/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_iaq.csv new file mode 100644 index 00000000..1396776c --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_iaq.csv @@ -0,0 +1 @@ +454,1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,168,19,73,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,229,208,34,62,0,0,0,0,0,0,0,0,218,27,156,62,225,11,67,64,0,0,160,64,0,0,0,0,0,0,0,0,94,75,72,189,93,254,159,64,66,62,160,191,0,0,0,0,0,0,0,0,33,31,180,190,138,176,97,64,65,241,99,190,0,0,0,0,0,0,0,0,167,121,71,61,165,189,41,192,184,30,189,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,44,1,0,0,0,0,50,91,0,0 diff --git a/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_serialized_configurations_iaq.c b/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_serialized_configurations_iaq.c new file mode 100644 index 00000000..e1f1bfe3 --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_serialized_configurations_iaq.c @@ -0,0 +1,5 @@ +#include "bsec_serialized_configurations_iaq.h" + +const uint8_t bsec_config_iaq[454] = + {1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,168,19,73,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,229,208,34,62,0,0,0,0,0,0,0,0,218,27,156,62,225,11,67,64,0,0,160,64,0,0,0,0,0,0,0,0,94,75,72,189,93,254,159,64,66,62,160,191,0,0,0,0,0,0,0,0,33,31,180,190,138,176,97,64,65,241,99,190,0,0,0,0,0,0,0,0,167,121,71,61,165,189,41,192,184,30,189,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,44,1,0,0,0,0,50,91,0,0}; + diff --git a/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_serialized_configurations_iaq.h b/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_serialized_configurations_iaq.h new file mode 100644 index 00000000..1986e2be --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_33v_3s_28d/bsec_serialized_configurations_iaq.h @@ -0,0 +1,4 @@ +#include + +extern const uint8_t bsec_config_iaq[454]; + diff --git a/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_iaq.config b/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_iaq.config new file mode 100644 index 0000000000000000000000000000000000000000..a79b3ccb7341c837ca568f6d3fb1461e50ed93f1 GIT binary patch literal 458 zcmX@c$iTqJ&cbNR00HZOd;*t#zVC* z$S^Q5FnnQr$RNqU(BQzppx`(GXi9-2P~KjEfti8p`eGZd>&n(3%*ntC*2WmYz{&9R zf)daI2)HFZ$L=AwvjYRe0w9KfIB$==vH#{fIN2@O4--?A-?Fc3L!yJ@$K-u5vE`NS zwoCVF9@rtb*MWzD3nt9)l;Ix(6C)&3^6Pd7#)Cc0;54G1g0>6 yAc75ILBxJ!Hydih~tL;q2LZH2tqgr7EBhC)&Yhz1H*fN1_l6j&w~B{ literal 0 HcmV?d00001 diff --git a/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_iaq.csv b/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_iaq.csv new file mode 100644 index 00000000..b0001d9c --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_iaq.csv @@ -0,0 +1 @@ +454,1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,192,168,71,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,229,208,34,62,0,0,0,0,0,0,0,0,218,27,156,62,225,11,67,64,0,0,160,64,0,0,0,0,0,0,0,0,94,75,72,189,93,254,159,64,66,62,160,191,0,0,0,0,0,0,0,0,33,31,180,190,138,176,97,64,65,241,99,190,0,0,0,0,0,0,0,0,167,121,71,61,165,189,41,192,184,30,189,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,44,1,0,0,0,0,239,79,0,0 diff --git a/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_serialized_configurations_iaq.c b/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_serialized_configurations_iaq.c new file mode 100644 index 00000000..b6007c1a --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_serialized_configurations_iaq.c @@ -0,0 +1,5 @@ +#include "bsec_serialized_configurations_iaq.h" + + +const uint8_t bsec_config_iaq[454] = + {1,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,225,68,0,192,168,71,64,49,119,76,0,0,0,0,0,80,5,95,0,0,0,0,0,0,0,0,28,0,2,0,0,244,1,225,0,25,0,0,128,64,0,0,32,65,144,1,0,0,112,65,0,0,0,63,16,0,3,0,10,215,163,60,10,215,35,59,10,215,35,59,9,0,5,0,0,0,0,0,1,88,0,9,0,229,208,34,62,0,0,0,0,0,0,0,0,218,27,156,62,225,11,67,64,0,0,160,64,0,0,0,0,0,0,0,0,94,75,72,189,93,254,159,64,66,62,160,191,0,0,0,0,0,0,0,0,33,31,180,190,138,176,97,64,65,241,99,190,0,0,0,0,0,0,0,0,167,121,71,61,165,189,41,192,184,30,189,64,12,0,10,0,0,0,0,0,0,0,0,0,229,0,254,0,2,1,5,48,117,100,0,44,1,112,23,151,7,132,3,197,0,92,4,144,1,64,1,64,1,144,1,48,117,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,48,117,48,117,100,0,100,0,100,0,100,0,48,117,48,117,48,117,100,0,100,0,100,0,48,117,48,117,100,0,100,0,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,44,1,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,8,7,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,112,23,255,255,255,255,255,255,255,255,220,5,220,5,220,5,255,255,255,255,255,255,220,5,220,5,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,44,1,0,0,0,0,239,79,0,0}; diff --git a/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_serialized_configurations_iaq.h b/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_serialized_configurations_iaq.h new file mode 100644 index 00000000..1986e2be --- /dev/null +++ b/lib/Bosch-BSEC/config/generic_33v_3s_4d/bsec_serialized_configurations_iaq.h @@ -0,0 +1,4 @@ +#include + +extern const uint8_t bsec_config_iaq[454]; + diff --git a/platformio.ini b/platformio.ini index 08731c11..c329409b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -29,13 +29,13 @@ description = Paxcounter is a proof-of-concept ESP32 device for metering passeng [common] ; for release_version use max. 10 chars total, use any decimal format like "a.b.c" -release_version = 1.6.86 +release_version = 1.6.88 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose debug_level = 3 ; UPLOAD MODE: select esptool to flash via USB/UART, select custom to upload to cloud for OTA -upload_protocol = esptool -;upload_protocol = custom +;upload_protocol = esptool +upload_protocol = custom extra_scripts = pre:build.py keyfile = ota.conf platform_espressif32 = https://github.com/platformio/platform-espressif32.git#a7b1fe6 diff --git a/src/bme680mems.cpp b/src/bme680mems.cpp index 7226919b..82a4b6f7 100644 --- a/src/bme680mems.cpp +++ b/src/bme680mems.cpp @@ -8,10 +8,10 @@ static const char TAG[] = "main"; bmeStatus_t bme_status; TaskHandle_t BmeTask; -// BSEC configuration -// 3,3V supply voltage; 3s sensor_control; 4 days calibration -// change this const if not applicable for your application (see BME680 -// datasheet) +// --- Bosch BSEC library configuration --- +// 3,3V supply voltage; 3s max time between sensor_control calls; 4 days +// calibration. Change this const if not applicable for your application (see +// BME680 datasheet) const uint8_t bsec_config_iaq[454] = { 1, 7, 4, 1, 61, 0, 0, 0, 0, 0, 0, 0, 174, 1, 0, 0, 48, 0, 1, 0, 137, 65, 0, 63, 205, 204, 204, 62, 0, 0,