Skip to content

Commit e9d5450

Browse files
quentin-cyquentin-cy
committed
moved wrappers to mAttributes
1 parent c832f8c commit e9d5450

File tree

17 files changed

+124
-124
lines changed

17 files changed

+124
-124
lines changed

‎src/I2CAutoDetector.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class I2CAutoDetector : public IAutoDetector {
2020

2121

2222
explicit I2CAutoDetector(TwoWire& wire):
23-
_wire(wire),
23+
mWire(wire),
2424
mDetectionTable{createMappingInstance<SensorMappingT>(wire)...}{};
2525

2626
virtual ~I2CAutoDetector() {
@@ -47,8 +47,8 @@ class I2CAutoDetector : public IAutoDetector {
4747
for (auto tableEntry:mDetectionTable){
4848
if (sensorList.containsSensor(tableEntry->getI2cAddress())) continue;
4949

50-
_wire.beginTransmission(tableEntry->getI2cAddress());
51-
const byte error = _wire.endTransmission();
50+
mWire.beginTransmission(tableEntry->getI2cAddress());
51+
const byte error = mWire.endTransmission();
5252
if (error){
5353
continue;
5454
}
@@ -64,7 +64,7 @@ class I2CAutoDetector : public IAutoDetector {
6464
using DetectableSensorsT = std::array<ISensorToAddressMapping*,
6565
sizeof...(SensorMappingT)>;
6666

67-
TwoWire& _wire;
67+
TwoWire& mWire;
6868
DetectableSensorsT mDetectionTable;
6969

7070

‎src/SensorWrappers/Scd30.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
namespace sensirion::upt::i2c_autodetect{
66

77
Scd30::Scd30(TwoWire& wire, const uint16_t address) :
8-
_wire(wire), _address{address}, _metaData{core::SCD30()}{};
8+
mWire(wire), mAddress{address}, mMetadata{core::SCD30()}{};
99

1010
uint16_t Scd30::start() {
11-
_driver.begin(_wire, _address);
11+
mDriver.begin(mWire, mAddress);
1212
return 0;
1313
}
1414

1515
uint16_t Scd30::measureAndWrite(MeasurementList& measurements,
1616
const unsigned long timeStamp) {
1717
// Check data ready
1818
uint16_t dataReadyFlag = 0;
19-
uint16_t error = _driver.getDataReady(dataReadyFlag);
19+
uint16_t error = mDriver.getDataReady(dataReadyFlag);
2020
if (error) {
2121
return error;
2222
}
@@ -29,20 +29,20 @@ uint16_t Scd30::measureAndWrite(MeasurementList& measurements,
2929
float temperature;
3030
float humidity;
3131
error =
32-
_driver.readMeasurementData(co2Concentration, temperature, humidity);
32+
mDriver.readMeasurementData(co2Concentration, temperature, humidity);
3333
if (error) {
3434
return error;
3535
}
3636

37-
measurements.emplace_back(_metaData,
37+
measurements.emplace_back(mMetadata,
3838
core::SignalType::CO2_PARTS_PER_MILLION,
3939
core::DataPoint{timeStamp, co2Concentration});
4040

41-
measurements.emplace_back(_metaData,
41+
measurements.emplace_back(mMetadata,
4242
core::SignalType::TEMPERATURE_DEGREES_CELSIUS,
4343
core::DataPoint{timeStamp, temperature});
4444

45-
measurements.emplace_back(_metaData,
45+
measurements.emplace_back(mMetadata,
4646
core::SignalType::RELATIVE_HUMIDITY_PERCENTAGE,
4747
core::DataPoint{timeStamp, humidity});
4848

@@ -53,7 +53,7 @@ uint16_t Scd30::measureAndWrite(MeasurementList& measurements,
5353
* call of this function as it then is not required to enter a wait loop
5454
* (see SensirionI2cScd30::blockingReadMeasurementData()). This procedure is
5555
* only required for SCD30. */
56-
error = _driver.getDataReady(dataReadyFlag);
56+
error = mDriver.getDataReady(dataReadyFlag);
5757
if (error) {
5858
return error;
5959
}
@@ -62,9 +62,9 @@ uint16_t Scd30::measureAndWrite(MeasurementList& measurements,
6262

6363
uint16_t Scd30::initializationStep() {
6464
// stop potentially previously started measurement
65-
_driver.stopPeriodicMeasurement();
65+
mDriver.stopPeriodicMeasurement();
6666
// Start Measurement
67-
uint16_t error = _driver.startPeriodicMeasurement(0);
67+
uint16_t error = mDriver.startPeriodicMeasurement(0);
6868
if (error) {
6969
return error;
7070
}
@@ -74,36 +74,36 @@ uint16_t Scd30::initializationStep() {
7474
for (size_t i = 0; i < 64; i++) {
7575
sensorID |= (random(2) << i);
7676
}
77-
_metaData.deviceID = sensorID;
77+
mMetadata.deviceID = sensorID;
7878

7979
/* See explanatory comment for measureAndWrite() */
8080
uint16_t dataReadyFlag;
81-
error = _driver.getDataReady(dataReadyFlag);
81+
error = mDriver.getDataReady(dataReadyFlag);
8282
return error;
8383
}
8484

8585
core::DeviceType Scd30::getDeviceType() const {
86-
return _metaData.deviceType;
86+
return mMetadata.deviceType;
8787
;
8888
}
8989

9090
core::MetaData Scd30::getMetaData() const {
91-
return _metaData;
91+
return mMetadata;
9292
}
9393

9494
size_t Scd30::getNumberOfDataPoints() const {
9595
return 3;
9696
}
9797

9898
uint8_t Scd30::getI2CAddress() const {
99-
return _address;
99+
return mAddress;
100100
};
101101

102102
unsigned long Scd30::getMinimumMeasurementIntervalMs() const {
103103
return 2000;
104104
}
105105

106106
void* Scd30::getDriver() {
107-
return reinterpret_cast<void*>(&_driver);
107+
return reinterpret_cast<void*>(&mDriver);
108108
}
109109
} // namespace sensirion::upt::i2c_autodetect

‎src/SensorWrappers/Scd30.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ class Scd30 : public ISensor {
2222
void* getDriver() override;
2323

2424
private:
25-
TwoWire& _wire;
26-
uint16_t _address;
27-
SensirionI2cScd30 _driver;
28-
core::MetaData _metaData;
25+
TwoWire& mWire;
26+
uint16_t mAddress;
27+
SensirionI2cScd30 mDriver;
28+
core::MetaData mMetadata;
2929
};
3030
} // namespace sensirion::upt::i2c_autodetect
3131

‎src/SensorWrappers/Sen5x.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
namespace sensirion::upt::i2c_autodetect{
66

77
Sen5x::Sen5x(TwoWire& wire, uint16_t address) :
8-
_wire(wire),
9-
_address{address},
10-
_metaData{core::SEN5X()} {};
8+
mWire(wire),
9+
mAddress{address},
10+
mMetadata{core::SEN5X()} {};
1111

1212
uint16_t Sen5x::start() {
13-
_driver.begin(_wire);
13+
mDriver.begin(mWire);
1414
return 0;
1515
}
1616

@@ -28,7 +28,7 @@ uint16_t Sen5x::measureAndWrite(MeasurementList& measurements,
2828
float vocIndex;
2929
float noxIndex;
3030

31-
error = _driver.readMeasuredValues(
31+
error = mDriver.readMeasuredValues(
3232
massConcentrationPm1p0, massConcentrationPm2p5, massConcentrationPm4p0,
3333
massConcentrationPm10p0, ambientHumidity, ambientTemperature, vocIndex,
3434
noxIndex);
@@ -37,19 +37,19 @@ uint16_t Sen5x::measureAndWrite(MeasurementList& measurements,
3737
return error;
3838
}
3939

40-
measurements.emplace_back(_metaData,
40+
measurements.emplace_back(mMetadata,
4141
core::SignalType::PM1P0_MICRO_GRAMM_PER_CUBIC_METER,
4242
core::DataPoint{timeStamp, massConcentrationPm1p0});
4343

44-
measurements.emplace_back(_metaData,
44+
measurements.emplace_back(mMetadata,
4545
core::SignalType::PM2P5_MICRO_GRAMM_PER_CUBIC_METER,
4646
core::DataPoint{timeStamp, massConcentrationPm2p5});
4747

48-
measurements.emplace_back(_metaData,
48+
measurements.emplace_back(mMetadata,
4949
core::SignalType::PM4P0_MICRO_GRAMM_PER_CUBIC_METER,
5050
core::DataPoint{timeStamp, massConcentrationPm4p0});
5151

52-
measurements.emplace_back(_metaData,
52+
measurements.emplace_back(mMetadata,
5353
core::SignalType::PM10P0_MICRO_GRAMM_PER_CUBIC_METER,
5454
core::DataPoint{timeStamp, massConcentrationPm10p0});
5555

@@ -59,23 +59,23 @@ uint16_t Sen5x::measureAndWrite(MeasurementList& measurements,
5959
if (getDeviceType() == core::SEN54() or
6060
getDeviceType() == core::SEN55()) {
6161

62-
measurements.emplace_back(_metaData,
62+
measurements.emplace_back(mMetadata,
6363
core::SignalType::RELATIVE_HUMIDITY_PERCENTAGE,
6464
core::DataPoint{timeStamp, ambientHumidity});
6565

66-
measurements.emplace_back(_metaData,
66+
measurements.emplace_back(mMetadata,
6767
core::SignalType::TEMPERATURE_DEGREES_CELSIUS,
6868
core::DataPoint{timeStamp, ambientTemperature});
6969

70-
measurements.emplace_back(_metaData,
70+
measurements.emplace_back(mMetadata,
7171
core::SignalType::VOC_INDEX,
7272
core::DataPoint{timeStamp, vocIndex});
7373

7474
}
7575
// Version 55
7676
if (getDeviceType() == core::SEN55()) {
7777

78-
measurements.emplace_back(_metaData,
78+
measurements.emplace_back(mMetadata,
7979
core::SignalType::NOX_INDEX,
8080
core::DataPoint{timeStamp, noxIndex});
8181

@@ -85,7 +85,7 @@ uint16_t Sen5x::measureAndWrite(MeasurementList& measurements,
8585

8686
uint16_t Sen5x::initializationStep() {
8787
// stop potentially previously started measurement
88-
uint16_t error = _driver.stopMeasurement();
88+
uint16_t error = mDriver.stopMeasurement();
8989
if (error) {
9090
return error;
9191
}
@@ -99,7 +99,7 @@ uint16_t Sen5x::initializationStep() {
9999
// Get sensor unique ID (last 8 chars of serial no.)
100100
uint8_t serialNumberSize = 32;
101101
unsigned char serialNumber[serialNumberSize];
102-
error = _driver.getSerialNumber(serialNumber, serialNumberSize);
102+
error = mDriver.getSerialNumber(serialNumber, serialNumberSize);
103103
if (error) {
104104
return error;
105105
}
@@ -112,10 +112,10 @@ uint16_t Sen5x::initializationStep() {
112112
}
113113
sensorID |= serialNumber[actualLen - 1];
114114

115-
_metaData.deviceID = sensorID;
115+
mMetadata.deviceID = sensorID;
116116

117117
// Start Measurement
118-
error = _driver.startMeasurement();
118+
error = mDriver.startMeasurement();
119119
if (error) {
120120
return error;
121121
}
@@ -124,11 +124,11 @@ uint16_t Sen5x::initializationStep() {
124124
}
125125

126126
core::DeviceType Sen5x::getDeviceType() const {
127-
return _metaData.deviceType;
127+
return mMetadata.deviceType;
128128
}
129129

130130
core::MetaData Sen5x::getMetaData() const {
131-
return _metaData;
131+
return mMetadata;
132132
}
133133

134134
size_t Sen5x::getNumberOfDataPoints() const {
@@ -150,32 +150,32 @@ unsigned long Sen5x::getMinimumMeasurementIntervalMs() const {
150150
}
151151

152152
void* Sen5x::getDriver() {
153-
return reinterpret_cast<void*>(&_driver);
153+
return reinterpret_cast<void*>(&mDriver);
154154
}
155155

156156
uint8_t Sen5x::getI2CAddress() const {
157-
return _address;
157+
return mAddress;
158158
};
159159

160160
uint16_t Sen5x::_determineSensorVersion() {
161161
uint8_t sensorNameSize = 32;
162162
unsigned char sensorNameStr[sensorNameSize];
163-
uint16_t error = _driver.getProductName(sensorNameStr, sensorNameSize);
163+
uint16_t error = mDriver.getProductName(sensorNameStr, sensorNameSize);
164164

165165
if (error) {
166166
return error;
167167
}
168168

169169
if (strcmp(reinterpret_cast<const char*>(sensorNameStr), "SEN50") == 0) {
170-
_metaData.deviceType = core::SEN50();
170+
mMetadata.deviceType = core::SEN50();
171171
} else if (strcmp(reinterpret_cast<const char*>(sensorNameStr), "SEN54") ==
172172
0) {
173-
_metaData.deviceType = core::SEN54();
173+
mMetadata.deviceType = core::SEN54();
174174
} else if (strcmp(reinterpret_cast<const char*>(sensorNameStr), "SEN55") ==
175175
0) {
176-
_metaData.deviceType = core::SEN55();
176+
mMetadata.deviceType = core::SEN55();
177177
} else {
178-
_metaData.deviceType = core::SEN5X();
178+
mMetadata.deviceType = core::SEN5X();
179179
}
180180
return 0;
181181
}

‎src/SensorWrappers/Sen5x.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ class Sen5x : public ISensor {
2222
void* getDriver() override;
2323

2424
private:
25-
TwoWire& _wire;
26-
SensirionI2CSen5x _driver;
27-
uint16_t _address;
28-
core::MetaData _metaData;
25+
TwoWire& mWire;
26+
SensirionI2CSen5x mDriver;
27+
uint16_t mAddress;
28+
core::MetaData mMetadata;
2929
uint16_t _determineSensorVersion();
3030
};
3131
} // namespace sensirion::upt::i2c_autodetect

0 commit comments

Comments
 (0)