rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-20 09:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reworked metrics structure and split telemetry into device or environ… (#1331)

Browse Source 
* Reworked metrics structure and split telemetry into device or environment

* Comment cleanup
This commit is contained in:
Ben Meadors
2022-03-27 14:55:35 +00:00
committed by GitHub
parent 7b8096f5b2
commit ba2fa84ebd
23 changed files with 584 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mqtt/MQTT.cpp
View File

@@ -290,15 +290,17 @@ String MQTT::downstreamPacketToJson(MeshPacket *mp)
memset(&scratch, 0, sizeof(scratch));
if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &Telemetry_msg,
&scratch)) {
decoded = &scratch;
msgPayload = Json::object{
{"temperature", decoded->temperature},
{"relative_humidity", decoded->relative_humidity},
{"barometric_pressure", decoded->barometric_pressure},
{"gas_resistance", decoded->gas_resistance},
{"voltage", decoded->voltage},
{"current", decoded->current},
};
if (decoded->which_variant == Telemetry_environment_metrics_tag) {
decoded = &scratch;
msgPayload = Json::object{
{"temperature", decoded->variant.environment_metrics.temperature},
{"relative_humidity", decoded->variant.environment_metrics.relative_humidity},
{"barometric_pressure", decoded->variant.environment_metrics.barometric_pressure},
{"gas_resistance", decoded->variant.environment_metrics.gas_resistance},
{"voltage", decoded->variant.environment_metrics.voltage},
{"current", decoded->variant.environment_metrics.current},
};
}
} else
DEBUG_MSG("Error decoding protobuf for telemetry message!\n");
};