ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-13 23:21:19 +10:00
Code Releases Activity

Add SEN6x sensors (#11390)

Browse Source 
* Add SEN6X

* Adds new SENXX class for SEN5X and SEN6X
* Adds CO2 sensor calibration class to be shared among othre CO2 sensors

* Make existing CO2 sensor draw from CO2Sensor class

* Minor coment for CO2 sensor class

* Move away from getRTC in SENXX class to keep track of time changes.

* Change all sensors to millis for tracking time, instead of using getRTC

* Add comments regarding VOC state

* Avoid storing non-valid RTC

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Avoid CO2 sensor warm-up time to be below PM measured started

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Fix limits in CO2 sensor calibration

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Add pragma once on headers

* Avoid non-working ASC commands

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Fix data poll

* Move pm measure started before warmup check

* Make cleaning non-blocking

* Restore previous state if cleaning fails. Fix data ready condition.

* Fix CO2 sensor checks for calibration

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
oscgonfer
2026-08-13 13:13:50 -04:00
committed by GitHub
co-authored by coderabbitai[bot]
parent 3b608b8fc5
commit 944fd26580
21 changed files with 2216 additions and 1313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/Telemetry/Sensor/SCD30Sensor.cpp
+18 -21
View File
@@ -424,37 +424,34 @@ AdminMessageHandleResult SCD30Sensor::handleAdminMessage(const meshtastic_MeshPa
LOG_DEBUG("%s: Requested soft reset", sensorName);
this->softReset();
} else {
const auto &cfg = request->sensor_config.scd30_config;
if (request->sensor_config.scd30_config.has_set_asc) {
this->setASC(request->sensor_config.scd30_config.set_asc);
if (request->sensor_config.scd30_config.set_asc == false) {
LOG_DEBUG("%s: Request for FRC", sensorName);
if (request->sensor_config.scd30_config.has_set_target_co2_conc) {
this->performFRC(request->sensor_config.scd30_config.set_target_co2_conc);
} else {
// FRC requested but no target CO2 provided
LOG_ERROR("%s: target CO2 not provided", sensorName);
result = AdminMessageHandleResult::NOT_HANDLED;
break;
}
// ASC/FRC/altitude calibration branching is shared with SCD4XSensor and the
// CO2-capable SEN6X variants via CO2CalibrationSensor.
if (cfg.has_set_asc || cfg.has_set_altitude) {
Co2AdminRequest co2req;
co2req.hasSetAsc = cfg.has_set_asc;
co2req.setAsc = cfg.set_asc;
co2req.hasTargetCo2 = cfg.has_set_target_co2_conc;
co2req.targetCo2 = cfg.set_target_co2_conc;
co2req.hasSetAltitude = cfg.has_set_altitude;
co2req.setAltitude = cfg.set_altitude;
if (!this->handleCo2AdminRequest(co2req, sensorName)) {
result = AdminMessageHandleResult::NOT_HANDLED;
break;
}
}
// Check for temperature offset
// NOTE: this requires to have a sensor working on stable environment
// And to make it between readings
if (request->sensor_config.scd30_config.has_set_temperature) {
this->setTemperature(request->sensor_config.scd30_config.set_temperature);
}
// Check for altitude
if (request->sensor_config.scd30_config.has_set_altitude) {
this->setAltitude(request->sensor_config.scd30_config.set_altitude);
if (cfg.has_set_temperature) {
this->setTemperature(cfg.set_temperature);
}
// Check for set measuremen interval
if (request->sensor_config.scd30_config.has_set_measurement_interval) {
this->setMeasurementInterval(request->sensor_config.scd30_config.set_measurement_interval);
if (cfg.has_set_measurement_interval) {
this->setMeasurementInterval(cfg.set_measurement_interval);
}
}