mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-24 13:57:31 +00:00
Make AQTelemetry sensors non-exclusive
This commit is contained in:
parent
76cffe8332
commit
561daa0cd0
@ -280,7 +280,7 @@ bool AirQualityTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPack
|
|||||||
|
|
||||||
bool AirQualityTelemetryModule::getAirQualityTelemetry(meshtastic_Telemetry *m)
|
bool AirQualityTelemetryModule::getAirQualityTelemetry(meshtastic_Telemetry *m)
|
||||||
{
|
{
|
||||||
bool valid = true;
|
bool valid = false;
|
||||||
bool hasSensor = false;
|
bool hasSensor = false;
|
||||||
m->time = getTime();
|
m->time = getTime();
|
||||||
m->which_variant = meshtastic_Telemetry_air_quality_metrics_tag;
|
m->which_variant = meshtastic_Telemetry_air_quality_metrics_tag;
|
||||||
@ -289,12 +289,12 @@ bool AirQualityTelemetryModule::getAirQualityTelemetry(meshtastic_Telemetry *m)
|
|||||||
// TODO - This is currently problematic, as it assumes only one sensor connected
|
// TODO - This is currently problematic, as it assumes only one sensor connected
|
||||||
// We should implement some logic to avoid not getting data if one sensor disconnects
|
// We should implement some logic to avoid not getting data if one sensor disconnects
|
||||||
if (pmsa003iSensor.hasSensor()) {
|
if (pmsa003iSensor.hasSensor()) {
|
||||||
valid = valid && pmsa003iSensor.getMetrics(m);
|
valid = valid || pmsa003iSensor.getMetrics(m);
|
||||||
hasSensor = true;
|
hasSensor = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sen5xSensor.hasSensor()) {
|
if (sen5xSensor.hasSensor()) {
|
||||||
valid = valid && sen5xSensor.getMetrics(m);
|
valid = valid || sen5xSensor.getMetrics(m);
|
||||||
hasSensor = true;
|
hasSensor = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user