pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-01 10:19:59 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #3891 from 2itea/master

Browse Source 
Change SHT4X sensors library from Sensirion to Adafruit
This commit is contained in:
Thomas Göttgens 2024-05-14 21:50:20 +02:00 committed by GitHub
commit 5da798c625
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -133,4 +133,4 @@ lib_deps =
https://github.com/lewisxhe/SensorLib#27fd0f721e20cd09e1f81383f0ba58a54fe84a17 https://github.com/lewisxhe/SensorLib#27fd0f721e20cd09e1f81383f0ba58a54fe84a17
adafruit/Adafruit LSM6DS@^4.7.2 adafruit/Adafruit LSM6DS@^4.7.2
mprograms/QMC5883LCompass@^1.2.0 mprograms/QMC5883LCompass@^1.2.0
https://github.com/Sensirion/arduino-i2c-sht4x#1.1.0 https://github.com/adafruit/Adafruit_SHT4X#1.0.4

38
src/modules/Telemetry/Sensor/SHT4XSensor.cpp
View File

@ -5,17 +5,7 @@
#include "../mesh/generated/meshtastic/telemetry.pb.h" #include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "SHT4XSensor.h" #include "SHT4XSensor.h"
#include "TelemetrySensor.h" #include "TelemetrySensor.h"
#include <SensirionI2cSht4x.h> #include <Adafruit_SHT4x.h>
// macro definitions
// make sure that we use the proper definition of NO_ERROR
#ifdef NO_ERROR
#undef NO_ERROR
#endif
#define NO_ERROR 0
static char errorMessage[64];
static int16_t error;
SHT4XSensor::SHT4XSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT4X, "SHT4X") {} SHT4XSensor::SHT4XSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT4X, "SHT4X") {}
@ -28,17 +18,15 @@ int32_t SHT4XSensor::runOnce()
uint32_t serialNumber = 0; uint32_t serialNumber = 0;
sht4x.begin(*nodeTelemetrySensorsMap[sensorType].second, 0x44); sht4x.begin(nodeTelemetrySensorsMap[sensorType].second);
error = sht4x.serialNumber(serialNumber); serialNumber = sht4x.readSerial();
LOG_DEBUG("serialNumber : %x\n", serialNumber); if (serialNumber != 0) {
if (error != NO_ERROR) { LOG_DEBUG("serialNumber : %x\n", serialNumber);
LOG_DEBUG("Error trying to execute serialNumber(): ");
errorToString(error, errorMessage, sizeof errorMessage);
LOG_DEBUG(errorMessage);
status = 0;
} else {
status = 1; status = 1;
} else {
LOG_DEBUG("Error trying to execute readSerial(): ");
status = 0;
} }
return initI2CSensor(); return initI2CSensor();
@ -51,12 +39,10 @@ void SHT4XSensor::setup()
bool SHT4XSensor::getMetrics(meshtastic_Telemetry *measurement) bool SHT4XSensor::getMetrics(meshtastic_Telemetry *measurement)
{ {
float aTemperature = 0.0; sensors_event_t humidity, temp;
float aHumidity = 0.0; sht4x.getEvent(&humidity, &temp);
sht4x.measureLowestPrecision(aTemperature, aHumidity); measurement->variant.environment_metrics.temperature = temp.temperature;
measurement->variant.environment_metrics.temperature = aTemperature; measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
measurement->variant.environment_metrics.relative_humidity = aHumidity;
return true; return true;
} }

4
src/modules/Telemetry/Sensor/SHT4XSensor.h
View File

@ -4,12 +4,12 @@
#include "../mesh/generated/meshtastic/telemetry.pb.h" #include "../mesh/generated/meshtastic/telemetry.pb.h"
#include "TelemetrySensor.h" #include "TelemetrySensor.h"
#include <SensirionI2cSht4x.h> #include <Adafruit_SHT4x.h>
class SHT4XSensor : public TelemetrySensor class SHT4XSensor : public TelemetrySensor
{ {
private: private:
SensirionI2cSht4x sht4x; Adafruit_SHT4x sht4x = Adafruit_SHT4x();
protected: protected:
virtual void setup() override; virtual void setup() override;