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

Refactoring some of the i2c boilerplate (#1498)

Browse Source 
* Refactoring some of the i2c boilerplate

* Default value

* Debug statement
This commit is contained in:
Ben Meadors
2022-06-10 12:04:04 -05:00
committed by GitHub
parent beb8bc9e72
commit 3fd756900a
13 changed files with 119 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,11 +90,11 @@ int32_t EnvironmentTelemetryModule::runOnce()
DEBUG_MSG("Environment Telemetry: No sensor type specified; Checking for detected i2c sensors\n");
break;
}
if (hasSensor(TelemetrySensorType_BME680))
if (bme680Sensor.hasSensor())
result = bme680Sensor.runOnce();
if (hasSensor(TelemetrySensorType_BME280))
if (bme280Sensor.hasSensor())
result = bme280Sensor.runOnce();
if (hasSensor(TelemetrySensorType_MCP9808))
if (mcp9808Sensor.hasSensor())
result = mcp9808Sensor.runOnce();
}
return result;
@@ -233,25 +233,25 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies
switch (moduleConfig.telemetry.environment_sensor_type) {
case TelemetrySensorType_DS18B20:
if (!dallasSensor.getMeasurement(&m))
if (!dallasSensor.getMetrics(&m))
sensor_read_error_count++;
break;
case TelemetrySensorType_DHT11:
case TelemetrySensorType_DHT12:
case TelemetrySensorType_DHT21:
case TelemetrySensorType_DHT22:
if (!dhtSensor.getMeasurement(&m))
if (!dhtSensor.getMetrics(&m))
sensor_read_error_count++;
break;
default:
DEBUG_MSG("Environment Telemetry: No specified sensor type; Trying any detected i2c sensors\n");
}
if (hasSensor(TelemetrySensorType_BME280))
bme280Sensor.getMeasurement(&m);
if (hasSensor(TelemetrySensorType_BME680))
bme680Sensor.getMeasurement(&m);
if (hasSensor(TelemetrySensorType_MCP9808))
mcp9808Sensor.getMeasurement(&m);
if (bme280Sensor.hasSensor())
bme280Sensor.getMetrics(&m);
if (bme680Sensor.hasSensor())
bme680Sensor.getMetrics(&m);
if (mcp9808Sensor.hasSensor())
mcp9808Sensor.getMetrics(&m);
DEBUG_MSG("Telemetry->time: %i\n", m.time);
DEBUG_MSG("Telemetry->barometric_pressure: %f\n", m.variant.environment_metrics.barometric_pressure);