Merge branch 'master' into device-ui-languages

This commit is contained in:
Manuel 2024-10-13 11:45:56 +02:00 committed by GitHub
commit f5d95f385b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 20 additions and 4 deletions

View file

@ -126,6 +126,11 @@ message Config {
* but takes it step further by also ignoring messages from nodenums not in the node's known list (NodeDB)
*/
KNOWN_ONLY = 3;
/*
* Only permitted for SENSOR, TRACKER and TAK_TRACKER roles, this will inhibit all rebroadcasts, not unlike CLIENT_MUTE role.
*/
NONE = 4;
}
/*

View file

@ -1,5 +1,5 @@
*DeviceUIConfig.screen_brightness int_size:8
*DeviceUIConfig.screen_timeout int_size:16
*NodeFilter.node_name max_size:16
*NodeFilter.hopys_away int_size:8
*NodeFilter.hops_away int_size:8
*NodeHighlight.node_name max_size:16

View file

@ -4,7 +4,7 @@ package meshtastic;
option csharp_namespace = "Meshtastic.Protobufs";
option go_package = "github.com/meshtastic/go/generated";
option java_outer_classname = "LocalOnlyProtos";
option java_outer_classname = "DeviceUIProtos";
option java_package = "com.geeksville.mesh";
option swift_prefix = "";
@ -184,4 +184,5 @@ enum Language {
* Turkish
*/
TURKISH = 9;
}
}

View file

@ -228,6 +228,11 @@ message AirQualityMetrics {
* 10.0um Particle Count
*/
optional uint32 particles_100um = 12;
/*
* 10.0um Particle Count
*/
optional uint32 co2 = 13;
}
/*
@ -512,9 +517,14 @@ enum TelemetrySensorType {
MAX30102 = 30;
/*
* MLX90614 non-contact IR temperature sensor.
* MLX90614 non-contact IR temperature sensor
*/
MLX90614 = 31;
/*
* SCD40/SCD41 CO2, humidity, temperature sensor
*/
SCD4X = 32;
}
/*