mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-13 23:21:19 +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.
36 lines
1.1 KiB
C++
36 lines
1.1 KiB
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<SparkFun_MLX90632_Arduino_Library.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "MLX90632Sensor.h"
|
|
#include "TelemetrySensor.h"
|
|
|
|
MLX90632Sensor::MLX90632Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_MLX90632, "MLX90632") {}
|
|
|
|
bool MLX90632Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
|
|
{
|
|
LOG_INFO("Init sensor: %s", sensorName);
|
|
|
|
MLX90632::status returnError;
|
|
if (mlx.begin(dev->address.address, *bus, returnError) == true) // MLX90632 init
|
|
{
|
|
LOG_DEBUG("MLX90632 Init Succeed");
|
|
status = true;
|
|
} else {
|
|
LOG_ERROR("MLX90632 Init Failed");
|
|
status = false;
|
|
}
|
|
initI2CSensor();
|
|
return status;
|
|
}
|
|
|
|
bool MLX90632Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
|
{
|
|
measurement->variant.environment_metrics.has_temperature = true;
|
|
measurement->variant.environment_metrics.temperature = mlx.getObjectTemp(); // Get the object temperature in Fahrenheit
|
|
|
|
return true;
|
|
}
|
|
|
|
#endif |