Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update WipperSnapper_I2C_Driver_SCD4X.h - renamed include #689

Merged
merged 6 commits into from
Feb 13, 2025
Merged

Update WipperSnapper_I2C_Driver_SCD4X.h - renamed include #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c9a98d
Update WipperSnapper_I2C_Driver_SCD4X.h - renamed include
tyeth Jan 31, 2025
fac2028
Update WipperSnapper_I2C_Driver_SCD4X.h - update class name
tyeth Jan 31, 2025
417009a
Update WipperSnapper_I2C_Driver_SCD4X.h - update instantiation
tyeth Jan 31, 2025
861d677
Fix multiple ifdef warning
tyeth Jan 31, 2025
c2fac61
Update begin and getDataReadyStatus
tyeth Jan 31, 2025
b91a387
clang format ifdefs
tyeth Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/components/i2c/drivers/WipperSnapper_I2C_Driver_SCD4X.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define WipperSnapper_I2C_Driver_SCD4X_H

#include "WipperSnapper_I2C_Driver.h"
#include <SensirionI2CScd4x.h>
#include <SensirionI2cScd4x.h>
#include <Wire.h>

/**************************************************************************/
Expand Down Expand Up @@ -51,8 +51,8 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
*/
/*******************************************************************************/
bool begin() {
_scd = new SensirionI2CScd4x();
_scd->begin(*_i2c);
_scd = new SensirionI2cScd4x();
_scd->begin(*_i2c, _sensorAddress);

// stop previously started measurement
if (_scd->stopPeriodicMeasurement())
Expand All @@ -78,7 +78,7 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
delay(100);

// Check if data is ready
error = _scd->getDataReadyFlag(isDataReady);
error = _scd->getDataReadyStatus(isDataReady);
if (error || !isDataReady)
return false;

Expand Down Expand Up @@ -145,10 +145,10 @@ class WipperSnapper_I2C_Driver_SCD4X : public WipperSnapper_I2C_Driver {
}

protected:
SensirionI2CScd4x *_scd; ///< SCD4x driver object
SensirionI2cScd4x *_scd; ///< SCD4x driver object
uint16_t _co2; ///< SCD4x co2 reading
float _temperature; ///< SCD4x temperature reading
float _humidity; ///< SCD4x humidity reading
};

#endif // WipperSnapper_I2C_Driver_SCD4X
#endif // WipperSnapper_I2C_Driver_SCD4X
9 changes: 5 additions & 4 deletions src/network_interfaces/Wippersnapper_ESP32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,11 @@ class Wippersnapper_ESP32 : public Wippersnapper {
// For boards with a "3D Antenna", we need to reduce the TX power
// to prevent flaky operation.
// NOTE: This is a known issue with the QT Py series of boards.
#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32S2 || \
ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM || \
ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2 || ARDUINO_ADAFRUIT_QTPY_ESP32C3 || \
ARDUINO_ADAFRUIT_QTPY_ESP32_PICO
#if defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2) || \
defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM) || \
defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2) || \
defined(ARDUINO_ADAFRUIT_QTPY_ESP32C3) || \
defined(ARDUINO_ADAFRUIT_QTPY_ESP32_PICO)
WiFi.setTxPower(WIFI_POWER_15dBm);
#endif

Expand Down
Loading