mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-03 20:30:43 +00:00
Merge branch 'master' into eink-special-frames
This commit is contained in:
commit
2d5a6c1a20
@ -12,6 +12,7 @@ int32_t SHT31Sensor::runOnce()
|
|||||||
if (!hasSensor()) {
|
if (!hasSensor()) {
|
||||||
return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
|
return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
|
||||||
}
|
}
|
||||||
|
sht31 = Adafruit_SHT31(nodeTelemetrySensorsMap[sensorType].second);
|
||||||
status = sht31.begin(nodeTelemetrySensorsMap[sensorType].first);
|
status = sht31.begin(nodeTelemetrySensorsMap[sensorType].first);
|
||||||
return initI2CSensor();
|
return initI2CSensor();
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
class SHT31Sensor : public TelemetrySensor
|
class SHT31Sensor : public TelemetrySensor
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
Adafruit_SHT31 sht31 = Adafruit_SHT31(nodeTelemetrySensorsMap[sensorType].second);
|
Adafruit_SHT31 sht31;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void setup() override;
|
virtual void setup() override;
|
||||||
|
Loading…
Reference in New Issue
Block a user