mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-17 00:51:30 +10:00
Jorropo
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
35 lines
1020 B
C++
35 lines
1020 B
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHTC3.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "SHTC3Sensor.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <Adafruit_SHTC3.h>
|
|
|
|
SHTC3Sensor::SHTC3Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHTC3, "SHTC3") {}
|
|
|
|
bool SHTC3Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
|
|
{
|
|
LOG_INFO("Init sensor: %s", sensorName);
|
|
status = shtc3.begin(bus);
|
|
|
|
initI2CSensor();
|
|
return status;
|
|
}
|
|
|
|
bool SHTC3Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
|
{
|
|
measurement->variant.environment_metrics.has_temperature = true;
|
|
measurement->variant.environment_metrics.has_relative_humidity = true;
|
|
|
|
sensors_event_t humidity, temp;
|
|
shtc3.getEvent(&humidity, &temp);
|
|
|
|
measurement->variant.environment_metrics.temperature = temp.temperature;
|
|
measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
|
|
|
|
return true;
|
|
}
|
|
|
|
#endif |