From 29f8011bce30c91e6fed416c5354b7dec01bfbaf Mon Sep 17 00:00:00 2001 From: Tavis Date: Tue, 9 Jul 2024 21:50:10 -1000 Subject: [PATCH 1/2] add ws85 serialmodule mode, add gust,lull to env teleme --- meshtastic/module_config.proto | 2 ++ meshtastic/telemetry.proto | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto index 82fba65..3879373 100644 --- a/meshtastic/module_config.proto +++ b/meshtastic/module_config.proto @@ -304,6 +304,8 @@ message ModuleConfig { NMEA = 4; // NMEA messages specifically tailored for CalTopo CALTOPO = 5; + // Ecowitt WS85 weather station + WS85 = 6; } /* diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto index f23d8fb..5610e37 100644 --- a/meshtastic/telemetry.proto +++ b/meshtastic/telemetry.proto @@ -118,6 +118,16 @@ message EnvironmentMetrics { * Weight in KG */ float weight = 15; + + /* + * Wind gust in m/s + */ + float wind_gust = 15; + + /* + * Wind lull in m/s + */ + float wind_lull = 16; } /* From 7370460a591f80e3ca462df1f36ceeac452c4dc5 Mon Sep 17 00:00:00 2001 From: Tavis Date: Wed, 10 Jul 2024 09:09:32 -1000 Subject: [PATCH 2/2] fix tag index. whoops, duh. --- meshtastic/telemetry.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto index 5610e37..8ffbeb2 100644 --- a/meshtastic/telemetry.proto +++ b/meshtastic/telemetry.proto @@ -122,12 +122,12 @@ message EnvironmentMetrics { /* * Wind gust in m/s */ - float wind_gust = 15; + float wind_gust = 16; /* * Wind lull in m/s */ - float wind_lull = 16; + float wind_lull = 17; } /*