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.
39 lines
1.0 KiB
C++
39 lines
1.0 KiB
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_TSL2561_U.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "TSL2561Sensor.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <Adafruit_TSL2561_U.h>
|
|
|
|
TSL2561Sensor::TSL2561Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_TSL2561, "TSL2561") {}
|
|
|
|
bool TSL2561Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
|
|
{
|
|
LOG_INFO("Init sensor: %s", sensorName);
|
|
|
|
status = tsl.begin(bus);
|
|
if (!status) {
|
|
return status;
|
|
}
|
|
tsl.setGain(TSL2561_GAIN_1X);
|
|
tsl.setIntegrationTime(TSL2561_INTEGRATIONTIME_101MS);
|
|
|
|
initI2CSensor();
|
|
return status;
|
|
}
|
|
|
|
bool TSL2561Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
|
{
|
|
measurement->variant.environment_metrics.has_lux = true;
|
|
sensors_event_t event;
|
|
tsl.getEvent(&event);
|
|
measurement->variant.environment_metrics.lux = event.light;
|
|
LOG_INFO("Lux: %f", measurement->variant.environment_metrics.lux);
|
|
|
|
return true;
|
|
}
|
|
|
|
#endif
|