Skip to content

Commit 811a3ed

Browse files
committed
Fix multiple Bsec initializations
1 parent 483bc8d commit 811a3ed

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/Arduino_MKRIoTCarrier.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
//Touch pads values for using the case or just directly on the board
2424
//Define on the sketch to use it
2525
bool CARRIER_CASE = false;
26-
26+
27+
mkr_iot_carrier_rev2 mkr_iot_carrier_rev2_instance;
28+
Bsec* mkr_iot_carrier_rev2::iaqSensor;
29+
2730
MKRIoTCarrier::MKRIoTCarrier() {
2831
}
2932

@@ -34,6 +37,7 @@ int MKRIoTCarrier::begin() {
3437
pinMode(AREF_PIN,INPUT_PULLUP);
3538
if (digitalRead(AREF_PIN) == LOW) {
3639
MKRIoTCarrier::_revision = BOARD_REVISION_2;
40+
mkr_iot_carrier_rev2::iaqSensor = nullptr;
3741
} else {
3842
MKRIoTCarrier::_revision = BOARD_REVISION_1;
3943
}

src/MKRIoTCarrierDefines.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ namespace mkr_iot_carrier_rev1 {
6262
};
6363
};
6464

65-
namespace mkr_iot_carrier_rev2 {
66-
static Bsec *iaqSensor = nullptr;
65+
class mkr_iot_carrier_rev2 {
66+
public:
67+
static Bsec *iaqSensor;
6768
enum relays {
6869
RELAY1 = 1,
6970
RELAY2 = 2,
@@ -85,6 +86,8 @@ namespace mkr_iot_carrier_rev2 {
8586
};
8687
};
8788

89+
extern mkr_iot_carrier_rev2 mkr_iot_carrier_rev2_instance;
90+
8891
#define BME_SLAVE_ADDRESS 0x76
8992

9093
#define LSM6DSOX_ADDRESS 0x6A

0 commit comments

Comments
 (0)