Merge pull request #3 from meshtastic/master

[pull] master from meshtastic:master
This commit is contained in:
oscgonfer 2026-03-18 17:03:58 +01:00 committed by GitHub
commit 889aaccde3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 33 additions and 4 deletions

View file

@ -666,6 +666,11 @@ message SensorConfig {
* SCD30 CO2 Sensor configuration
*/
SCD30_config scd30_config = 3;
/*
* SHTXX temperature and relative humidity sensor configuration
*/
SHTXX_config shtxx_config = 4;
}
message SCD4X_config {
@ -748,3 +753,10 @@ message SCD30_config {
*/
optional bool soft_reset = 6;
}
message SHTXX_config {
/*
* Accuracy mode (0 = low, 1 = medium, 2 = high)
*/
optional uint32 set_accuracy = 1;
}

View file

@ -865,6 +865,11 @@ enum HardwareModel {
*/
MINI_EPAPER_S3 = 125;
/*
* LilyGo T-Display S3 Pro LR1121
*/
TDISPLAY_S3_PRO = 126;
/*
* ------------------------------------------------------------------------------------------------------------------------------------------
* Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.

View file

@ -246,6 +246,13 @@ enum PortNum {
*/
CAYENNE_APP = 77;
/*
* GroupAlarm integration
* Used for transporting GroupAlarm-related messages between Meshtastic nodes
* and companion applications/services.
*/
GROUPALARM_APP = 112;
/*
* Private applications should use portnums >= 256.
* To simplify initial development and testing you can use "PRIVATE_APP"

View file

@ -653,7 +653,7 @@ enum TelemetrySensorType {
BMP280 = 6;
/*
* High accuracy temperature and humidity
* TODO - REMOVE High accuracy temperature and humidity
*/
SHTC3 = 7;
@ -678,7 +678,7 @@ enum TelemetrySensorType {
QMC5883L = 11;
/*
* High accuracy temperature and humidity
* TODO - REMOVE High accuracy temperature and humidity
*/
SHT31 = 12;
@ -703,7 +703,7 @@ enum TelemetrySensorType {
RCWL9620 = 16;
/*
* Sensirion High accuracy temperature and humidity
* TODO - REMOVE Sensirion High accuracy temperature and humidity
*/
SHT4X = 17;
@ -853,7 +853,7 @@ enum TelemetrySensorType {
HDC1080 = 46;
/*
* STH21 Temperature and R. Humidity sensor
* TODO - REMOVE STH21 Temperature and R. Humidity sensor
*/
SHT21 = 47;
@ -866,6 +866,11 @@ enum TelemetrySensorType {
* SCD30 CO2, humidity, temperature sensor
*/
SCD30 = 49;
/*
* SHT family of sensors for temperature and humidity
*/
SHTXX = 50;
}
/*