Skip to content

Commit 996a035

Browse files
BST-Github-Adminkegov
BST-Github-Admin
authored and
kegov
committed
Added support for Arduino v1.8.13
1 parent 55e49db commit 996a035

File tree

4 files changed

+175
-8
lines changed

4 files changed

+175
-8
lines changed

‎README.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Instructions for using the BSEC Arduino Library in Arduino 1.8.9
1+
# Instructions for using the BSEC Arduino Library in Arduino 1.8.13
22

33
## About BSEC
44

@@ -75,7 +75,7 @@ The BSEC software is only available for download or use after accepting the soft
7575

7676
### 1. Install the latest Arduino IDE
7777

78-
As of this publication, the latest Arduino IDE 1.8.9 can be downloaded from this [link](https://www.arduino.cc/download_handler.php)
78+
As of this publication, the latest Arduino IDE 1.8.13 can be downloaded from this [link](https://www.arduino.cc/download_handler.php)
7979

8080
### 2. Install the BSEC library
8181

@@ -157,12 +157,6 @@ add `*libalgobsec.a:(.literal.* .text.*)`, which should look like,
157157
*(.rodata._ZZ*__func__)
158158
```
159159

160-
#### NRF52 - modify the boards.txt file
161-
162-
Due to possibly various build options for ARM's Cortex-M4's FPU, a variety of static libaries can be generated. We offer two options based on whether the FPU is disabled or enabled. The static libraries are stored under the directories `cortex-m4` and `cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard` respectively. In order for the Arduino builder to use the correct static library, the directory name should match the internal `build.arch` variable. For the NRF52 core, this seems to be derived from the `build.mcu` variable which is defined in the boards.txt file. Hence, one needs to update this variable to use the directory with the floating point enabled static library.
163-
164-
For example, the line [`feather52832.build.mcu=cortex-m4`](https://github.com/adafruit/Adafruit_nRF52_Arduino/blob/0278a461b790fcfe2dcb85502791eece80c42aef/boards.txt#L38) should become `feather52832.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard`
165-
166160
### 5. Verify and upload the example code
167161

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

‎examples/basic_config_state_ULP_LP/basic_config_state_ULP_LP.ino

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
#include <EEPROM.h>
2+
#include "bsec.h"
3+
#include "bsec_serialized_configurations_iaq.h"
4+
5+
#define STATE_SAVE_PERIOD UINT32_C(360 * 60 * 1000) // 360 minutes - 4 times a day
6+
7+
// Helper functions declarations
8+
void checkIaqSensorStatus(void);
9+
void errLeds(void);
10+
void loadState(void);
11+
void updateState(void);
12+
13+
// Create an object of the class Bsec
14+
Bsec iaqSensor;
15+
uint8_t bsecState[BSEC_MAX_STATE_BLOB_SIZE] = {0};
16+
uint16_t stateUpdateCounter = 0;
17+
18+
String output;
19+
20+
// Entry point for the example
21+
void setup(void)
22+
{
23+
EEPROM.begin(BSEC_MAX_STATE_BLOB_SIZE + 1); // 1st address for the length
24+
Serial.begin(115200);
25+
26+
iaqSensor.begin(BME680_I2C_ADDR_PRIMARY, Wire);
27+
output = "\nBSEC library version " + String(iaqSensor.version.major) + "." + String(iaqSensor.version.minor) + "." + String(iaqSensor.version.major_bugfix) + "." + String(iaqSensor.version.minor_bugfix);
28+
Serial.println(output);
29+
checkIaqSensorStatus();
30+
31+
iaqSensor.setConfig(bsec_config_iaq);
32+
checkIaqSensorStatus();
33+
34+
loadState();
35+
36+
bsec_virtual_sensor_t sensorList1[2] = {
37+
BSEC_OUTPUT_RAW_GAS,
38+
BSEC_OUTPUT_IAQ,
39+
};
40+
41+
iaqSensor.updateSubscription(sensorList1, 2, BSEC_SAMPLE_RATE_ULP);
42+
43+
bsec_virtual_sensor_t sensorList2[5] = {
44+
BSEC_OUTPUT_RAW_TEMPERATURE,
45+
BSEC_OUTPUT_RAW_PRESSURE,
46+
BSEC_OUTPUT_RAW_HUMIDITY,
47+
BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE,
48+
BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY,
49+
};
50+
51+
iaqSensor.updateSubscription(sensorList2, 5, BSEC_SAMPLE_RATE_LP);
52+
checkIaqSensorStatus();
53+
54+
// Print the header
55+
output = "Timestamp [ms], raw temperature [°C], pressure [hPa], raw relative humidity [%], gas [Ohm], IAQ, IAQ accuracy, temperature [°C], relative humidity [%]";
56+
Serial.println(output);
57+
}
58+
59+
// Function that is looped forever
60+
void loop(void)
61+
{
62+
unsigned long time_trigger = millis();
63+
if (iaqSensor.run()) { // If new data is available
64+
output = String(time_trigger);
65+
output += ", " + String(iaqSensor.rawTemperature);
66+
output += ", " + String(iaqSensor.pressure);
67+
output += ", " + String(iaqSensor.rawHumidity);
68+
output += ", " + String(iaqSensor.gasResistance);
69+
output += ", " + String(iaqSensor.iaq);
70+
output += ", " + String(iaqSensor.iaqAccuracy);
71+
output += ", " + String(iaqSensor.temperature);
72+
output += ", " + String(iaqSensor.humidity);
73+
Serial.println(output);
74+
updateState();
75+
} else {
76+
checkIaqSensorStatus();
77+
}
78+
}
79+
80+
// Helper function definitions
81+
void checkIaqSensorStatus(void)
82+
{
83+
if (iaqSensor.status != BSEC_OK) {
84+
if (iaqSensor.status < BSEC_OK) {
85+
output = "BSEC error code : " + String(iaqSensor.status);
86+
Serial.println(output);
87+
for (;;)
88+
errLeds(); /* Halt in case of failure */
89+
} else {
90+
output = "BSEC warning code : " + String(iaqSensor.status);
91+
Serial.println(output);
92+
}
93+
}
94+
95+
if (iaqSensor.bme680Status != BME680_OK) {
96+
if (iaqSensor.bme680Status < BME680_OK) {
97+
output = "BME680 error code : " + String(iaqSensor.bme680Status);
98+
Serial.println(output);
99+
for (;;)
100+
errLeds(); /* Halt in case of failure */
101+
} else {
102+
output = "BME680 warning code : " + String(iaqSensor.bme680Status);
103+
Serial.println(output);
104+
}
105+
}
106+
}
107+
108+
void errLeds(void)
109+
{
110+
pinMode(LED_BUILTIN, OUTPUT);
111+
digitalWrite(LED_BUILTIN, HIGH);
112+
delay(100);
113+
digitalWrite(LED_BUILTIN, LOW);
114+
delay(100);
115+
}
116+
117+
void loadState(void)
118+
{
119+
if (EEPROM.read(0) == BSEC_MAX_STATE_BLOB_SIZE) {
120+
// Existing state in EEPROM
121+
Serial.println("Reading state from EEPROM");
122+
123+
for (uint8_t i = 0; i < BSEC_MAX_STATE_BLOB_SIZE; i++) {
124+
bsecState[i] = EEPROM.read(i + 1);
125+
Serial.println(bsecState[i], HEX);
126+
}
127+
128+
iaqSensor.setState(bsecState);
129+
checkIaqSensorStatus();
130+
} else {
131+
// Erase the EEPROM with zeroes
132+
Serial.println("Erasing EEPROM");
133+
134+
for (uint8_t i = 0; i < BSEC_MAX_STATE_BLOB_SIZE + 1; i++)
135+
EEPROM.write(i, 0);
136+
137+
EEPROM.commit();
138+
}
139+
}
140+
141+
void updateState(void)
142+
{
143+
bool update = false;
144+
if (stateUpdateCounter == 0) {
145+
/* First state update when IAQ accuracy is >= 3 */
146+
if (iaqSensor.iaqAccuracy >= 3) {
147+
update = true;
148+
stateUpdateCounter++;
149+
}
150+
} else {
151+
/* Update every STATE_SAVE_PERIOD minutes */
152+
if ((stateUpdateCounter * STATE_SAVE_PERIOD) < millis()) {
153+
update = true;
154+
stateUpdateCounter++;
155+
}
156+
}
157+
158+
if (update) {
159+
iaqSensor.getState(bsecState);
160+
checkIaqSensorStatus();
161+
162+
Serial.println("Writing state to EEPROM");
163+
164+
for (uint8_t i = 0; i < BSEC_MAX_STATE_BLOB_SIZE ; i++) {
165+
EEPROM.write(i + 1, bsecState[i]);
166+
Serial.println(bsecState[i], HEX);
167+
}
168+
169+
EEPROM.write(0, BSEC_MAX_STATE_BLOB_SIZE);
170+
EEPROM.commit();
171+
}
172+
}

‎library.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ paragraph= for use with the BME680 has been conceptualized to provide higher-le
88
category=Sensors
99
architectures=samd,sam,esp8266,nrf52,esp32,avr
1010
includes=bsec.h
11+
dot_a_linkage=true
1112
precompiled=true
1213
ldflags=-lalgobsec

‎src/cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard/libalgobsec.a renamed to ‎src/cortex-m4/fpv4-sp-d16-hard/libalgobsec.a

File renamed without changes.

0 commit comments

Comments
 (0)