mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-14 15:31:31 +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.
44 lines
1.3 KiB
C++
44 lines
1.3 KiB
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_DPS310.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "DPS310Sensor.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <Adafruit_DPS310.h>
|
|
|
|
DPS310Sensor::DPS310Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_DPS310, "DPS310") {}
|
|
|
|
bool DPS310Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
|
|
{
|
|
LOG_INFO("Init sensor: %s", sensorName);
|
|
status = dps310.begin_I2C(dev->address.address, bus);
|
|
if (!status) {
|
|
return status;
|
|
}
|
|
|
|
dps310.configurePressure(DPS310_1HZ, DPS310_4SAMPLES);
|
|
dps310.configureTemperature(DPS310_1HZ, DPS310_4SAMPLES);
|
|
dps310.setMode(DPS310_CONT_PRESTEMP);
|
|
|
|
initI2CSensor();
|
|
return status;
|
|
}
|
|
|
|
bool DPS310Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
|
{
|
|
sensors_event_t temp, press;
|
|
|
|
if (!dps310.getEvents(&temp, &press)) {
|
|
LOG_DEBUG("DPS310 getEvents no data");
|
|
return false;
|
|
}
|
|
|
|
measurement->variant.environment_metrics.has_temperature = true;
|
|
measurement->variant.environment_metrics.has_barometric_pressure = true;
|
|
measurement->variant.environment_metrics.temperature = temp.temperature;
|
|
measurement->variant.environment_metrics.barometric_pressure = press.pressure;
|
|
|
|
return true;
|
|
}
|
|
#endif |