Skip to content

Commit 7a93575

Browse files
BST-Github-Adminkegov
authored andcommitted
Updated to v1.4.8.0. Updated the ESP8266's static library to not need linker script modifications.
1 parent 996a035 commit 7a93575

26 files changed

Lines changed: 61 additions & 73 deletions

File tree

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The binaries and includes for the core BSEC library in this repository are licensed
22
under the Software license agreement described in the link
3-
https://ae-bst.resource.bosch.com/media/_tech/media/bsec/2017-07-17_ClickThrough_License_Terms_Environmentalib_SW_CLEAN.pdf
3+
https://www.bosch-sensortec.com/media/boschsensortec/downloads/bsec/2017-07-17_clickthrough_license_terms_environmentalib_sw_clean.pdf
44

55
The Arduino wrapper and BME680 Sensor API are licensed under the following license.
66

README.md

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## About BSEC
44

5-
Bosch Sensortec Environmental Cluster (BSEC) Software v1.4.7.4 released on July 3rd, 2019
5+
Bosch Sensortec Environmental Cluster (BSEC) Software v1.4.8.0 released on July 8th, 2020
66

77
The BSEC fusion library has been conceptualized to provide a higher-level signal processing and fusion for the BME680. The library receives compensated sensor values from the sensor API. It processes the BME680 signals to provide the requested sensor outputs.
88

@@ -69,7 +69,7 @@ Advantages
6969

7070
The BSEC software is only available for download or use after accepting the software license agreement. By using this library, you have agreed to the terms of the license agreement.
7171

72-
[BSEC license agreement](https://ae-bst.resource.bosch.com/media/_tech/media/bsec/2017-07-17_ClickThrough_License_Terms_Environmentalib_SW_CLEAN.pdf)
72+
[BSEC license agreement](https://www.bosch-sensortec.com/media/boschsensortec/downloads/bsec/2017-07-17_clickthrough_license_terms_environmentalib_sw_clean.pdf)
7373

7474
## Installation and getting started
7575

@@ -131,47 +131,21 @@ Should be,
131131
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--start-group {compiler.arm.cmsis.ldflags} -lm "{build.path}/{archive_file}" {compiler.libraries.ldflags} -Wl,--end-group
132132
```
133133

134-
### 4. Additional core specific modifications
135-
136-
#### ESP8266 - modify the linker script header
137-
138-
Due to the architecture of the ESP8266's memories and current size of the BSEC library, upon compilation, you will receive an error: ```section `.text1' will not fit in region `iram1_0_seg'```. In order to solve this, you will need to modify the linker script and specifically define where the library should be placed in memory.
139-
140-
You will need to modify the file `eagle.app.v6.common.ld.h` typically found in `{YourESP8266PPackageDirectory}\tools\sdk\ld`.
141-
142-
With reference to the linker script [here](https://github.com/esp8266/Arduino/blob/master/tools/sdk/ld/eagle.app.v6.common.ld.h),
143-
144-
After line [`177 *libwps.a:(.literal.* .text.*)`](https://github.com/esp8266/Arduino/blob/68ee1216454eeea49dd3452c6ff21bc748f397b6/tools/sdk/ld/eagle.app.v6.common.ld.h#L177),
145-
add `*libalgobsec.a:(.literal.* .text.*)`, which should look like,
146-
147-
```
148-
*libwpa.a:(.literal.* .text.*)
149-
*libwpa2.a:(.literal.* .text.*)
150-
*libwps.a:(.literal.* .text.*)
151-
*libalgobsec.a:(.literal.* .text.*)
152-
*(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom0.text.* .irom.text .irom.text.*)
153-
154-
/* __FUNCTION__ locals */
155-
*(.rodata._ZZ*__FUNCTION__)
156-
*(.rodata._ZZ*__PRETTY_FUNCTION__)
157-
*(.rodata._ZZ*__func__)
158-
```
159-
160-
### 5. Verify and upload the example code
134+
### 4. Verify and upload the example code
161135

162136
Start or restart the Arduino IDE. Open the example code found under ```File>Examples>Bsec software library>Basic```.
163137

164138
Select your board and COM port. Upload the example. Open the Serial monitor. You should see an output on the terminal.
165139

166140
Note that not all supported cores have been tested. In such cases, the examples can be found under ```File>Examples>INCOMPATIBLE>Bsec software library>Basic```
167141

168-
### 6. Tested board/core list
142+
### 5. Tested board/core list
169143

170144
The current list of tested boards include,
171145

172146
| Core MCU | Tested boards | Arduino core version | Arduino core repository |
173147
|----------|---------------|----------------------|-------------------------|
174-
| Atmega 2560 | Arduino MEGA 2560 | Shipped with Arduino 1.8.9 | Shipped with Arduino 1.8.9 |
148+
| Atmega 2560 | Arduino MEGA 2560 | Shipped with Arduino 1.8.13 | Shipped with Arduino 1.8.13 |
175149
| Cortex-m0+ | Arduino Zero | Upstream of v1.6.21 SHA-1 hash 86081cbf35fc0df0612a1b2c054877ff6788f9e7 | https://github.com/arduino/ArduinoCore-samd |
176150
| Cortex-m3 | Arduino Due | SHA-1 hash 0a4c3b196a02e48e31b752a05d8c8064007874dc | https://github.com/arduino/ArduinoCore-sam |
177151
| Cortex-m4 with FPU | Adafruit BlueFruit NRF52 Feather | Upstream of v0.10.1 SHA-1 hash 11614dae701a35f905d09792c7388d648b125369 | https://github.com/adafruit/Adafruit_nRF52_Arduino |

examples/basic_config_state_ULP_LP/basic_config_state_ULP_LP.ino

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
#include <EEPROM.h>
22
#include "bsec.h"
3-
#include "bsec_serialized_configurations_iaq.h"
3+
/* Configure the BSEC library with information about the sensor
4+
18v/33v = Voltage at Vdd. 1.8V or 3.3V
5+
3s/300s = BSEC operating mode, BSEC_SAMPLE_RATE_LP or BSEC_SAMPLE_RATE_ULP
6+
4d/28d = Operating age of the sensor in days
7+
generic_18v_3s_4d
8+
generic_18v_3s_28d
9+
generic_18v_300s_4d
10+
generic_18v_300s_28d
11+
generic_33v_3s_4d
12+
generic_33v_3s_28d
13+
generic_33v_300s_4d
14+
generic_33v_300s_28d
15+
*/
16+
const uint8_t bsec_config_iaq[] = {
17+
#include "config/generic_33v_3s_4d/bsec_iaq.txt"
18+
};
419

520
#define STATE_SAVE_PERIOD UINT32_C(360 * 60 * 1000) // 360 minutes - 4 times a day
621

@@ -22,6 +37,7 @@ void setup(void)
2237
{
2338
EEPROM.begin(BSEC_MAX_STATE_BLOB_SIZE + 1); // 1st address for the length
2439
Serial.begin(115200);
40+
Wire.begin();
2541

2642
iaqSensor.begin(BME680_I2C_ADDR_PRIMARY, Wire);
2743
output = "\nBSEC library version " + String(iaqSensor.version.major) + "." + String(iaqSensor.version.minor) + "." + String(iaqSensor.version.major_bugfix) + "." + String(iaqSensor.version.minor_bugfix);
@@ -39,6 +55,7 @@ void setup(void)
3955
};
4056

4157
iaqSensor.updateSubscription(sensorList1, 2, BSEC_SAMPLE_RATE_ULP);
58+
checkIaqSensorStatus();
4259

4360
bsec_virtual_sensor_t sensorList2[5] = {
4461
BSEC_OUTPUT_RAW_TEMPERATURE,

keywords.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ BSEC_SAMPLE_RATE_ULP LITERAL1
7070
BSEC_SAMPLE_RATE_CONTINUOUS LITERAL1
7171
BSEC_SAMPLE_RATE_LP LITERAL1
7272
BSEC_SAMPLE_RATE_ULP_MEASUREMENT_ON_DEMAND LITERAL1
73-
BSEC_SAMPLE_RATE_HIGH_PERFORMANCE LITERAL1
7473

7574
BSEC_PROCESS_PRESSURE LITERAL1
7675
BSEC_PROCESS_TEMPERATURE LITERAL1
@@ -85,9 +84,7 @@ BSEC_INPUT_HUMIDITY LITERAL1
8584
BSEC_INPUT_TEMPERATURE LITERAL1
8685
BSEC_INPUT_GASRESISTOR LITERAL1
8786
BSEC_INPUT_HEATSOURCE LITERAL1
88-
BSEC_INPUT_IS_MEASUREMENT_ON_DEMAND LITERAL1
8987
BSEC_INPUT_DISABLE_BASELINE_TRACKER LITERAL1
90-
BSEC_INPUT_PROFILE_PART LITERAL1
9188

9289
# BSEC outputs
9390
BSEC_OUTPUT_IAQ LITERAL1
@@ -122,6 +119,7 @@ BSEC_E_SU_SAMPLINTVLINTEGERMULT LITERAL1
122119
BSEC_E_SU_MULTGASSAMPLINTVL LITERAL1
123120
BSEC_E_SU_HIGHHEATERONDURATION LITERAL1
124121
BSEC_W_SU_UNKNOWNOUTPUTGATE LITERAL1
122+
BSEC_W_SU_MODINNOULP LITERAL1
125123
BSEC_I_SU_SUBSCRIBEDOUTPUTGATES LITERAL1
126124
BSEC_E_PARSE_SECTIONEXCEEDSWORKBUFFER LITERAL1
127125
BSEC_E_CONFIG_FAIL LITERAL1

library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "git",
77
"url": "https://github.com/BoschSensortec/BSEC-Arduino-library"
88
},
9-
"version": "1.5.1474",
9+
"version": "1.6.1480",
1010
"authors": {
1111
"name": "Bosch Sensortec",
1212
"email": "contact@bosch-sensortec.com"

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=BSEC Software Library
2-
version=1.5.1474
2+
version=1.6.1480
33
author=Bosch Sensortec
44
maintainer=Bosch Sensortec <contact@bosch-sensortec.com>
55
sentence=Bosch Sensortec Environmental Cluster (BSEC) Software library

src/atmega2560/libalgobsec.a

3.72 KB
Binary file not shown.

src/bsec.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
* POSSIBILITY OF SUCH DAMAGE.
3232
*
3333
* @file bsec.cpp
34-
* @date 10 Jan 2020
35-
* @version 1.5.1474
34+
* @date 18 Nov 2020
3635
*
3736
*/
3837

@@ -282,9 +281,9 @@ void Bsec::getState(uint8_t *state)
282281
*/
283282
void Bsec::setState(uint8_t *state)
284283
{
285-
uint8_t workBuffer[BSEC_MAX_STATE_BLOB_SIZE];
284+
uint8_t workBuffer[BSEC_MAX_WORKBUFFER_SIZE];
286285

287-
status = bsec_set_state(state, BSEC_MAX_STATE_BLOB_SIZE, workBuffer, BSEC_MAX_STATE_BLOB_SIZE);
286+
status = bsec_set_state(state, BSEC_MAX_STATE_BLOB_SIZE, workBuffer, sizeof(workBuffer));
288287

289288
if (status == BSEC_OK)
290289
{
@@ -301,7 +300,7 @@ void Bsec::setState(uint8_t *state)
301300
*/
302301
void Bsec::setConfig(const uint8_t *config)
303302
{
304-
uint8_t workBuffer[BSEC_MAX_PROPERTY_BLOB_SIZE];
303+
uint8_t workBuffer[BSEC_MAX_WORKBUFFER_SIZE];
305304

306305
bsecConfig = (uint8_t *)config;
307306

src/bsec.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
* POSSIBILITY OF SUCH DAMAGE.
3232
*
3333
* @file bsec.h
34-
* @date 10 Jan 2020
35-
* @version 1.5.1474
34+
* @date 18 Nov 2020
3635
*
3736
*/
3837

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4,7,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,0,168,19,73,64,49,119,76,0,0,225,68,137,65,0,63,205,204,204,62,0,0,64,63,205,204,204,62,0,0,0,0,216,85,0,100,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,133,135,0,0
1+
0,8,4,1,61,0,0,0,0,0,0,0,174,1,0,0,48,0,1,0,0,168,19,73,64,49,119,76,0,0,225,68,137,65,0,191,205,204,204,190,0,0,64,191,225,122,148,190,0,0,0,0,216,85,0,100,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,226,227,0,0

0 commit comments

Comments
 (0)