Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added illuminance sensors to the node's environmental sensor page #5832

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Added illuminance sensors to the node's environmental sensor page #5832

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4917b4d
illuminance sensors added
isseysandei Jan 12, 2025
2706c47
added white_lux to debug
isseysandei Jan 12, 2025
9487690
Merge branch 'master' into illuminance-sensor-2
isseysandei Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/modules/Telemetry/EnvironmentTelemetry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,16 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
display->drawString(x, y += _fontHeight(FONT_SMALL), "IAQ: " + String(lastMeasurement.variant.environment_metrics.iaq));
}

if (lastMeasurement.variant.environment_metrics.lux != 0) {
display->drawString(x, y += _fontHeight(FONT_SMALL),
"Illuminance: " + String(lastMeasurement.variant.environment_metrics.lux, 2) + "lx");
}

if (lastMeasurement.variant.environment_metrics.white_lux != 0) {
display->drawString(x, y += _fontHeight(FONT_SMALL),
"W_Lux: " + String(lastMeasurement.variant.environment_metrics.white_lux, 2) + "lx");
}

if (lastMeasurement.variant.environment_metrics.distance != 0)
display->drawString(x, y += _fontHeight(FONT_SMALL),
"Water Level: " + String(lastMeasurement.variant.environment_metrics.distance, 0) + "mm");
Expand All @@ -277,8 +287,10 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPac
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.temperature);
LOG_INFO("(Received from %s): voltage=%f, IAQ=%d, distance=%f, lux=%f", sender, t->variant.environment_metrics.voltage,
t->variant.environment_metrics.iaq, t->variant.environment_metrics.distance, t->variant.environment_metrics.lux);
LOG_INFO("(Received from %s): voltage=%f, IAQ=%d, distance=%f, lux=%f, white_lux=%f", sender,
t->variant.environment_metrics.voltage, t->variant.environment_metrics.iaq,
t->variant.environment_metrics.distance, t->variant.environment_metrics.lux,
t->variant.environment_metrics.white_lux);

LOG_INFO("(Received from %s): wind speed=%fm/s, direction=%d degrees, weight=%fkg", sender,
t->variant.environment_metrics.wind_speed, t->variant.environment_metrics.wind_direction,
Expand Down
Loading