rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-30 06:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/Telemetry/DeviceTelemetry.cpp
View File

@@ -26,9 +26,9 @@ int32_t DeviceTelemetryModule::runOnce()
return sendToPhoneIntervalMs;
}
bool DeviceTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Telemetry *t)
bool DeviceTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
{
if (t->which_variant == Telemetry_device_metrics_tag) {
if (t->which_variant == meshtastic_Telemetry_device_metrics_tag) {
const char *sender = getSenderShortName(mp);
LOG_INFO("(Received from %s): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n", sender,
@@ -44,10 +44,10 @@ bool DeviceTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Telemet
bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
{
Telemetry t;
meshtastic_Telemetry t;
t.time = getTime();
t.which_variant = Telemetry_device_metrics_tag;
t.which_variant = meshtastic_Telemetry_device_metrics_tag;
t.variant.device_metrics.air_util_tx = myNodeInfo.air_util_tx;
t.variant.device_metrics.battery_level = powerStatus->getBatteryChargePercent();
@@ -58,10 +58,10 @@ bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
t.variant.device_metrics.air_util_tx, t.variant.device_metrics.channel_utilization,
t.variant.device_metrics.battery_level, t.variant.device_metrics.voltage);
MeshPacket *p = allocDataProtobuf(t);
meshtastic_MeshPacket *p = allocDataProtobuf(t);
p->to = dest;
p->decoded.want_response = false;
p->priority = MeshPacket_Priority_MIN;
p->priority = meshtastic_MeshPacket_Priority_MIN;
lastMeasurementPacket = packetPool.allocCopy(*p);
nodeDB.updateTelemetry(nodeDB.getNodeNum(), t, RX_SRC_LOCAL);

8
src/modules/Telemetry/DeviceTelemetry.h
View File

@@ -5,11 +5,11 @@
#include <OLEDDisplay.h>
#include <OLEDDisplayUi.h>
class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModule<Telemetry>
class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModule<meshtastic_Telemetry>
{
public:
DeviceTelemetryModule()
: concurrency::OSThread("DeviceTelemetryModule"), ProtobufModule("DeviceTelemetry", PortNum_TELEMETRY_APP, &Telemetry_msg)
: concurrency::OSThread("DeviceTelemetryModule"), ProtobufModule("DeviceTelemetry", meshtastic_PortNum_TELEMETRY_APP, &meshtastic_Telemetry_msg)
{
lastMeasurementPacket = nullptr;
setIntervalFromNow(10 * 1000);
@@ -20,7 +20,7 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
/** Called to handle a particular incoming message
@return true if you've guaranteed you've handled this message and no other handlers should be considered for it
*/
virtual bool handleReceivedProtobuf(const MeshPacket &mp, Telemetry *p) override;
virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *p) override;
virtual int32_t runOnce() override;
/**
* Send our Telemetry into the mesh
@@ -30,5 +30,5 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
private:
uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
uint32_t lastSentToMesh = 0;
const MeshPacket *lastMeasurementPacket;
const meshtastic_MeshPacket *lastMeasurementPacket;
};

18
src/modules/Telemetry/EnvironmentTelemetry.cpp
View File

@@ -118,7 +118,7 @@ int32_t EnvironmentTelemetryModule::runOnce()
#endif
}
uint32_t GetTimeSinceMeshPacket(const MeshPacket *mp)
uint32_t GetTimeSinceMeshPacket(const meshtastic_MeshPacket *mp)
{
uint32_t now = getTime();
@@ -151,13 +151,13 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
return;
}
Telemetry lastMeasurement;
meshtastic_Telemetry lastMeasurement;
uint32_t agoSecs = GetTimeSinceMeshPacket(lastMeasurementPacket);
const char *lastSender = getSenderShortName(*lastMeasurementPacket);
auto &p = lastMeasurementPacket->decoded;
if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, &Telemetry_msg, &lastMeasurement)) {
if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, &meshtastic_Telemetry_msg, &lastMeasurement)) {
display->setFont(FONT_SMALL);
display->drawString(x, y += fontHeight(FONT_MEDIUM), "Measurement Error");
LOG_ERROR("Unable to decode last packet");
@@ -182,9 +182,9 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
String(lastMeasurement.variant.environment_metrics.current, 0) + "mA");
}
bool EnvironmentTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Telemetry *t)
bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
{
if (t->which_variant == Telemetry_environment_metrics_tag) {
if (t->which_variant == meshtastic_Telemetry_environment_metrics_tag) {
const char *sender = getSenderShortName(mp);
LOG_INFO("(Received from %s): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, "
@@ -201,9 +201,9 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Te
bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
{
Telemetry m;
meshtastic_Telemetry m;
m.time = getTime();
m.which_variant = Telemetry_environment_metrics_tag;
m.which_variant = meshtastic_Telemetry_environment_metrics_tag;
m.variant.environment_metrics.barometric_pressure = 0;
m.variant.environment_metrics.current = 0;
@@ -239,10 +239,10 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
sensor_read_error_count = 0;
MeshPacket *p = allocDataProtobuf(m);
meshtastic_MeshPacket *p = allocDataProtobuf(m);
p->to = dest;
p->decoded.want_response = false;
p->priority = MeshPacket_Priority_MIN;
p->priority = meshtastic_MeshPacket_Priority_MIN;
lastMeasurementPacket = packetPool.allocCopy(*p);
if (phoneOnly) {

8
src/modules/Telemetry/EnvironmentTelemetry.h
View File

@@ -5,12 +5,12 @@
#include <OLEDDisplay.h>
#include <OLEDDisplayUi.h>
class EnvironmentTelemetryModule : private concurrency::OSThread, public ProtobufModule<Telemetry>
class EnvironmentTelemetryModule : private concurrency::OSThread, public ProtobufModule<meshtastic_Telemetry>
{
public:
EnvironmentTelemetryModule()
: concurrency::OSThread("EnvironmentTelemetryModule"),
ProtobufModule("EnvironmentTelemetry", PortNum_TELEMETRY_APP, &Telemetry_msg)
ProtobufModule("EnvironmentTelemetry", meshtastic_PortNum_TELEMETRY_APP, &meshtastic_Telemetry_msg)
{
lastMeasurementPacket = nullptr;
setIntervalFromNow(10 * 1000);
@@ -26,7 +26,7 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
/** Called to handle a particular incoming message
@return true if you've guaranteed you've handled this message and no other handlers should be considered for it
*/
virtual bool handleReceivedProtobuf(const MeshPacket &mp, Telemetry *p) override;
virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *p) override;
virtual int32_t runOnce() override;
/**
* Send our Telemetry into the mesh
@@ -36,7 +36,7 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
private:
float CelsiusToFahrenheit(float c);
bool firstTime = 1;
const MeshPacket *lastMeasurementPacket;
const meshtastic_MeshPacket *lastMeasurementPacket;
uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
uint32_t lastSentToMesh = 0;
uint32_t sensor_read_error_count = 0;

4
src/modules/Telemetry/Sensor/BME280Sensor.cpp
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();

2
src/modules/Telemetry/Sensor/BME280Sensor.h
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;
};

4
src/modules/Telemetry/Sensor/BME680Sensor.cpp
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;

2
src/modules/Telemetry/Sensor/BME680Sensor.h
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;
};

4
src/modules/Telemetry/Sensor/BMP280Sensor.cpp
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();

2
src/modules/Telemetry/Sensor/BMP280Sensor.h
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;
};

4
src/modules/Telemetry/Sensor/INA219Sensor.cpp
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();

2
src/modules/Telemetry/Sensor/INA219Sensor.h
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;
};

4
src/modules/Telemetry/Sensor/INA260Sensor.cpp
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;

2
src/modules/Telemetry/Sensor/INA260Sensor.h
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;
};

4
src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
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;

2
src/modules/Telemetry/Sensor/LPS22HBSensor.h
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;
};

4
src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
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();

2
src/modules/Telemetry/Sensor/MCP9808Sensor.h
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;
};

4
src/modules/Telemetry/Sensor/SHT31Sensor.cpp
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();

2
src/modules/Telemetry/Sensor/SHT31Sensor.h
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;
};

4
src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
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);

2
src/modules/Telemetry/Sensor/SHTC3Sensor.h
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;
};

6
src/modules/Telemetry/Sensor/TelemetrySensor.h
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;
};