JorropoandGitHub
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.
54 lines
2.3 KiB
C++
54 lines
2.3 KiB
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<DFRobot_LarkWeatherStation.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "DFRobotLarkSensor.h"
|
|
#include "TelemetrySensor.h"
|
|
#include "gps/GeoCoord.h"
|
|
#include <DFRobot_LarkWeatherStation.h>
|
|
#include <string>
|
|
|
|
DFRobotLarkSensor::DFRobotLarkSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_DFROBOT_LARK, "DFROBOT_LARK") {}
|
|
|
|
bool DFRobotLarkSensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
|
|
{
|
|
LOG_INFO("Init sensor: %s", sensorName);
|
|
lark = DFRobot_LarkWeatherStation_I2C(dev->address.address, bus);
|
|
|
|
if (lark.begin() == 0) // DFRobotLarkSensor init
|
|
{
|
|
LOG_DEBUG("DFRobotLarkSensor Init Succeed");
|
|
status = true;
|
|
} else {
|
|
LOG_ERROR("DFRobotLarkSensor Init Failed");
|
|
status = false;
|
|
}
|
|
initI2CSensor();
|
|
return status;
|
|
}
|
|
|
|
bool DFRobotLarkSensor::getMetrics(meshtastic_Telemetry *measurement)
|
|
{
|
|
measurement->variant.environment_metrics.has_temperature = true;
|
|
measurement->variant.environment_metrics.has_relative_humidity = true;
|
|
measurement->variant.environment_metrics.has_wind_speed = true;
|
|
measurement->variant.environment_metrics.has_wind_direction = true;
|
|
measurement->variant.environment_metrics.has_barometric_pressure = true;
|
|
|
|
measurement->variant.environment_metrics.temperature = lark.getValue("Temp").toFloat();
|
|
measurement->variant.environment_metrics.relative_humidity = lark.getValue("Humi").toFloat();
|
|
measurement->variant.environment_metrics.wind_speed = lark.getValue("Speed").toFloat();
|
|
measurement->variant.environment_metrics.wind_direction = GeoCoord::bearingToDegrees(lark.getValue("Dir").c_str());
|
|
measurement->variant.environment_metrics.barometric_pressure = lark.getValue("Pressure").toFloat();
|
|
|
|
LOG_INFO("Temperature: %f", measurement->variant.environment_metrics.temperature);
|
|
LOG_INFO("Humidity: %f", measurement->variant.environment_metrics.relative_humidity);
|
|
LOG_INFO("Wind Speed: %f", measurement->variant.environment_metrics.wind_speed);
|
|
LOG_INFO("Wind Direction: %d", measurement->variant.environment_metrics.wind_direction);
|
|
LOG_INFO("Barometric Pressure: %f", measurement->variant.environment_metrics.barometric_pressure);
|
|
|
|
return true;
|
|
}
|
|
|
|
#endif |