mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-13 15:11:20 +10:00
Merge remote-tracking branch 'origin/develop' into pr10715-fix
# Conflicts: # src/graphics/Screen.cpp # src/modules/Telemetry/Sensor/PMSA003ISensor.h # src/modules/Telemetry/Sensor/SCD30Sensor.h # src/modules/Telemetry/Sensor/SCD4XSensor.h # src/modules/Telemetry/Sensor/SEN5XSensor.cpp # src/modules/Telemetry/Sensor/SEN5XSensor.h # src/modules/Telemetry/Sensor/SFA30Sensor.h
This commit is contained in:
@@ -338,7 +338,7 @@ bool SEN5XSensor::vocStateToSensor()
|
||||
// Note: send command already takes into account the CRC
|
||||
// buffer size increment needed
|
||||
if (!sendCommand(SEN5X_RW_VOCS_STATE, vocState, SEN5X_VOC_STATE_BUFFER_SIZE)) {
|
||||
LOG_ERROR("%s: Error sending VOC's state command'", sensorName);
|
||||
LOG_ERROR("%s: Error sending VOC's state command", sensorName);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -354,7 +354,7 @@ bool SEN5XSensor::vocStateFromSensor()
|
||||
LOG_INFO("%s: Getting VOC state from sensor", sensorName);
|
||||
// Ask VOCs state from the sensor
|
||||
if (!sendCommand(SEN5X_RW_VOCS_STATE)) {
|
||||
LOG_ERROR("%s: Error sending VOC's state command'", sensorName);
|
||||
LOG_ERROR("%s: Error sending VOC's state command", sensorName);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user