From 583784692c02b996bd89be3d7e9c3d305a67ba0a Mon Sep 17 00:00:00 2001 From: Riley Nielsen Date: Mon, 2 Sep 2024 11:19:52 -0700 Subject: [PATCH 1/5] Add CO2, SCD4X --- meshtastic/telemetry.proto | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto index d4e80a8..72bb418 100644 --- a/meshtastic/telemetry.proto +++ b/meshtastic/telemetry.proto @@ -128,6 +128,11 @@ message EnvironmentMetrics { * Wind lull in m/s */ optional float wind_lull = 17; + + /* + * CO2 measurement in ppm + */ + optional uint32 co2 = 18; } /* @@ -463,6 +468,11 @@ enum TelemetrySensorType { * Custom I2C sensor implementation based on https://github.com/meshtastic/i2c-sensor */ CUSTOM_SENSOR = 29; + + /* + * SCD40/SCD41 CO2, humidity, temperature sensor + */ + SCD4X = 30; } /* From 27072c08380e0555d44e979aded47acef49e92eb Mon Sep 17 00:00:00 2001 From: Riley Nielsen Date: Mon, 7 Oct 2024 17:43:15 -0700 Subject: [PATCH 2/5] Update telemetry.proto --- meshtastic/telemetry.proto | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto index c3b896b..5dd810b 100644 --- a/meshtastic/telemetry.proto +++ b/meshtastic/telemetry.proto @@ -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; } /* From 70a52e77d325247ff6b4dfd8a0fed1050708c927 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 10 Oct 2024 06:14:55 -0500 Subject: [PATCH 3/5] Update device_ui.options --- meshtastic/device_ui.options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/device_ui.options b/meshtastic/device_ui.options index 0982a74..64ca59c 100644 --- a/meshtastic/device_ui.options +++ b/meshtastic/device_ui.options @@ -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 From 99280a1a1e03823b4366eebfd9ef3f5750da6870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Fri, 11 Oct 2024 11:55:56 +0200 Subject: [PATCH 4/5] Update config.proto --- meshtastic/config.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meshtastic/config.proto b/meshtastic/config.proto index 54f1be7..63df3a1 100644 --- a/meshtastic/config.proto +++ b/meshtastic/config.proto @@ -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; } /* From 3990520748751d5d5ed44b6e53aabbd943e0f83d Mon Sep 17 00:00:00 2001 From: Andre K Date: Sat, 12 Oct 2024 06:27:59 -0300 Subject: [PATCH 5/5] fix device_ui Java outer classname --- meshtastic/device_ui.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto index 82474b6..a90e08d 100644 --- a/meshtastic/device_ui.proto +++ b/meshtastic/device_ui.proto @@ -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 = ""; @@ -164,4 +164,4 @@ enum Language { * Spanish */ SPANISH = 5; -} \ No newline at end of file +}