Merge c01e1dddfe into e6b4c590e7

.github/workflows/ci.yml

@@ -17,11 +17,11 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Buf
-        uses: bufbuild/buf-setup-action@v1.26.1
+        uses: bufbuild/buf-setup-action@v1.30.0
         with:
           github_token: ${{ github.token }}
 
       - name: Push to schema registry
-        uses: bufbuild/buf-push-action@v1.1.1
+        uses: bufbuild/buf-push-action@v1.2.0
         with:
           buf_token: ${{ secrets.BUF_TOKEN }}

.github/workflows/create_tag.yml

@@ -50,7 +50,7 @@ jobs:
           echo "NEW_VERSION=v$MAJOR.$MINOR.$PATCH" >> $GITHUB_OUTPUT
 
       - name: Create release
-        uses: ncipollo/release-action@v1.13.0
+        uses: ncipollo/release-action@v1
         with:
           name: Meshtastic Protobufs ${{ steps.version.outputs.NEW_VERSION }}
           tag: ${{ steps.version.outputs.NEW_VERSION }}
@@ -58,7 +58,7 @@ jobs:
           token: ${{ github.token }}
 
       - name: Setup Buf
-        uses: bufbuild/buf-setup-action@v1.26.1
+        uses: bufbuild/buf-setup-action@v1.30.0
         with:
           github_token: ${{ github.token }}
 

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Buf
-        uses: bufbuild/buf-setup-action@v1.26.1
+        uses: bufbuild/buf-setup-action@v1.30.0
         with:
           github_token: ${{ github.token }}
 

.github/workflows/pull_request.yml

@@ -13,15 +13,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Buf
-        uses: bufbuild/buf-setup-action@v1.26.1
+        uses: bufbuild/buf-setup-action@v1.30.0
         with:
           github_token: ${{ github.token }}
 
       - name: Lint
-        uses: bufbuild/buf-lint-action@v1.0.3
+        uses: bufbuild/buf-lint-action@v1.1.1
 
       - name: Push to schema registry
-        uses: bufbuild/buf-push-action@v1.1.1
+        uses: bufbuild/buf-push-action@v1.2.0
         with:
           buf_token: ${{ secrets.BUF_TOKEN }}
           draft: ${{ github.ref_name != 'master'}}

.trunk/.gitignore

@@ -1,8 +0,0 @@
-*out
-*logs
-*actions
-*notifications
-*tools
-plugins
-user_trunk.yaml
-user.yaml

.trunk/configs/.markdownlint.yaml

@@ -1,10 +0,0 @@
-# Autoformatter friendly markdownlint config (all formatting rules disabled)
-default: true
-blank_lines: false
-bullet: false
-html: false
-indentation: false
-line_length: false
-spaces: false
-url: false
-whitespace: false

.trunk/configs/.yamllint.yaml

@@ -1,10 +0,0 @@
-rules:
-  quoted-strings:
-    required: only-when-needed
-    extra-allowed: ["{|}"]
-  empty-values:
-    forbid-in-block-mappings: true
-    forbid-in-flow-mappings: true
-  key-duplicates: {}
-  octal-values:
-    forbid-implicit-octal: true

.trunk/trunk.yaml

@@ -1,33 +0,0 @@
-version: 0.1
-cli:
-  version: 1.16.2
-plugins:
-  sources:
-    - id: trunk
-      ref: v1.2.5
-      uri: https://github.com/trunk-io/plugins
-lint:
-  enabled:
-    - checkov@2.4.9
-    - trivy@0.45.1
-    - trufflehog@3.57.0
-    - yamllint@1.32.0
-    - buf-lint@1.26.1
-    - buf-breaking@1.26.1
-    - actionlint@1.6.26
-    - markdownlint@0.37.0
-    - prettier@3.0.3
-    - gitleaks@8.18.0
-    - git-diff-check
-runtimes:
-  enabled:
-    - python@3.10.8
-    - go@1.21.0
-    - node@18.12.1
-actions:
-  disabled:
-    - trunk-announce
-    - trunk-check-pre-push
-    - trunk-fmt-pre-commit
-  enabled:
-    - trunk-upgrade-available

.vscode/extensions.json

@@ -1,3 +1,3 @@
 {
-  "recommendations": ["trunk.io", "pbkit.vscode-pbkit", "bufbuild.vscode-buf"]
+  "recommendations": ["pbkit.vscode-pbkit", "bufbuild.vscode-buf"]
 }

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
   "editor.formatOnSave": true,
-  "editor.defaultFormatter": "trunk.io"
+  "editor.defaultFormatter": "pbkit.vscode-pbkit"
 }

meshtastic/atak.proto

@@ -7,11 +7,11 @@ option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "ATAKProtos";
 option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
+
 /*
  * Packets for the official ATAK Plugin
  */
-message TAKPacket
-{
+message TAKPacket {
   /*
    * Are the payloads strings compressed for LoRA transport?
    */
@@ -189,6 +189,7 @@ message Status {
    */
   uint32 battery = 1;
 }
+
 /*
  * ATAK Contact
  * <contact endpoint='0.0.0.0:4242:tcp' phone='+12345678' callsign='FALKE'/>

meshtastic/channel.proto

@@ -92,7 +92,7 @@ message ChannelSettings {
  * This message is specifically for modules to store per-channel configuration data.
  */
 message ModuleSettings {
-/*
+  /*
    * Bits of precision for the location sent in position packets.
    */
   uint32 position_precision = 1;

meshtastic/config.proto

@@ -293,7 +293,7 @@ message Config {
     /*
      * Is GPS enabled for this node?
      */
-    bool gps_enabled = 4[deprecated = true];
+    bool gps_enabled = 4 [deprecated = true];
 
     /*
      * How often should we try to get GPS position (in seconds)

meshtastic/deviceonly.proto

@@ -5,8 +5,8 @@ package meshtastic;
 import "meshtastic/channel.proto";
 import "meshtastic/localonly.proto";
 import "meshtastic/mesh.proto";
-import "meshtastic/telemetry.proto";
 import "meshtastic/module_config.proto";
+import "meshtastic/telemetry.proto";
 import "nanopb.proto";
 
 option csharp_namespace = "Meshtastic.Protobufs";
@@ -80,7 +80,7 @@ message DeviceState {
   /*
    * New lite version of NodeDB to decrease memory footprint
    */
-  repeated NodeInfoLite node_db_lite = 14 [(nanopb).callback_datatype="std::vector<meshtastic_NodeInfoLite>"];
+  repeated NodeInfoLite node_db_lite = 14 [(nanopb).callback_datatype = "std::vector<meshtastic_NodeInfoLite>"];
 }
 
 message NodeInfoLite {

meshtastic/mesh.proto

@@ -784,7 +784,7 @@ message Waypoint {
 /*
  * This message will be proxied over the PhoneAPI for the client to deliver to the MQTT server
  */
- message MqttClientProxyMessage {
+message MqttClientProxyMessage {
   /*
    * The MQTT topic this message will be sent /received on
    */
@@ -1578,9 +1578,7 @@ message DeviceMetadata {
  * A heartbeat message is sent to the node from the client to keep the connection alive.
  * This is currently only needed to keep serial connections alive, but can be used by any PhoneAPI.
  */
-message Heartbeat {
-  
-}
+message Heartbeat {}
 
 /*
  * RemoteHardwarePins associated with a node

meshtastic/module_config.proto

@@ -542,15 +542,6 @@ message ModuleConfig {
      * air quality metrics to the mesh
      */
     bool power_screen_enabled = 10;
-
-
-
-
-
-
-
-
-
   }
 
   /*
@@ -665,7 +656,6 @@ message ModuleConfig {
      Initially created for the RAK14001 RGB LED module.
   */
   message AmbientLightingConfig {
-
     /*
      * Sets LED to on or off.
      */

meshtastic/mqtt.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 
 package meshtastic;
 
-import "meshtastic/mesh.proto";
 import "meshtastic/config.proto";
+import "meshtastic/mesh.proto";
 
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";

meshtastic/telemetry.options

@@ -1,4 +1,5 @@
 # options for nanopb
 # https://jpa.kapsi.fi/nanopb/docs/reference.html#proto-file-options
 
-
+*EnvironmentMetrics.weather max_count:8
+*EnvironmentMetrics.power max_count:8

meshtastic/telemetry.proto

@@ -37,6 +37,51 @@ message DeviceMetrics {
  * Weather station or other environmental metrics
  */
 message EnvironmentMetrics {
+  /*
+   * Temperature measured
+   */
+  float temperature = 1 [deprecated = true];
+
+  /*
+   * Relative humidity percent measured
+   */
+  float relative_humidity = 2 [deprecated = true];
+
+  /*
+   * Barometric pressure in hPA measured
+   */
+  float barometric_pressure = 3 [deprecated = true];
+
+  /*
+   * Gas resistance in MOhm measured
+   */
+  float gas_resistance = 4 [deprecated = true];
+
+  /*
+   * Voltage measured
+   */
+  float voltage = 5 [deprecated = true];
+
+  /*
+   * Current measured
+   */
+  float current = 6 [deprecated = true];
+
+  /*
+   * WeatherMetric readings
+   */
+  repeated WeatherMetric weather = 7;
+
+  /*
+   * PowerMetric readings
+   */
+  repeated PowerMetric power = 8;
+}
+
+/*
+ * Weather metrics
+ */
+message WeatherMetric {
   /*
    * Temperature measured
    */
@@ -56,16 +101,21 @@ message EnvironmentMetrics {
    * Gas resistance in MOhm measured
    */
   float gas_resistance = 4;
+}
 
+/*
+ * Power metrics
+ */
+message PowerMetric {
   /*
    * Voltage measured (To be depreciated in favor of PowerMetrics in Meshtastic 3.x)
    */
-  float voltage = 5;
+  float voltage = 1;
 
   /*
    * Current measured (To be depreciated in favor of PowerMetrics in Meshtastic 3.x)
    */
-  float current = 6;
+  float current = 2;
 }
 
 /*
@@ -283,5 +333,4 @@ enum TelemetrySensorType {
    * BMP085/BMP180 High accuracy temperature and pressure (older Version of BMP280)
    */
   BMP085 = 15;
-
 }

nanopb.proto

@@ -6,6 +6,7 @@
 // for memory-limited environments.
 
 syntax = "proto2";
+
 import "google/protobuf/descriptor.proto";
 
 option java_package = "fi.kapsi.koti.jpa.nanopb";
@@ -181,5 +182,3 @@ extend google.protobuf.EnumOptions {
 extend google.protobuf.FieldOptions {
   optional NanoPBOptions nanopb = 1010;
 }
-
-