Skip to content

Commit b63e2c2

Browse files
Rol-laRol-la
committed
Simplify symbol access
The fully qualified symbol access to sensirion::upt::core is simplified to make the code more readable.
1 parent f5c1631 commit b63e2c2

26 files changed

+152
-152
lines changed

‎examples/advancedUsage/advancedUsage.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ the sensor manager.
2323
#include <cmath>
2424
#include "DefaultDriverConfig.h"
2525

26-
using namespace sensirion::upt::core;
26+
using namespace sensirion::upt;
2727
using namespace sensirion::upt::i2c_autodetect;
2828

2929
DefaultI2cDetector i2CAutoDetector(Wire);
@@ -59,7 +59,7 @@ void setup() {
5959

6060
// Retrieval of sensor driver
6161
AutoDetectorError error = sensorManager.getSensorDriver<SensirionI2cScd4x>(
62-
pScd4xDriver, sensirion::upt::core::SCD4X());
62+
pScd4xDriver, core::SCD4X());
6363

6464
if (error != NO_ERROR) {
6565
Serial.print("Encountered error while getting sensor driver (code ");
@@ -69,7 +69,7 @@ void setup() {
6969

7070
// Set custom interval for sensor measurement update (default: 5s, lower
7171
// values are ignored)
72-
sensorManager.setInterval(7500, sensirion::upt::core::SCD4X());
72+
sensorManager.setInterval(7500, core::SCD4X());
7373

7474
maxNumSensors = sensorManager.getMaxNumberOfSensors();
7575
pCurrentData = new const ISensor::MeasurementList* [maxNumSensors] { nullptr };
@@ -100,7 +100,7 @@ void loop() {
100100
"Please connect a Sensirion SCD4X CO2 sensor on the i2c bus.");
101101
sensorManager.refreshConnectedSensors();
102102
sensorManager.getSensorDriver<SensirionI2cScd4x>(pScd4xDriver,
103-
sensirion::upt::core::SCD4X());
103+
core::SCD4X());
104104
}
105105
}
106106

‎src/ISensor.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class ISensor {
1515

1616
public:
1717

18-
using DeviceType = sensirion::upt::core::DeviceType;
19-
using MeasurementList = std::vector<sensirion::upt::core::Measurement>;
18+
using DeviceType = core::DeviceType;
19+
using MeasurementList = std::vector<core::Measurement>;
2020

2121
virtual ~ISensor() = default;
2222

@@ -102,7 +102,7 @@ class ISensor {
102102
*
103103
* @return MetaData
104104
*/
105-
virtual sensirion::upt::core::MetaData getMetaData() const = 0;
105+
virtual core::MetaData getMetaData() const = 0;
106106

107107
/**
108108
* @brief getter method for _NUMBER_OF_ALLOWED_CONSECUTIVE_ERRORS

‎src/SensorList.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SensorStateMachine* SensorList::getSensorStateMachine(const size_t i) const {
3737
return mSensorCollection[i];
3838
}
3939

40-
ISensor* SensorList::getSensor(sensirion::upt::core::DeviceType deviceType) const {
40+
ISensor* SensorList::getSensor(core::DeviceType deviceType) const {
4141
for( const auto s : mSensorCollection){
4242
if (s->getSensor()->getDeviceType() == deviceType){
4343
return s->getSensor();
@@ -46,7 +46,7 @@ ISensor* SensorList::getSensor(sensirion::upt::core::DeviceType deviceType) cons
4646
return nullptr;
4747
}
4848

49-
bool SensorList::containsSensor(sensirion::upt::core::DeviceType deviceType) const {
49+
bool SensorList::containsSensor(core::DeviceType deviceType) const {
5050
auto iter = std::find_if(mSensorCollection.begin(),
5151
mSensorCollection.end(), [deviceType](SensorStateMachine* s) {
5252
return s->getSensor()->getDeviceType() == deviceType;

‎src/SensorList.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class SensorList {
1313
private:
1414

1515
SensorCollection mSensorCollection{};
16-
static size_t hashSensorType(sensirion::upt::core::DeviceType deviceType);
16+
static size_t hashSensorType(core::DeviceType deviceType);
1717

1818
public:
1919
explicit SensorList() {};
@@ -61,7 +61,7 @@ class SensorList {
6161
/**
6262
* @brief getter method for a stored sensor
6363
*/
64-
ISensor* getSensor(sensirion::upt::core::DeviceType deviceType) const;
64+
ISensor* getSensor(core::DeviceType deviceType) const;
6565

6666
/**
6767
* @brief check if the given Sensor is contained in the list.
@@ -70,7 +70,7 @@ class SensorList {
7070
*
7171
* @returns True if the sensor is found, false otherwise.
7272
*/
73-
bool containsSensor(sensirion::upt::core::DeviceType deviceType) const;
73+
bool containsSensor(core::DeviceType deviceType) const;
7474

7575
/**
7676
* @brief remove lost sensors from list

‎src/SensorManager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void SensorManager::executeSensorCommunication() {
1515
if (ssm) {
1616
const AutoDetectorError error = ssm->update();
1717
const char* sensorName =
18-
sensirion::upt::core::deviceLabel(ssm->getSensor()->getDeviceType());
18+
core::deviceLabel(ssm->getSensor()->getDeviceType());
1919
switch (error) {
2020
case I2C_ERROR:
2121
ESP_LOGW(TAG,

‎src/SensorManager.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class SensorManager {
1818
IAutoDetector& mDetector;
1919

2020
public:
21-
using MeasurementList = std::vector<sensirion::upt::core::Measurement>;
21+
using MeasurementList = std::vector<core::Measurement>;
2222
/**
2323
* @brief constructor
2424
*
@@ -79,7 +79,7 @@ class SensorManager {
7979
* @note Does not return an error in case the validity checks fail, in which
8080
* case the interval is not set for the sensor
8181
*/
82-
void setInterval(unsigned long interval, sensirion::upt::core::DeviceType deviceType);
82+
void setInterval(unsigned long interval, core::DeviceType deviceType);
8383

8484
/**
8585
* @brief getter method for number of sensors

‎src/SensorWrappers/Scd30.cpp‎

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

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

1010
uint16_t Scd30::start() {
1111
_driver.begin(_wire, _address);
@@ -35,16 +35,16 @@ uint16_t Scd30::measureAndWrite(MeasurementList& measurements,
3535
}
3636

3737
measurements.emplace_back(_metaData,
38-
sensirion::upt::core::SignalType::CO2_PARTS_PER_MILLION,
39-
sensirion::upt::core::DataPoint{timeStamp, co2Concentration});
38+
core::SignalType::CO2_PARTS_PER_MILLION,
39+
core::DataPoint{timeStamp, co2Concentration});
4040

4141
measurements.emplace_back(_metaData,
42-
sensirion::upt::core::SignalType::TEMPERATURE_DEGREES_CELSIUS,
43-
sensirion::upt::core::DataPoint{timeStamp, temperature});
42+
core::SignalType::TEMPERATURE_DEGREES_CELSIUS,
43+
core::DataPoint{timeStamp, temperature});
4444

4545
measurements.emplace_back(_metaData,
46-
sensirion::upt::core::SignalType::RELATIVE_HUMIDITY_PERCENTAGE,
47-
sensirion::upt::core::DataPoint{timeStamp, humidity});
46+
core::SignalType::RELATIVE_HUMIDITY_PERCENTAGE,
47+
core::DataPoint{timeStamp, humidity});
4848

4949

5050
/* Prepare next reading by querying the dataReadyFlag. We don't need the
@@ -82,12 +82,12 @@ uint16_t Scd30::initializationStep() {
8282
return error;
8383
}
8484

85-
sensirion::upt::core::DeviceType Scd30::getDeviceType() const {
85+
core::DeviceType Scd30::getDeviceType() const {
8686
return _metaData.deviceType;
8787
;
8888
}
8989

90-
sensirion::upt::core::MetaData Scd30::getMetaData() const {
90+
core::MetaData Scd30::getMetaData() const {
9191
return _metaData;
9292
}
9393

‎src/SensorWrappers/Scd30.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Scd30 : public ISensor {
1515
const unsigned long timeStamp) override;
1616
uint16_t initializationStep() override;
1717
DeviceType getDeviceType() const override;
18-
sensirion::upt::core::MetaData getMetaData() const override;
18+
core::MetaData getMetaData() const override;
1919
size_t getNumberOfDataPoints() const override;
2020
unsigned long getMinimumMeasurementIntervalMs() const override;
2121
void* getDriver() override;
@@ -24,7 +24,7 @@ class Scd30 : public ISensor {
2424
TwoWire& _wire;
2525
uint16_t _address;
2626
SensirionI2cScd30 _driver;
27-
sensirion::upt::core::MetaData _metaData;
27+
core::MetaData _metaData;
2828
};
2929
} // namespace sensirion::upt::i2c_autodetect
3030

‎src/SensorWrappers/Scd4x.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace sensirion::upt::i2c_autodetect{
66

77
Scd4x::Scd4x(TwoWire& wire, const uint16_t address) : mWire(wire),
88
mAddress{address},
9-
mMetadata{sensirion::upt::core::SCD4X()}{};
9+
mMetadata{core::SCD4X()}{};
1010

1111
uint16_t Scd4x::start() {
1212
mDriver.begin(mWire, mAddress);
@@ -24,16 +24,16 @@ uint16_t Scd4x::measureAndWrite(MeasurementList& measurements,
2424
}
2525

2626
measurements.emplace_back(mMetadata,
27-
sensirion::upt::core::SignalType::CO2_PARTS_PER_MILLION,
28-
sensirion::upt::core::DataPoint{timeStamp, static_cast<float>(co2)});
27+
core::SignalType::CO2_PARTS_PER_MILLION,
28+
core::DataPoint{timeStamp, static_cast<float>(co2)});
2929

3030
measurements.emplace_back(mMetadata,
31-
sensirion::upt::core::SignalType::TEMPERATURE_DEGREES_CELSIUS,
32-
sensirion::upt::core::DataPoint{timeStamp, temp});
31+
core::SignalType::TEMPERATURE_DEGREES_CELSIUS,
32+
core::DataPoint{timeStamp, temp});
3333

3434
measurements.emplace_back(mMetadata,
35-
sensirion::upt::core::SignalType::RELATIVE_HUMIDITY_PERCENTAGE,
36-
sensirion::upt::core::DataPoint{timeStamp, humi});
35+
core::SignalType::RELATIVE_HUMIDITY_PERCENTAGE,
36+
core::DataPoint{timeStamp, humi});
3737

3838
return HighLevelError::NoError;
3939
}
@@ -58,12 +58,12 @@ uint16_t Scd4x::initializationStep() {
5858
return error;
5959
}
6060

61-
sensirion::upt::core::DeviceType Scd4x::getDeviceType() const {
61+
core::DeviceType Scd4x::getDeviceType() const {
6262

6363
return mMetadata.deviceType;
6464
}
6565

66-
sensirion::upt::core::MetaData Scd4x::getMetaData() const {
66+
core::MetaData Scd4x::getMetaData() const {
6767
return mMetadata;
6868
}
6969

‎src/SensorWrappers/Scd4x.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Scd4x : public ISensor {
1515
const unsigned long timeStamp) override;
1616
uint16_t initializationStep() override;
1717
DeviceType getDeviceType() const override;
18-
sensirion::upt::core::MetaData getMetaData() const override;
18+
core::MetaData getMetaData() const override;
1919
size_t getNumberOfDataPoints() const override;
2020
unsigned long getMinimumMeasurementIntervalMs() const override;
2121
// Same as measurement interval
@@ -26,7 +26,7 @@ class Scd4x : public ISensor {
2626
TwoWire& mWire;
2727
uint16_t mAddress;
2828
SensirionI2cScd4x mDriver;
29-
sensirion::upt::core::MetaData mMetadata;
29+
core::MetaData mMetadata;
3030
};
3131
} // namespace sensirion::upt::i2c_autodetect
3232

0 commit comments

Comments
 (0)