kopia lustrzana https://github.com/meshtastic/firmware
fix for MESHTASTIC_EXCLUDE_INPUTBROKER
rodzic
5d2f7d1962
commit
9d8a5221a9
|
@ -1,7 +1,7 @@
|
||||||
#include "InputBroker.h"
|
#include "InputBroker.h"
|
||||||
#include "PowerFSM.h" // needed for event trigger
|
#include "PowerFSM.h" // needed for event trigger
|
||||||
|
|
||||||
InputBroker *inputBroker;
|
InputBroker *inputBroker = nullptr;
|
||||||
|
|
||||||
InputBroker::InputBroker(){};
|
InputBroker::InputBroker(){};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include "cardKbI2cImpl.h"
|
#include "cardKbI2cImpl.h"
|
||||||
#include "InputBroker.h"
|
#include "InputBroker.h"
|
||||||
|
#include "main.h"
|
||||||
|
|
||||||
CardKbI2cImpl *cardKbI2cImpl;
|
CardKbI2cImpl *cardKbI2cImpl;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "kbI2cBase.h"
|
#include "kbI2cBase.h"
|
||||||
#include "main.h"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The idea behind this class to have static methods for the event handlers.
|
* @brief The idea behind this class to have static methods for the event handlers.
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
#include "modules/Telemetry/DeviceTelemetry.h"
|
#include "modules/Telemetry/DeviceTelemetry.h"
|
||||||
#endif
|
#endif
|
||||||
#if HAS_SENSOR && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
#if HAS_SENSOR && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
||||||
|
#include "main.h"
|
||||||
#include "modules/Telemetry/AirQualityTelemetry.h"
|
#include "modules/Telemetry/AirQualityTelemetry.h"
|
||||||
#include "modules/Telemetry/EnvironmentTelemetry.h"
|
#include "modules/Telemetry/EnvironmentTelemetry.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
#include "OPT3001Sensor.h"
|
|
||||||
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
||||||
#include "TelemetrySensor.h"
|
|
||||||
#include "configuration.h"
|
#include "configuration.h"
|
||||||
|
|
||||||
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
||||||
|
|
||||||
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
||||||
|
#include "OPT3001Sensor.h"
|
||||||
|
#include "TelemetrySensor.h"
|
||||||
#include <ClosedCube_OPT3001.h>
|
#include <ClosedCube_OPT3001.h>
|
||||||
|
|
||||||
OPT3001Sensor::OPT3001Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_OPT3001, "OPT3001") {}
|
OPT3001Sensor::OPT3001Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_OPT3001, "OPT3001") {}
|
||||||
|
@ -41,4 +44,6 @@ bool OPT3001Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
||||||
LOG_INFO("Lux: %f\n", measurement->variant.environment_metrics.lux);
|
LOG_INFO("Lux: %f\n", measurement->variant.environment_metrics.lux);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
|
@ -1,3 +1,8 @@
|
||||||
|
#pragma once
|
||||||
|
#include "configuration.h"
|
||||||
|
|
||||||
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
|
||||||
|
|
||||||
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
||||||
#include "TelemetrySensor.h"
|
#include "TelemetrySensor.h"
|
||||||
#include <ClosedCube_OPT3001.h>
|
#include <ClosedCube_OPT3001.h>
|
||||||
|
@ -14,4 +19,6 @@ class OPT3001Sensor : public TelemetrySensor
|
||||||
OPT3001Sensor();
|
OPT3001Sensor();
|
||||||
virtual int32_t runOnce() override;
|
virtual int32_t runOnce() override;
|
||||||
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif
|
Ładowanie…
Reference in New Issue