pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-26 09:59:01 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Change name

Browse Source
This commit is contained in:
Thomas Göttgens 2024-04-20 20:49:57 +02:00
parent c480f0870c
commit 5218aaafcf
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,9 +187,9 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
String(lastMeasurement.variant.environment_metrics.current, 0) + "mA"); String(lastMeasurement.variant.environment_metrics.current, 0) + "mA");
if (lastMeasurement.variant.environment_metrics.iaq != 0) if (lastMeasurement.variant.environment_metrics.iaq != 0)
display->drawString(x, y += fontHeight(FONT_SMALL), "IAQ: " + String(lastMeasurement.variant.environment_metrics.iaq)); display->drawString(x, y += fontHeight(FONT_SMALL), "IAQ: " + String(lastMeasurement.variant.environment_metrics.iaq));
if (lastMeasurement.variant.environment_metrics.water_level != 0) if (lastMeasurement.variant.environment_metrics.distance != 0)
display->drawString(x, y += fontHeight(FONT_SMALL), display->drawString(x, y += fontHeight(FONT_SMALL),
"Water Level: " + String(lastMeasurement.variant.environment_metrics.water_level, 0) + "mm"); "Water Level: " + String(lastMeasurement.variant.environment_metrics.distance, 0) + "mm");
} }
bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t) bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
@ -203,8 +203,8 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPac
sender, t->variant.environment_metrics.barometric_pressure, t->variant.environment_metrics.current, sender, t->variant.environment_metrics.barometric_pressure, t->variant.environment_metrics.current,
t->variant.environment_metrics.gas_resistance, t->variant.environment_metrics.relative_humidity, t->variant.environment_metrics.gas_resistance, t->variant.environment_metrics.relative_humidity,
t->variant.environment_metrics.temperature); t->variant.environment_metrics.temperature);
LOG_INFO("(Received from %s): voltage=%f, IAQ=%d, water_level=%f\n", sender, t->variant.environment_metrics.voltage, LOG_INFO("(Received from %s): voltage=%f, IAQ=%d, distance=%f\n", sender, t->variant.environment_metrics.voltage,
t->variant.environment_metrics.iaq, t->variant.environment_metrics.water_level); t->variant.environment_metrics.iaq, t->variant.environment_metrics.distance);
#endif #endif
// release previous packet before occupying a new spot // release previous packet before occupying a new spot
@ -231,7 +231,7 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
m.variant.environment_metrics.temperature = 0; m.variant.environment_metrics.temperature = 0;
m.variant.environment_metrics.voltage = 0; m.variant.environment_metrics.voltage = 0;
m.variant.environment_metrics.iaq = 0; m.variant.environment_metrics.iaq = 0;
m.variant.environment_metrics.water_level = 0; m.variant.environment_metrics.distance = 0;
if (sht31Sensor.hasSensor()) if (sht31Sensor.hasSensor())
valid = sht31Sensor.getMetrics(&m); valid = sht31Sensor.getMetrics(&m);
@ -261,8 +261,8 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
m.variant.environment_metrics.barometric_pressure, m.variant.environment_metrics.current, m.variant.environment_metrics.barometric_pressure, m.variant.environment_metrics.current,
m.variant.environment_metrics.gas_resistance, m.variant.environment_metrics.relative_humidity, m.variant.environment_metrics.gas_resistance, m.variant.environment_metrics.relative_humidity,
m.variant.environment_metrics.temperature); m.variant.environment_metrics.temperature);
LOG_INFO("(Sending): voltage=%f, IAQ=%d, water_level=%f\n", m.variant.environment_metrics.voltage, LOG_INFO("(Sending): voltage=%f, IAQ=%d, distance=%f\n", m.variant.environment_metrics.voltage,
m.variant.environment_metrics.iaq, m.variant.environment_metrics.water_level); m.variant.environment_metrics.iaq, m.variant.environment_metrics.distance);
sensor_read_error_count = 0; sensor_read_error_count = 0;

2
src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp
View File

@ -21,6 +21,6 @@ void RCWL9620Sensor::setup() {}
bool RCWL9620Sensor::getMetrics(meshtastic_Telemetry *measurement) bool RCWL9620Sensor::getMetrics(meshtastic_Telemetry *measurement)
{ {
LOG_DEBUG("RCWL9620Sensor::getMetrics\n"); LOG_DEBUG("RCWL9620Sensor::getMetrics\n");
measurement->variant.environment_metrics.water_level = rcwl9620.getDistance(); measurement->variant.environment_metrics.distance = rcwl9620.getDistance();
return true; return true;
} }