re-add namespacing in protobufs. Let's see what i missed. Portduino likely ...

Checking in generated on purpose.
This commit is contained in:
Thomas Göttgens
2023-01-21 18:22:19 +01:00
parent ab3446faed
commit 6fdb93cd16
157 changed files with 2770 additions and 2770 deletions

View File

@@ -5,7 +5,7 @@
#include <Adafruit_BME280.h>
#include <typeinfo>
BME280Sensor::BME280Sensor() : TelemetrySensor(TelemetrySensorType_BME280, "BME280") {}
BME280Sensor::BME280Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_BME280, "BME280") {}
int32_t BME280Sensor::runOnce()
{
@@ -26,7 +26,7 @@ int32_t BME280Sensor::runOnce()
void BME280Sensor::setup() {}
bool BME280Sensor::getMetrics(Telemetry *measurement)
bool BME280Sensor::getMetrics(meshtastic_Telemetry *measurement)
{
LOG_DEBUG("BME280Sensor::getMetrics\n");
bme280.takeForcedMeasurement();

View File

@@ -13,5 +13,5 @@ class BME280Sensor : virtual public TelemetrySensor
public:
BME280Sensor();
virtual int32_t runOnce() override;
virtual bool getMetrics(Telemetry *measurement) override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
};

View File

@@ -4,7 +4,7 @@
#include "configuration.h"
#include <Adafruit_BME680.h>
BME680Sensor::BME680Sensor() : TelemetrySensor(TelemetrySensorType_BME680, "BME680") {}
BME680Sensor::BME680Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_BME680, "BME680") {}
int32_t BME680Sensor::runOnce()
{
@@ -19,7 +19,7 @@ int32_t BME680Sensor::runOnce()
void BME680Sensor::setup() {}
bool BME680Sensor::getMetrics(Telemetry *measurement)
bool BME680Sensor::getMetrics(meshtastic_Telemetry *measurement)
{
bme680.performReading();
measurement->variant.environment_metrics.temperature = bme680.temperature;

View File

@@ -13,5 +13,5 @@ class BME680Sensor : virtual public TelemetrySensor
public:
BME680Sensor();
virtual int32_t runOnce() override;
virtual bool getMetrics(Telemetry *measurement) override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
};

View File

@@ -5,7 +5,7 @@
#include <Adafruit_BMP280.h>
#include <typeinfo>
BMP280Sensor::BMP280Sensor() : TelemetrySensor(TelemetrySensorType_BMP280, "BMP280") {}
BMP280Sensor::BMP280Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_BMP280, "BMP280") {}
int32_t BMP280Sensor::runOnce()
{
@@ -25,7 +25,7 @@ int32_t BMP280Sensor::runOnce()
void BMP280Sensor::setup() {}
bool BMP280Sensor::getMetrics(Telemetry *measurement)
bool BMP280Sensor::getMetrics(meshtastic_Telemetry *measurement)
{
LOG_DEBUG("BMP280Sensor::getMetrics\n");
bmp280.takeForcedMeasurement();

View File

@@ -13,5 +13,5 @@ class BMP280Sensor : virtual public TelemetrySensor
public:
BMP280Sensor();
virtual int32_t runOnce() override;
virtual bool getMetrics(Telemetry *measurement) override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
};

View File

@@ -4,7 +4,7 @@
#include "configuration.h"
#include <Adafruit_INA219.h>
INA219Sensor::INA219Sensor() : TelemetrySensor(TelemetrySensorType_INA219, "INA219") {}
INA219Sensor::INA219Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_INA219, "INA219") {}
int32_t INA219Sensor::runOnce()
{
@@ -19,7 +19,7 @@ int32_t INA219Sensor::runOnce()
void INA219Sensor::setup() {}
bool INA219Sensor::getMetrics(Telemetry *measurement)
bool INA219Sensor::getMetrics(meshtastic_Telemetry *measurement)
{
measurement->variant.environment_metrics.voltage = ina219.getBusVoltage_V();
measurement->variant.environment_metrics.current = ina219.getCurrent_mA();

View File

@@ -13,5 +13,5 @@ class INA219Sensor : virtual public TelemetrySensor
public:
INA219Sensor();
virtual int32_t runOnce() override;
virtual bool getMetrics(Telemetry *measurement) override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
};

View File

@@ -4,7 +4,7 @@
#include "configuration.h"
#include <Adafruit_INA260.h>
INA260Sensor::INA260Sensor() : TelemetrySensor(TelemetrySensorType_INA260, "INA260") {}
INA260Sensor::INA260Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_INA260, "INA260") {}
int32_t INA260Sensor::runOnce()
{
@@ -18,7 +18,7 @@ int32_t INA260Sensor::runOnce()
void INA260Sensor::setup() {}
bool INA260Sensor::getMetrics(Telemetry *measurement)
bool INA260Sensor::getMetrics(meshtastic_Telemetry *measurement)
{
// mV conversion to V
measurement->variant.environment_metrics.voltage = ina260.readBusVoltage() / 1000;

View File

@@ -13,5 +13,5 @@ class INA260Sensor : virtual public TelemetrySensor
public:
INA260Sensor();
virtual int32_t runOnce() override;
virtual bool getMetrics(Telemetry *measurement) override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
};

View File

@@ -5,7 +5,7 @@
#include <Adafruit_LPS2X.h>
#include <Adafruit_Sensor.h>
LPS22HBSensor::LPS22HBSensor() : TelemetrySensor(TelemetrySensorType_LPS22, "LPS22HB") {}
LPS22HBSensor::LPS22HBSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_LPS22, "LPS22HB") {}
int32_t LPS22HBSensor::runOnce()
{
@@ -22,7 +22,7 @@ void LPS22HBSensor::setup()
lps22hb.setDataRate(LPS22_RATE_10_HZ);
}
bool LPS22HBSensor::getMetrics(Telemetry *measurement)
bool LPS22HBSensor::getMetrics(meshtastic_Telemetry *measurement)
{
sensors_event_t temp;
sensors_event_t pressure;

View File

@@ -14,5 +14,5 @@ class LPS22HBSensor : virtual public TelemetrySensor
public:
LPS22HBSensor();
virtual int32_t runOnce() override;
virtual bool getMetrics(Telemetry *measurement) override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
};

View File

@@ -4,7 +4,7 @@
#include "configuration.h"
#include <Adafruit_MCP9808.h>
MCP9808Sensor::MCP9808Sensor() : TelemetrySensor(TelemetrySensorType_MCP9808, "MCP9808") {}
MCP9808Sensor::MCP9808Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_MCP9808, "MCP9808") {}
int32_t MCP9808Sensor::runOnce()
{
@@ -21,7 +21,7 @@ void MCP9808Sensor::setup()
mcp9808.setResolution(2);
}
bool MCP9808Sensor::getMetrics(Telemetry *measurement)
bool MCP9808Sensor::getMetrics(meshtastic_Telemetry *measurement)
{
LOG_DEBUG("MCP9808Sensor::getMetrics\n");
measurement->variant.environment_metrics.temperature = mcp9808.readTempC();

View File

@@ -13,5 +13,5 @@ class MCP9808Sensor : virtual public TelemetrySensor
public:
MCP9808Sensor();
virtual int32_t runOnce() override;
virtual bool getMetrics(Telemetry *measurement) override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
};

View File

@@ -4,7 +4,7 @@
#include "configuration.h"
#include <Adafruit_SHT31.h>
SHT31Sensor::SHT31Sensor() : TelemetrySensor(TelemetrySensorType_SHT31, "SHT31") {}
SHT31Sensor::SHT31Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT31, "SHT31") {}
int32_t SHT31Sensor::runOnce()
{
@@ -21,7 +21,7 @@ void SHT31Sensor::setup()
// Set up oversampling and filter initialization
}
bool SHT31Sensor::getMetrics(Telemetry *measurement)
bool SHT31Sensor::getMetrics(meshtastic_Telemetry *measurement)
{
measurement->variant.environment_metrics.temperature = sht31.readTemperature();
measurement->variant.environment_metrics.relative_humidity = sht31.readHumidity();

View File

@@ -13,5 +13,5 @@ class SHT31Sensor : virtual public TelemetrySensor
public:
SHT31Sensor();
virtual int32_t runOnce() override;
virtual bool getMetrics(Telemetry *measurement) override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
};

View File

@@ -4,7 +4,7 @@
#include "configuration.h"
#include <Adafruit_SHTC3.h>
SHTC3Sensor::SHTC3Sensor() : TelemetrySensor(TelemetrySensorType_SHTC3, "SHTC3") {}
SHTC3Sensor::SHTC3Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHTC3, "SHTC3") {}
int32_t SHTC3Sensor::runOnce()
{
@@ -21,7 +21,7 @@ void SHTC3Sensor::setup()
// Set up oversampling and filter initialization
}
bool SHTC3Sensor::getMetrics(Telemetry *measurement)
bool SHTC3Sensor::getMetrics(meshtastic_Telemetry *measurement)
{
sensors_event_t humidity, temp;
shtc3.getEvent(&humidity, &temp);

View File

@@ -13,5 +13,5 @@ class SHTC3Sensor : virtual public TelemetrySensor
public:
SHTC3Sensor();
virtual int32_t runOnce() override;
virtual bool getMetrics(Telemetry *measurement) override;
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
};

View File

@@ -8,7 +8,7 @@
class TelemetrySensor
{
protected:
TelemetrySensor(TelemetrySensorType sensorType, const char *sensorName)
TelemetrySensor(meshtastic_TelemetrySensorType sensorType, const char *sensorName)
{
this->sensorName = sensorName;
this->sensorType = sensorType;
@@ -16,7 +16,7 @@ class TelemetrySensor
}
const char *sensorName;
TelemetrySensorType sensorType;
meshtastic_TelemetrySensorType sensorType;
unsigned status;
int32_t initI2CSensor()
@@ -36,5 +36,5 @@ class TelemetrySensor
bool hasSensor() { return sensorType < sizeof(nodeTelemetrySensorsMap) && nodeTelemetrySensorsMap[sensorType] > 0; }
virtual int32_t runOnce() = 0;
virtual bool getMetrics(Telemetry *measurement) = 0;
virtual bool getMetrics(meshtastic_Telemetry *measurement) = 0;
};