Merge pull request #895 from meshtastic/takv2_geometry

Takv2 geometry (missed commits)

.github/pull_request_template.md

@@ -10,3 +10,21 @@
 
 - [ ] All top level messages commented
 - [ ] All enum members have unique descriptions
+
+
+### New Hardware Model Acceptance Policy
+
+Due to limited availability and ongoing support, new Hardware Models will only be accepted from [Meshtastic Backers and Partners](https://meshtastic.com/). The Meshtastic team reserves the right to make exceptions to this policy.
+
+#### Alternative for Community Contributors
+
+You are welcome to use one of the existing DIY hardware models in your PlatformIO environment and create a pull request in the firmware project. Please note the following conditions:
+
+- The device will **not** be officially supported by the core Meshtastic team.
+- The device will **not** appear in the [Web Flasher](https://flasher.meshtastic.org/) or Github release assets.
+- You will be responsible for ongoing maintenance and support.
+- Community-contributed / DIY hardware models are considered experimental and will likely have limited or no testing.
+
+#### Getting Official Support
+
+To have your hardware model officially supported and included in the Meshtastic ecosystem, consider becoming a Meshtastic Backer or Partner. Visit [meshtastic.com](https://meshtastic.com/) for more information about partnership opportunities.

.github/workflows/create_tag.yml

@@ -1,11 +1,14 @@
 name: Create tag
 
+permissions:
+  contents: write
+
 on:
   workflow_dispatch:
     inputs:
       increment_type:
         type: choice
-        description: "Select the type of version increment"
+        description: Select the type of version increment
         required: true
         options:
           - patch
@@ -18,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - id: version
@@ -47,7 +50,7 @@ jobs:
           echo "NEW_VERSION=v$MAJOR.$MINOR.$PATCH" >> $GITHUB_OUTPUT
 
       - name: Create release
-        uses: ncipollo/release-action@v1.12.0
+        uses: ncipollo/release-action@v1
         with:
           name: Meshtastic Protobufs ${{ steps.version.outputs.NEW_VERSION }}
           tag: ${{ steps.version.outputs.NEW_VERSION }}
@@ -55,14 +58,14 @@ jobs:
           token: ${{ github.token }}
 
       - name: Setup Buf
-        uses: bufbuild/buf-setup-action@v1
+        uses: bufbuild/buf-action@v1.2.0
         with:
           github_token: ${{ github.token }}
+          token: ${{ secrets.BUF_TOKEN }}
+          setup_only: true
 
       - name: Push to schema registry
-        # uses: bufbuild/buf-push-action@v1
-        # with:
-        #   buf_token: ${{ secrets.BUF_TOKEN }}
+        env:
+          BUF_TOKEN: ${{ secrets.BUF_TOKEN }}
         run: |
-          export BUF_TOKEN=${{ secrets.BUF_TOKEN }}
           buf push --tag ${{ steps.version.outputs.NEW_VERSION }}

.github/workflows/nightly.yml

@@ -1,19 +0,0 @@
-name: Nightly
-on:
-  schedule:
-    - cron: 0 8 * * 1-5
-  workflow_dispatch: {}
-
-jobs:
-  trunk_check:
-    name: Trunk Check Upload
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
-        with:
-          trunk-token: ${{ secrets.TRUNK_TOKEN }}

.github/workflows/publish.yml

@@ -1,27 +1,263 @@
-name: Push new version to schema registry
+name: Publish to JSR & NPM
 
 on:
   push:
     tags:
-      - "**"
+      - "v*"
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version to publish (e.g. v1.2.3). Used when manually dispatching."
+        required: false
+        type: string
+      dry_run:
+        description: "Dry run mode - generate artifacts without publishing"
+        required: false
+        type: boolean
+        default: false
+
+permissions:
+  contents: write
+  id-token: write
 
 jobs:
-  push_to_registry:
-    runs-on: ubuntu-latest
-
+  codegen:
+    runs-on: ubuntu-24.04
+    outputs:
+      version: ${{ steps.version.outputs.VERSION }}
+      tag: ${{ steps.version.outputs.TAG }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Determine version
+        id: version
+        run: |
+          set -euo pipefail
+          if [ "${{ github.ref_type }}" = "tag" ]; then
+            TAG="${{ github.ref_name }}"
+          elif [ -n "${{ inputs.version || '' }}" ]; then
+            TAG="${{ inputs.version }}"
+          else
+            echo "No tag ref and no 'version' input. Provide a tag (push a tag) or pass inputs.version." >&2
+            exit 1
+          fi
+          VERSION="${TAG#v}"
+          echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "TAG=$TAG" >> "$GITHUB_OUTPUT"
+          echo "Resolved VERSION=$VERSION, TAG=$TAG"
 
       - name: Setup Buf
-        uses: bufbuild/buf-setup-action@v1
+        uses: bufbuild/buf-setup-action@main
+        with:
+          github_token: ${{ github.token }}
+
+      - name: Generate protobuf code
+        run: buf generate
+
+      - name: Move generated files to lib root
+        run: |
+          set -euo pipefail
+          src_dir="packages/ts/lib/meshtastic"
+          dest_dir="packages/ts/lib"
+
+          if [ ! -d "$src_dir" ]; then
+            echo "Expected source directory '$src_dir' does not exist. 'buf generate' may have failed or changed its output paths." >&2
+            exit 1
+          fi
+
+          if ! compgen -G "$src_dir"/*_pb.ts > /dev/null; then
+            echo "No '*_pb.ts' files found in '$src_dir'. 'buf generate' may have produced no TypeScript files or changed their naming." >&2
+            exit 1
+          fi
+
+          mv "$src_dir"/*_pb.ts "$dest_dir"/
+      - name: Show generated files
+        run: |
+          echo "=== packages/ts contents ==="
+          ls -la packages/ts/
+          echo "=== packages/ts/lib contents ==="
+          ls -la packages/ts/lib/ || echo "lib folder not found"
+
+      - name: Set package versions
+        run: |
+          set -euo pipefail
+          VERSION="${{ steps.version.outputs.VERSION }}"
+          for f in packages/ts/deno.json packages/ts/package.json; do
+            test -f "$f" || { echo "Missing $f" >&2; exit 1; }
+            sed -i "s/__PACKAGE_VERSION__/${VERSION}/g" "$f"
+          done
+
+      - name: Copy license & README
+        run: cp LICENSE README.md packages/ts/
+
+      - name: Upload TypeScript code
+        uses: actions/upload-artifact@v4
+        with:
+          name: ts_code
+          path: packages/ts
+
+  build-typescript:
+    runs-on: ubuntu-24.04
+    needs: codegen
+    steps:
+      - name: Download TypeScript code
+        uses: actions/download-artifact@v4
+        with:
+          name: ts_code
+
+      - name: Show downloaded files
+        run: |
+          echo "=== Working directory ==="
+          pwd
+          echo "=== Contents ==="
+          ls -la
+          echo "=== lib/ contents ==="
+          ls -la lib/ || echo "lib folder not found"
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build with tsdown
+        run: npm run build
+
+      - name: Show build output
+        run: |
+          echo "=== Build output ==="
+          ls -la
+          ls -la dist/
+
+      - name: Upload built NPM package
+        uses: actions/upload-artifact@v4
+        with:
+          name: npm_package
+          path: |
+            dist/
+            package.json
+            LICENSE
+            README.md
+
+      - name: Upload JSR package
+        uses: actions/upload-artifact@v4
+        with:
+          name: jsr_package
+          path: |
+            lib/
+            mod.ts
+            deno.json
+            LICENSE
+            README.md
+
+  create-release-zips:
+    runs-on: ubuntu-24.04
+    needs: [codegen, build-typescript]
+    steps:
+      - name: Download NPM package
+        uses: actions/download-artifact@v4
+        with:
+          name: npm_package
+          path: npm_package
+
+      - name: Download JSR package
+        uses: actions/download-artifact@v4
+        with:
+          name: jsr_package
+          path: jsr_package
+
+      - name: Create zip archives
+        run: |
+          cd npm_package && zip -r ../meshtastic-protobufs-npm.zip . && cd ..
+          cd jsr_package && zip -r ../meshtastic-protobufs-jsr.zip . && cd ..
+
+      - name: Upload release zips
+        uses: actions/upload-artifact@v4
+        with:
+          name: release_zips
+          path: |
+            meshtastic-protobufs-npm.zip
+            meshtastic-protobufs-jsr.zip
+
+  upload-release-assets:
+    runs-on: ubuntu-24.04
+    needs: [codegen, create-release-zips]
+    if: ${{ !inputs.dry_run }}
+    steps:
+      - name: Download release zips
+        uses: actions/download-artifact@v4
+        with:
+          name: release_zips
+
+      - name: Upload assets to GitHub release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ needs.codegen.outputs.tag }}
+          files: |
+            meshtastic-protobufs-npm.zip
+            meshtastic-protobufs-jsr.zip
+
+  push-buf-registry:
+    runs-on: ubuntu-24.04
+    needs: codegen
+    if: ${{ !inputs.dry_run }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Buf
+        uses: bufbuild/buf-setup-action@main
         with:
           github_token: ${{ github.token }}
 
       - name: Push to schema registry
-        # uses: bufbuild/buf-push-action@v1
-        # with:
-        #   buf_token: ${{ secrets.BUF_TOKEN }}
-        run: |
-          export BUF_TOKEN=${{ secrets.BUF_TOKEN }}
-          buf push --tag ${{ github.ref_name }}
+        env:
+          BUF_TOKEN: ${{ secrets.BUF_TOKEN }}
+        run: buf push --tag ${{ needs.codegen.outputs.tag }}
+
+  publish-npm:
+    runs-on: ubuntu-24.04
+    needs: [codegen, build-typescript]
+    if: ${{ !inputs.dry_run }}
+    steps:
+      - name: Download NPM package
+        uses: actions/download-artifact@v4
+        with:
+          name: npm_package
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Publish to NPM
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  publish-jsr:
+    runs-on: ubuntu-24.04
+    needs: [codegen, build-typescript]
+    if: ${{ !inputs.dry_run }}
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - name: Download JSR package
+        uses: actions/download-artifact@v4
+        with:
+          name: jsr_package
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+
+      - name: Publish to JSR
+        run: npx jsr publish

.github/workflows/pull_request.yml

@@ -1,4 +1,9 @@
 name: pull-request
+
+permissions:
+  contents: read
+  pull-requests: write
+
 on: pull_request
 jobs:
   build:
@@ -6,18 +11,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Setup Buf
-        uses: bufbuild/buf-setup-action@v1
+      - name: Buf PR Checks
+        uses: bufbuild/buf-action@v1.2.0
         with:
           github_token: ${{ github.token }}
-
-      - name: Lint
-        uses: bufbuild/buf-lint-action@v1
-
-      - name: Push to schema registry
-        uses: bufbuild/buf-push-action@v1
-        with:
-          buf_token: ${{ secrets.BUF_TOKEN }}
-          draft: ${{ github.ref_name != 'master'}}
+          token: ${{ secrets.BUF_TOKEN }}
+          format: true
+          lint: true
+          breaking: true

.github/workflows/schema-registry.yml

@@ -1,5 +1,8 @@
 name: Push commit to schema registry
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:
@@ -7,18 +10,15 @@ on:
 
 jobs:
   push_to_registry:
+    name: Push to schema registry
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Setup Buf
-        uses: bufbuild/buf-setup-action@v1
-        with:
-          github_token: ${{ github.token }}
+        uses: actions/checkout@v4
 
       - name: Push to schema registry
-        uses: bufbuild/buf-push-action@v1
+        uses: bufbuild/buf-action@v1.2.0
         with:
-          buf_token: ${{ secrets.BUF_TOKEN }}
+          github_token: ${{ github.token }}
+          token: ${{ secrets.BUF_TOKEN }}
+          push: true

.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+
+# Generated protobuf files
+packages/ts/lib/
+.bin/

.trunk/.gitignore

@@ -1,7 +0,0 @@
-*out
-*logs
-*actions
-*notifications
-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/trunk.yaml

@@ -1,28 +0,0 @@
-version: 0.1
-cli:
-  version: 1.3.1
-plugins:
-  sources:
-    - id: trunk
-      ref: v0.0.8
-      uri: https://github.com/trunk-io/plugins
-lint:
-  enabled:
-    - buf-lint@1.12.0
-    - buf-breaking@1.12.0
-    - actionlint@1.6.22
-    - markdownlint@0.33.0
-    - prettier@2.8.3
-    - gitleaks@8.15.2
-    - git-diff-check
-runtimes:
-  enabled:
-    - go@1.18.3
-    - 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"]
+  "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"
 }

buf.gen.yaml

@@ -0,0 +1,5 @@
+version: v2
+plugins:
+  - remote: buf.build/bufbuild/es:v2.1.0
+    out: packages/ts/lib
+    opt: target=ts,import_extension=.ts

buf.yaml

@@ -1,11 +1,23 @@
-version: v1
-name: "buf.build/meshtastic/protobufs"
-deps: []
-build:
-  excludes: []
-breaking:
-  use:
-    - FILE
-lint:
-  use:
-    - MINIMAL
+version: v2
+modules:
+  - path: .
+    name: buf.build/meshtastic/protobufs
+    excludes:
+      - .trunk/
+      - meshtastic/device_only/
+    lint:
+      use:
+        - MINIMAL
+      except:
+        - PACKAGE_NO_IMPORT_CYCLE
+      ignore_only:
+        PACKAGE_DEFINED:
+          - nanopb.proto
+      disallow_comment_ignores: true
+    breaking:
+      use:
+        - FILE
+      except:
+        - EXTENSION_NO_DELETE
+        - FIELD_SAME_DEFAULT
+

meshtastic/admin.options

@@ -1,11 +1,21 @@
 *AdminMessage.payload_variant anonymous_oneof:true
 
+*AdminMessage.session_passkey max_size:8
+
+*AdminMessage.OTAEvent.ota_hash max_size:32
+
+*AdminMessage.InputEvent.event_code int_size:8
+*AdminMessage.InputEvent.kb_char int_size:8
+*AdminMessage.InputEvent.touch_x int_size:16
+*AdminMessage.InputEvent.touch_y int_size:16
+
 *AdminMessage.set_canned_message_module_messages max_size:201
 *AdminMessage.get_canned_message_module_messages_response max_size:201
+*AdminMessage.delete_file_request max_size:201
 
 *AdminMessage.set_ringtone_message max_size:231
 *AdminMessage.get_ringtone_response max_size:231
 
-
 *HamParameters.call_sign max_size:8
-*HamParameters.short_name max_size:6
+*HamParameters.short_name max_size:5
+*NodeRemoteHardwarePinsResponse.node_remote_hardware_pins max_count:16

meshtastic/admin.proto

@@ -2,17 +2,19 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "AdminProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
+/* trunk-ignore(buf-lint/COMPILE) */
 import "meshtastic/channel.proto";
 import "meshtastic/config.proto";
+import "meshtastic/connection_status.proto";
+import "meshtastic/device_ui.proto";
 import "meshtastic/mesh.proto";
 import "meshtastic/module_config.proto";
-import "meshtastic/connection_status.proto";
+
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "AdminProtos";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
 
 /*
  * This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
@@ -20,12 +22,17 @@ import "meshtastic/connection_status.proto";
  * (Prior to 1.2 these operations were done via special ToRadio operations)
  */
 message AdminMessage {
+  /*
+   * The node generates this key and sends it with any get_x_response packets.
+   * The client MUST include the same key with any set_x commands. Key expires after 300 seconds.
+   * Prevents replay attacks for admin messages.
+   */
+  bytes session_passkey = 101;
 
   /*
    * TODO: REPLACE
    */
   enum ConfigType {
-
     /*
      * TODO: REPLACE
      */
@@ -60,46 +67,60 @@ message AdminMessage {
      * TODO: REPLACE
      */
     BLUETOOTH_CONFIG = 6;
+
+    /*
+     * TODO: REPLACE
+     */
+    SECURITY_CONFIG = 7;
+
+    /*
+     * Session key config
+     */
+    SESSIONKEY_CONFIG = 8;
+
+    /*
+     * device-ui config
+     */
+    DEVICEUI_CONFIG = 9;
   }
 
   /*
    * TODO: REPLACE
    */
   enum ModuleConfigType {
-
     /*
-    * TODO: REPLACE
-    */
+     * TODO: REPLACE
+     */
     MQTT_CONFIG = 0;
 
     /*
-    * TODO: REPLACE
-    */
+     * TODO: REPLACE
+     */
     SERIAL_CONFIG = 1;
 
     /*
-    * TODO: REPLACE
-    */
+     * TODO: REPLACE
+     */
     EXTNOTIF_CONFIG = 2;
 
     /*
-    * TODO: REPLACE
-    */
+     * TODO: REPLACE
+     */
     STOREFORWARD_CONFIG = 3;
 
     /*
-    * TODO: REPLACE
-    */
+     * TODO: REPLACE
+     */
     RANGETEST_CONFIG = 4;
 
     /*
-    * TODO: REPLACE
-    */
+     * TODO: REPLACE
+     */
     TELEMETRY_CONFIG = 5;
 
     /*
-    * TODO: REPLACE
-    */
+     * TODO: REPLACE
+     */
     CANNEDMSG_CONFIG = 6;
 
     /*
@@ -111,13 +132,98 @@ message AdminMessage {
      * TODO: REPLACE
      */
     REMOTEHARDWARE_CONFIG = 8;
+
+    /*
+     * TODO: REPLACE
+     */
+    NEIGHBORINFO_CONFIG = 9;
+
+    /*
+     * TODO: REPLACE
+     */
+    AMBIENTLIGHTING_CONFIG = 10;
+
+    /*
+     * TODO: REPLACE
+     */
+    DETECTIONSENSOR_CONFIG = 11;
+
+    /*
+     * TODO: REPLACE
+     */
+    PAXCOUNTER_CONFIG = 12;
+
+    /*
+     * TODO: REPLACE
+     */
+    STATUSMESSAGE_CONFIG = 13;
+
+    /*
+     * Traffic management module config
+     */
+    TRAFFICMANAGEMENT_CONFIG = 14;
+
+    /*
+     * TAK module config
+     */
+    TAK_CONFIG = 15;
+  }
+
+  enum BackupLocation {
+    /*
+     * Backup to the internal flash
+     */
+    FLASH = 0;
+
+    /*
+     * Backup to the SD card
+     */
+    SD = 1;
+  }
+
+  /*
+   * Input event message to be sent to the node.
+   */
+  message InputEvent {
+    /*
+     * The input event code
+     */
+    uint32 event_code = 1;
+    /*
+     * Keyboard character code
+     */
+    uint32 kb_char = 2;
+    /*
+     * The touch X coordinate
+     */
+    uint32 touch_x = 3;
+    /*
+     * The touch Y coordinate
+     */
+    uint32 touch_y = 4;
+  }
+
+  /*
+   * User is requesting an over the air update.
+   * Node will reboot into the OTA loader
+   */
+  message OTAEvent {
+    /*
+     * Tell the node to reboot into OTA mode for firmware update via BLE or WiFi (ESP32 only for now)
+     */
+    OTAMode reboot_ota_mode = 1;
+
+    /*
+     * A 32 byte hash of the OTA firmware.
+     * Used to verify the integrity of the firmware before applying an update.
+     */
+    bytes ota_hash = 2;
   }
 
   /*
    * TODO: REPLACE
    */
   oneof payload_variant {
-
     /*
      * Send the specified channel in the response to this message
      * NOTE: This field is sent with the channel index + 1 (to ensure we never try to send 'zero' - which protobufs treats as not present)
@@ -125,28 +231,28 @@ message AdminMessage {
     uint32 get_channel_request = 1;
 
     /*
-      * TODO: REPLACE
-      */
+     * TODO: REPLACE
+     */
     Channel get_channel_response = 2;
- 
+
     /*
-      * Send the current owner data in the response to this message.
-      */
+     * Send the current owner data in the response to this message.
+     */
     bool get_owner_request = 3;
- 
+
     /*
-      * TODO: REPLACE
-      */
+     * TODO: REPLACE
+     */
     User get_owner_response = 4;
- 
+
     /*
-      * Ask for the following config data to be sent
-      */
+     * Ask for the following config data to be sent
+     */
     ConfigType get_config_request = 5;
- 
+
     /*
-      * Send the current Config in the response to this message.
-      */
+     * Send the current Config in the response to this message.
+     */
     Config get_config_response = 6;
 
     /*
@@ -175,8 +281,8 @@ message AdminMessage {
     bool get_device_metadata_request = 12;
 
     /*
-      * Device metadata response
-      */
+     * Device metadata response
+     */
     DeviceMetadata get_device_metadata_response = 13;
 
     /*
@@ -204,18 +310,65 @@ message AdminMessage {
      */
     HamParameters set_ham_mode = 18;
 
+    /*
+     * Get the mesh's nodes with their available gpio pins for RemoteHardware module use
+     */
+    bool get_node_remote_hardware_pins_request = 19;
+
+    /*
+     * Respond with the mesh's nodes with their available gpio pins for RemoteHardware module use
+     */
+    NodeRemoteHardwarePinsResponse get_node_remote_hardware_pins_response = 20;
+
+    /*
+     * Enter (UF2) DFU mode
+     * Only implemented on NRF52 currently
+     */
+    bool enter_dfu_mode_request = 21;
+
+    /*
+     * Delete the file by the specified path from the device
+     */
+    string delete_file_request = 22;
+
+    /*
+     * Set zero and offset for scale chips
+     */
+    uint32 set_scale = 23;
+
+    /*
+     * Backup the node's preferences
+     */
+    BackupLocation backup_preferences = 24;
+
+    /*
+     * Restore the node's preferences
+     */
+    BackupLocation restore_preferences = 25;
+
+    /*
+     * Remove backups of the node's preferences
+     */
+    BackupLocation remove_backup_preferences = 26;
+
+    /*
+     * Send an input event to the node.
+     * This is used to trigger physical input events like button presses, touch events, etc.
+     */
+    InputEvent send_input_event = 27;
+
     /*
      * Set the owner for this node
      */
     User set_owner = 32;
 
     /*
-      * Set channels (using the new API).
-      * A special channel is the "primary channel".
-      * The other records are secondary channels.
-      * Note: only one channel can be marked as primary.
-      * If the client sets a particular channel to be primary, the previous channel will be set to SECONDARY automatically.
-      */
+     * Set channels (using the new API).
+     * A special channel is the "primary channel".
+     * The other records are secondary channels.
+     * Note: only one channel can be marked as primary.
+     * If the client sets a particular channel to be primary, the previous channel will be set to SECONDARY automatically.
+     */
     Channel set_channel = 33;
 
     /*
@@ -238,22 +391,99 @@ message AdminMessage {
      */
     string set_ringtone_message = 37;
 
+    /*
+     * Remove the node by the specified node-num from the NodeDB on the device
+     */
+    uint32 remove_by_nodenum = 38;
+
+    /*
+     * Set specified node-num to be favorited on the NodeDB on the device
+     */
+    uint32 set_favorite_node = 39;
+
+    /*
+     * Set specified node-num to be un-favorited on the NodeDB on the device
+     */
+    uint32 remove_favorite_node = 40;
+
+    /*
+     * Set fixed position data on the node and then set the position.fixed_position = true
+     */
+    Position set_fixed_position = 41;
+
+    /*
+     * Clear fixed position coordinates and then set position.fixed_position = false
+     */
+    bool remove_fixed_position = 42;
+
+    /*
+     * Set time only on the node
+     * Convenience method to set the time on the node (as Net quality) without any other position data
+     */
+    fixed32 set_time_only = 43;
+
+    /*
+     * Tell the node to send the stored ui data.
+     */
+    bool get_ui_config_request = 44;
+
+    /*
+     * Reply stored device ui data.
+     */
+    DeviceUIConfig get_ui_config_response = 45;
+
+    /*
+     * Tell the node to store UI data persistently.
+     */
+    DeviceUIConfig store_ui_config = 46;
+
+    /*
+     * Set specified node-num to be ignored on the NodeDB on the device
+     */
+    uint32 set_ignored_node = 47;
+
+    /*
+     * Set specified node-num to be un-ignored on the NodeDB on the device
+     */
+    uint32 remove_ignored_node = 48;
+
+    /*
+     * Set specified node-num to be muted
+     */
+    uint32 toggle_muted_node = 49;
+
     /*
      * Begins an edit transaction for config, module config, owner, and channel settings changes
      * This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings)
      */
     bool begin_edit_settings = 64;
-    
+
     /*
      * Commits an open transaction for any edits made to config, module config, owner, and channel settings
      */
     bool commit_edit_settings = 65;
 
+    /*
+     * Add a contact (User) to the nodedb
+     */
+    SharedContact add_contact = 66;
+
+    /*
+     * Initiate or respond to a key verification request
+     */
+    KeyVerificationAdmin key_verification = 67;
+
+    /*
+     * Tell the node to factory reset config everything; all device state and configuration will be returned to factory defaults and BLE bonds will be cleared.
+     */
+    int32 factory_reset_device = 94;
+
     /*
      * Tell the node to reboot into the OTA Firmware in this many seconds (or <0 to cancel reboot)
      * Only Implemented for ESP32 Devices. This needs to be issued to send a new main firmware via bluetooth.
+     * Deprecated in favor of reboot_ota_mode in 2.7.17
      */
-    int32 reboot_ota_seconds = 95;
+    int32 reboot_ota_seconds = 95 [deprecated = true];
 
     /*
      * This message is only supported for the simulator Portduino build.
@@ -272,17 +502,48 @@ message AdminMessage {
     int32 shutdown_seconds = 98;
 
     /*
-     * Tell the node to factory reset, all device settings will be returned to factory defaults.
+     * Tell the node to factory reset config; all device state and configuration will be returned to factory defaults; BLE bonds will be preserved.
      */
-    int32 factory_reset = 99;
+    int32 factory_reset_config = 99;
 
     /*
      * Tell the node to reset the nodedb.
+     * When true, favorites are preserved through reset.
      */
-    int32 nodedb_reset = 100;
+    bool nodedb_reset = 100;
+
+    /*
+     * Tell the node to reset into the OTA Loader
+     */
+    OTAEvent ota_request = 102;
+
+    /*
+     * Parameters and sensor configuration
+     */
+    SensorConfig sensor_config = 103;
   }
 }
 
+/*
+ * Firmware update mode for OTA updates
+ */
+enum OTAMode {
+  /*
+   * Do not reboot into OTA mode
+   */
+  NO_REBOOT_OTA = 0;
+
+  /*
+   * Reboot into OTA mode for BLE firmware update
+   */
+  OTA_BLE = 1;
+
+  /*
+   * Reboot into OTA mode for WiFi firmware update
+   */
+  OTA_WIFI = 2;
+}
+
 /*
  * Parameters for setting up Meshtastic for ameteur radio usage
  */
@@ -309,3 +570,193 @@ message HamParameters {
    */
   string short_name = 4;
 }
+
+/*
+ * Response envelope for node_remote_hardware_pins
+ */
+message NodeRemoteHardwarePinsResponse {
+  /*
+   * Nodes and their respective remote hardware GPIO pins
+   */
+  repeated NodeRemoteHardwarePin node_remote_hardware_pins = 1;
+}
+
+message SharedContact {
+  /*
+   * The node number of the contact
+   */
+  uint32 node_num = 1;
+
+  /*
+   * The User of the contact
+   */
+  User user = 2;
+
+  /*
+   * Add this contact to the blocked / ignored list
+   */
+  bool should_ignore = 3;
+
+  /*
+   * Set the IS_KEY_MANUALLY_VERIFIED bit
+   */
+  bool manually_verified = 4;
+}
+
+/*
+ * This message is used by a client to initiate or complete a key verification
+ */
+message KeyVerificationAdmin {
+  /*
+   * Three stages of this request.
+   */
+  enum MessageType {
+    /*
+     * This is the first stage, where a client initiates
+     */
+    INITIATE_VERIFICATION = 0;
+
+    /*
+     * After the nonce has been returned over the mesh, the client prompts for the security number
+     * And uses this message to provide it to the node.
+     */
+    PROVIDE_SECURITY_NUMBER = 1;
+
+    /*
+     * Once the user has compared the verification message, this message notifies the node.
+     */
+    DO_VERIFY = 2;
+
+    /*
+     * This is the cancel path, can be taken at any point
+     */
+    DO_NOT_VERIFY = 3;
+  }
+
+  MessageType message_type = 1;
+
+  /*
+   * The nodenum we're requesting
+   */
+  uint32 remote_nodenum = 2;
+
+  /*
+   * The nonce is used to track the connection
+   */
+  uint64 nonce = 3;
+
+  /*
+   * The 4 digit code generated by the remote node, and communicated outside the mesh
+   */
+  optional uint32 security_number = 4;
+}
+
+message SensorConfig {
+  /*
+   * SCD4X CO2 Sensor configuration
+   */
+  SCD4X_config scd4x_config = 1;
+
+  /*
+   * SEN5X PM Sensor configuration
+   */
+  SEN5X_config sen5x_config = 2;
+
+  /*
+   * SCD30 CO2 Sensor configuration
+   */
+  SCD30_config scd30_config = 3;
+
+  /*
+   * SHTXX temperature and relative humidity sensor configuration
+   */
+  SHTXX_config shtxx_config = 4;
+}
+
+message SCD4X_config {
+  /*
+   * Set Automatic self-calibration enabled
+   */
+  optional bool set_asc = 1;
+
+  /*
+   * Recalibration target CO2 concentration in ppm (FRC or ASC)
+   */
+  optional uint32 set_target_co2_conc = 2;
+
+  /*
+   * Reference temperature in degC
+   */
+  optional float set_temperature = 3;
+
+  /*
+   * Altitude of sensor in meters above sea level. 0 - 3000m (overrides ambient pressure)
+   */
+  optional uint32 set_altitude = 4;
+
+  /*
+   * Sensor ambient pressure in Pa. 70000 - 120000 Pa (overrides altitude)
+   */
+  optional uint32 set_ambient_pressure = 5;
+
+  /*
+   * Perform a factory reset of the sensor
+   */
+  optional bool factory_reset = 6;
+
+  /*
+   * Power mode for sensor (true for low power, false for normal)
+   */
+  optional bool set_power_mode = 7;
+}
+
+message SEN5X_config {
+  /*
+   * Reference temperature in degC
+   */
+  optional float set_temperature = 1;
+
+  /*
+   * One-shot mode (true for low power - one-shot mode, false for normal - continuous mode)
+   */
+  optional bool set_one_shot_mode = 2;
+}
+
+message SCD30_config {
+  /*
+   * Set Automatic self-calibration enabled
+   */
+  optional bool set_asc = 1;
+
+  /*
+   * Recalibration target CO2 concentration in ppm (FRC or ASC)
+   */
+  optional uint32 set_target_co2_conc = 2;
+
+  /*
+   * Reference temperature in degC
+   */
+  optional float set_temperature = 3;
+
+  /*
+   * Altitude of sensor in meters above sea level. 0 - 3000m (overrides ambient pressure)
+   */
+  optional uint32 set_altitude = 4;
+
+  /*
+   * Power mode for sensor (true for low power, false for normal)
+   */
+  optional uint32 set_measurement_interval = 5;
+
+  /*
+   * Perform a factory reset of the sensor
+   */
+  optional bool soft_reset = 6;
+}
+
+message SHTXX_config {
+  /*
+   * Accuracy mode (0 = low, 1 = medium, 2 = high)
+   */
+  optional uint32 set_accuracy = 1;
+}

meshtastic/apponly.proto

@@ -2,16 +2,15 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "AppOnlyProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
-
 import "meshtastic/channel.proto";
 import "meshtastic/config.proto";
 
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "AppOnlyProtos";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
+
 /*
  * This is the most compact possible representation for a set of channels.
  * It includes only one PRIMARY channel (which must be first) and
@@ -20,7 +19,6 @@ import "meshtastic/config.proto";
  * This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL
  */
 message ChannelSet {
-
   /*
    * Channel list with settings
    */

meshtastic/atak.options

@@ -0,0 +1,110 @@
+*Contact.callsign max_size:120
+*Contact.device_callsign max_size:120
+*Status.battery int_size:8
+*PLI.course int_size:16
+*GeoChat.message max_size:200
+*GeoChat.to max_size:120
+*GeoChat.to_callsign max_size:120
+*TAKPacket.detail max_size:220
+*TAKPacketV2.cot_type_str max_size:32
+*TAKPacketV2.callsign max_size:120
+*TAKPacketV2.uid max_size:48
+*TAKPacketV2.device_callsign max_size:120
+*TAKPacketV2.tak_version max_size:64
+*TAKPacketV2.tak_device max_size:32
+*TAKPacketV2.tak_platform max_size:32
+*TAKPacketV2.tak_os max_size:16
+*TAKPacketV2.endpoint max_size:32
+*TAKPacketV2.phone max_size:20
+*TAKPacketV2.raw_detail max_size:220
+*TAKPacketV2.stale_seconds int_size:16
+*TAKPacketV2.battery int_size:8
+*TAKPacketV2.course int_size:16
+*AircraftTrack.icao max_size:8
+*AircraftTrack.registration max_size:16
+*AircraftTrack.flight max_size:16
+*AircraftTrack.aircraft_type max_size:8
+*AircraftTrack.squawk int_size:16
+*AircraftTrack.category max_size:4
+*AircraftTrack.cot_host_id max_size:64
+
+# --- Typed geometry payloads (v2 protocol extension) ---
+#
+# CotGeoPoint: sint32 deltas from the enclosing event's latitude_i/longitude_i.
+# For nearby vertices (telestrations, small rectangles) the varint+zigzag
+# encoding is 2-3 bytes per field, cutting telestration vertex data in half
+# versus sfixed32. int_size:32 keeps the C type a plain int32.
+# Named with a `Cot` prefix to avoid a collision with `meshtastic.GeoPoint`
+# in device_ui.proto, which is an unrelated zoom/latitude/longitude type.
+*CotGeoPoint.lat_delta_i int_size:32
+*CotGeoPoint.lon_delta_i int_size:32
+#
+# DrawnShape pool sizing. `kind` and `style` are varint enums (no int_size
+# needed). stroke_color / fill_color are Team enum, also varint. stroke_argb
+# / fill_argb are fixed32 (always 4 bytes on the wire). Vertex pool is 32
+# entries x ~12B each ~= 384B worst case. Telestrations beyond 32 vertices
+# MUST be pre-truncated by the sender with `truncated = true`.
+*DrawnShape.vertices max_count:32
+*DrawnShape.major_cm int_size:32
+*DrawnShape.minor_cm int_size:32
+*DrawnShape.angle_deg int_size:16
+*DrawnShape.stroke_weight_x10 int_size:16
+*DrawnShape.bullseye_distance_dm int_size:32
+*DrawnShape.bullseye_bearing_ref int_size:8
+*DrawnShape.bullseye_flags int_size:8
+*DrawnShape.bullseye_uid_ref max_size:48
+
+# Marker pool sizing. Strings bounded tight to keep fixed pool small on
+# ESP32 nanopb. parent_uid matches existing TAKPacketV2.uid cap (48).
+# iconset fits "f7f71666-8b28-4b57-9fbb-e38e61d33b79/Google/hiker.png"
+# (~52 chars) with slack.
+*Marker.parent_uid max_size:48
+*Marker.parent_type max_size:24
+*Marker.parent_callsign max_size:24
+*Marker.iconset max_size:80
+
+# RangeAndBearing pool sizing.
+*RangeAndBearing.anchor_uid max_size:48
+*RangeAndBearing.range_cm int_size:32
+*RangeAndBearing.bearing_cdeg int_size:16
+*RangeAndBearing.stroke_weight_x10 int_size:16
+
+# Route pool sizing. 16 links x ~24B each ~= 384B worst case. prefix is
+# ATAK's short waypoint name prefix ("CP", "RP", etc.) — 8 chars is plenty.
+*Route.links max_count:16
+*Route.prefix max_size:8
+*Route.stroke_weight_x10 int_size:16
+*Route.Link.uid max_size:48
+*Route.Link.callsign max_size:16
+*Route.Link.link_type int_size:8
+
+# GeoChat receipt extension. receipt_for_uid matches TAKPacketV2.uid caps.
+*GeoChat.receipt_for_uid max_size:48
+
+# CasevacReport pool sizing. All numeric fields are small (0..255 for
+# patient counts, 1 byte for flags bitfields); strings are short.
+*CasevacReport.equipment_flags int_size:8
+*CasevacReport.terrain_flags int_size:8
+*CasevacReport.litter_patients int_size:8
+*CasevacReport.ambulatory_patients int_size:8
+*CasevacReport.us_military int_size:8
+*CasevacReport.us_civilian int_size:8
+*CasevacReport.non_us_military int_size:8
+*CasevacReport.non_us_civilian int_size:8
+*CasevacReport.epw int_size:8
+*CasevacReport.child int_size:8
+*CasevacReport.zone_marker max_size:16
+*CasevacReport.frequency max_size:16
+
+# EmergencyAlert pool sizing. UIDs match TAKPacketV2.uid caps (48).
+*EmergencyAlert.authoring_uid max_size:48
+*EmergencyAlert.cancel_reference_uid max_size:48
+
+# TaskRequest pool sizing. All four strings are capped tight so the
+# worst-case wire size stays under the LoRa MTU with headroom. task_type
+# is a short category tag; target_uid/assignee_uid match TAKPacketV2.uid
+# conventions; note is the one user-entered field.
+*TaskRequest.task_type max_size:12
+*TaskRequest.target_uid max_size:32
+*TaskRequest.assignee_uid max_size:32
+*TaskRequest.note max_size:48

meshtastic/cannedmessages.proto

@@ -2,17 +2,16 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "CannedMessageConfigProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "CannedMessageConfigProtos";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
  * Canned message module configuration.
  */
 message CannedMessageModuleConfig {
-
   /*
    * Predefined messages for canned message module separated by '|' characters.
    */

meshtastic/channel.proto

@@ -1,19 +1,18 @@
 syntax = "proto3";
 
+/* trunk-ignore(buf-lint/PACKAGE_DIRECTORY_MATCH) */
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "ChannelProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "ChannelProtos";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
- * Full settings (center freq, spread factor, pre-shared secret key etc...)
- * needed to configure a radio for speaking on a particular channel This
- * information can be encoded as a QRcode/url so that other users can configure
+ * This information can be encoded as a QRcode/url so that other users can configure
  * their radio to join the same channel.
- * A note about how channel names are shown to users: channelname-Xy
+ * A note about how channel names are shown to users: channelname-X
  * poundsymbol is a prefix used to indicate this is a channel name (idea from @professr).
  * Where X is a letter from A-Z (base 26) representing a hash of the PSK for this
  * channel - so that if the user changes anything about the channel (which does
@@ -23,14 +22,11 @@ option swift_prefix = "";
  * The PSK is hashed into this letter by "0x41 + [xor all bytes of the psk ] modulo 26"
  * This also allows the option of someday if people have the PSK off (zero), the
  * users COULD type in a channel name and be able to talk.
- * Y is a lower case letter from a-z that represents the channel 'speed' settings
- * (for some future definition of speed)
  * FIXME: Add description of multi-channel support and how primary vs secondary channels are used.
  * FIXME: explain how apps use channels for security.
  * explain how remote settings and remote gpio are managed as an example
  */
 message ChannelSettings {
-
   /*
    * Deprecated in favor of LoraConfig.channel_num
    */
@@ -44,7 +40,7 @@ message ChannelSettings {
    * because they are listed in this source code.
    * Those bytes are mapped using the following scheme:
    * `0` = No crypto
-   * `1` = The special "default" channel key: {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59, 0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0xbf}
+   * `1` = The special "default" channel key: {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59, 0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0x01}
    * `2` through 10 = The default channel key, except with 1 through 9 added to the last byte.
    * Shown to user as simple1 through 10
    */
@@ -86,13 +82,33 @@ message ChannelSettings {
    * If true, messages seen on the internet will be forwarded to the local mesh.
    */
   bool downlink_enabled = 6;
+
+  /*
+   * Per-channel module settings.
+   */
+  ModuleSettings module_settings = 7;
+}
+
+/*
+ * 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;
+
+  /*
+   * Controls whether or not the client / device should mute the current channel
+   * Useful for noisy public channels you don't necessarily want to disable
+   */
+  bool is_muted = 2;
 }
 
 /*
  * A pair of a channel number, mode and the (sharable) settings for that channel
  */
 message Channel {
-
   /*
    * How this channel is being used (or not).
    * Note: this field is an enum to give us options for the future.
@@ -105,7 +121,6 @@ message Channel {
    * (but any number of SECONDARY channels can't be sent received on that common frequency)
    */
   enum Role {
-
     /*
      * This channel is not in use right now
      */

meshtastic/clientonly.options

@@ -0,0 +1,4 @@
+*DeviceProfile.long_name max_size:40
+*DeviceProfile.short_name max_size:5
+*DeviceProfile.ringtone max_size:231
+*DeviceProfile.canned_messages max_size:201

meshtastic/clientonly.proto

@@ -0,0 +1,58 @@
+syntax = "proto3";
+
+package meshtastic;
+
+import "meshtastic/localonly.proto";
+import "meshtastic/mesh.proto";
+
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "ClientOnlyProtos";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
+
+/*
+ * This abstraction is used to contain any configuration for provisioning a node on any client.
+ * It is useful for importing and exporting configurations.
+ */
+message DeviceProfile {
+  /*
+   * Long name for the node
+   */
+  optional string long_name = 1;
+
+  /*
+   * Short name of the node
+   */
+  optional string short_name = 2;
+
+  /*
+   * The url of the channels from our node
+   */
+  optional string channel_url = 3;
+
+  /*
+   * The Config of the node
+   */
+  optional LocalConfig config = 4;
+
+  /*
+   * The ModuleConfig of the node
+   */
+  optional LocalModuleConfig module_config = 5;
+
+  /*
+   * Fixed position data
+   */
+  optional Position fixed_position = 6;
+
+  /*
+   * Ringtone for ExternalNotification
+   */
+  optional string ringtone = 7;
+
+  /*
+   * Predefined messages for CannedMessage
+   */
+  optional string canned_messages = 8;
+}

meshtastic/config.options

@@ -1,5 +1,10 @@
+# longest current is 45 chars, plan with a bit of buffer
+*DeviceConfig.tzdef max_size:65
+*DeviceConfig.buzzer_mode int_size:8
+
+
 *NetworkConfig.wifi_ssid max_size:33
-*NetworkConfig.wifi_psk max_size:64
+*NetworkConfig.wifi_psk max_size:65
 *NetworkConfig.ntp_server max_size:33
 *NetworkConfig.rsyslog_server max_size:33
 
@@ -10,3 +15,10 @@
 *LoRaConfig.bandwidth int_size:16
 *LoRaConfig.coding_rate int_size:8
 *LoRaConfig.channel_num int_size:16
+
+*PowerConfig.device_battery_ina_address int_size:8
+
+*SecurityConfig.public_key max_size:32
+*SecurityConfig.private_key max_size:32
+*SecurityConfig.admin_key max_size:32
+*SecurityConfig.admin_key max_count:3

meshtastic/connection_status.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "ConnStatusProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "ConnStatusProtos";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 message DeviceConnectionStatus {
@@ -39,7 +39,7 @@ message WifiConnectionStatus {
   NetworkConnectionStatus status = 1;
 
   /*
-   * WiFi access point SSID 
+   * WiFi access point SSID
    */
   string ssid = 2;
 
@@ -56,7 +56,7 @@ message EthernetConnectionStatus {
   /*
    * Connection status
    */
-   NetworkConnectionStatus status = 1;
+  NetworkConnectionStatus status = 1;
 }
 
 /*
@@ -67,7 +67,7 @@ message NetworkConnectionStatus {
    * IP address of device
    */
   fixed32 ip_address = 1;
-  
+
   /*
    * Whether the device has an active connection or not
    */
@@ -107,7 +107,7 @@ message BluetoothConnectionStatus {
 /*
  * Serial connection status
  */
- message SerialConnectionStatus {
+message SerialConnectionStatus {
   /*
    * Serial baud rate
    */

meshtastic/device_ui.options

@@ -0,0 +1,12 @@
+*DeviceUIConfig.screen_brightness int_size:8
+*DeviceUIConfig.screen_timeout int_size:16
+*DeviceUIConfig.ring_tone_id int_size:8
+*DeviceUIConfig.calibration_data max_size:16
+*DeviceUIConfig.compass_mode int_size:8
+*DeviceUIConfig.gps_format int_size:8
+*NodeFilter.node_name max_size:16
+*NodeFilter.hops_away int_size:8
+*NodeFilter.channel int_size:8
+*NodeHighlight.node_name max_size:16
+*GeoPoint.zoom int_size:8
+*Map.style max_size:20

meshtastic/device_ui.proto

@@ -0,0 +1,389 @@
+syntax = "proto3";
+
+package meshtastic;
+
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "DeviceUIProtos";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
+
+/*
+ * Protobuf structures for device-ui persistency
+ */
+
+message DeviceUIConfig {
+  /*
+   * A version integer used to invalidate saved files when we make incompatible changes.
+   */
+  uint32 version = 1;
+
+  /*
+   * TFT display brightness 1..255
+   */
+  uint32 screen_brightness = 2;
+
+  /*
+   * Screen timeout 0..900
+   */
+  uint32 screen_timeout = 3;
+
+  /*
+   * Screen/Settings lock enabled
+   */
+  bool screen_lock = 4;
+  bool settings_lock = 5;
+  uint32 pin_code = 6;
+
+  /*
+   * Color theme
+   */
+  Theme theme = 7;
+
+  /*
+   * Audible message, banner and ring tone
+   */
+  bool alert_enabled = 8;
+  bool banner_enabled = 9;
+  uint32 ring_tone_id = 10;
+
+  /*
+   * Localization
+   */
+  Language language = 11;
+
+  /*
+   * Node list filter
+   */
+  NodeFilter node_filter = 12;
+
+  /*
+   * Node list highlightening
+   */
+  NodeHighlight node_highlight = 13;
+
+  /*
+   * 8 integers for screen calibration data
+   */
+  bytes calibration_data = 14;
+
+  /*
+   * Map related data
+   */
+  Map map_data = 15;
+
+  /*
+   * Compass mode
+   */
+  CompassMode compass_mode = 16;
+
+  /*
+   * RGB color for BaseUI
+   * 0xRRGGBB format, e.g. 0xFF0000 for red
+   */
+  uint32 screen_rgb_color = 17;
+
+  /*
+   * Clockface analog style
+   * true for analog clockface, false for digital clockface
+   */
+  bool is_clockface_analog = 18;
+
+  /*
+   * How the GPS coordinates are formatted on the OLED screen.
+   */
+  GpsCoordinateFormat gps_format = 19;
+
+  /*
+   * How the GPS coordinates are displayed on the OLED screen.
+   */
+  enum GpsCoordinateFormat {
+    /*
+     * GPS coordinates are displayed in the normal decimal degrees format:
+     * DD.DDDDDD DDD.DDDDDD
+     */
+    DEC = 0;
+
+    /*
+     * GPS coordinates are displayed in the degrees minutes seconds format:
+     * DD°MM'SS"C DDD°MM'SS"C, where C is the compass point representing the locations quadrant
+     */
+    DMS = 1;
+
+    /*
+     * Universal Transverse Mercator format:
+     * ZZB EEEEEE NNNNNNN, where Z is zone, B is band, E is easting, N is northing
+     */
+    UTM = 2;
+
+    /*
+     * Military Grid Reference System format:
+     * ZZB CD EEEEE NNNNN, where Z is zone, B is band, C is the east 100k square, D is the north 100k square,
+     * E is easting, N is northing
+     */
+    MGRS = 3;
+
+    /*
+     * Open Location Code (aka Plus Codes).
+     */
+    OLC = 4;
+
+    /*
+     * Ordnance Survey Grid Reference (the National Grid System of the UK).
+     * Format: AB EEEEE NNNNN, where A is the east 100k square, B is the north 100k square,
+     * E is the easting, N is the northing
+     */
+    OSGR = 5;
+
+    /*
+     * Maidenhead Locator System
+     * Described here: https://en.wikipedia.org/wiki/Maidenhead_Locator_System
+     */
+    MLS = 6;
+  }
+}
+
+message NodeFilter {
+  /*
+   * Filter unknown nodes
+   */
+  bool unknown_switch = 1;
+
+  /*
+   * Filter offline nodes
+   */
+  bool offline_switch = 2;
+
+  /*
+   * Filter nodes w/o public key
+   */
+  bool public_key_switch = 3;
+
+  /*
+   * Filter based on hops away
+   */
+  int32 hops_away = 4;
+
+  /*
+   * Filter nodes w/o position
+   */
+  bool position_switch = 5;
+
+  /*
+   * Filter nodes by matching name string
+   */
+  string node_name = 6;
+
+  /*
+   * Filter based on channel
+   */
+  int32 channel = 7;
+}
+
+message NodeHighlight {
+  /*
+   * Hightlight nodes w/ active chat
+   */
+  bool chat_switch = 1;
+
+  /*
+   * Highlight nodes w/ position
+   */
+  bool position_switch = 2;
+
+  /*
+   * Highlight nodes w/ telemetry data
+   */
+  bool telemetry_switch = 3;
+
+  /*
+   * Highlight nodes w/ iaq data
+   */
+  bool iaq_switch = 4;
+
+  /*
+   * Highlight nodes by matching name string
+   */
+  string node_name = 5;
+}
+
+message GeoPoint {
+  /*
+   * Zoom level
+   */
+  int32 zoom = 1;
+
+  /*
+   * Coordinate: latitude
+   */
+  int32 latitude = 2;
+
+  /*
+   * Coordinate: longitude
+   */
+  int32 longitude = 3;
+}
+
+message Map {
+  /*
+   * Home coordinates
+   */
+  GeoPoint home = 1;
+
+  /*
+   * Map tile style
+   */
+  string style = 2;
+
+  /*
+   * Map scroll follows GPS
+   */
+  bool follow_gps = 3;
+}
+
+enum CompassMode {
+  /*
+   * Compass with dynamic ring and heading
+   */
+  DYNAMIC = 0;
+
+  /*
+   * Compass with fixed ring and heading
+   */
+  FIXED_RING = 1;
+
+  /*
+   * Compass with heading and freeze option
+   */
+  FREEZE_HEADING = 2;
+}
+
+enum Theme {
+  /*
+   * Dark
+   */
+  DARK = 0;
+  /*
+   * Light
+   */
+  LIGHT = 1;
+  /*
+   * Red
+   */
+  RED = 2;
+}
+
+/*
+ * Localization
+ */
+enum Language {
+  /*
+   * English
+   */
+  ENGLISH = 0;
+
+  /*
+   * French
+   */
+  FRENCH = 1;
+
+  /*
+   * German
+   */
+  GERMAN = 2;
+
+  /*
+   * Italian
+   */
+  ITALIAN = 3;
+
+  /*
+   * Portuguese
+   */
+  PORTUGUESE = 4;
+
+  /*
+   * Spanish
+   */
+  SPANISH = 5;
+
+  /*
+   * Swedish
+   */
+  SWEDISH = 6;
+
+  /*
+   * Finnish
+   */
+  FINNISH = 7;
+
+  /*
+   * Polish
+   */
+  POLISH = 8;
+
+  /*
+   * Turkish
+   */
+  TURKISH = 9;
+
+  /*
+   * Serbian
+   */
+  SERBIAN = 10;
+
+  /*
+   * Russian
+   */
+  RUSSIAN = 11;
+
+  /*
+   * Dutch
+   */
+  DUTCH = 12;
+
+  /*
+   * Greek
+   */
+  GREEK = 13;
+
+  /*
+   * Norwegian
+   */
+  NORWEGIAN = 14;
+
+  /*
+   * Slovenian
+   */
+  SLOVENIAN = 15;
+
+  /*
+   * Ukrainian
+   */
+  UKRAINIAN = 16;
+
+  /*
+   * Bulgarian
+   */
+  BULGARIAN = 17;
+
+  /*
+   * Czech
+   */
+  CZECH = 18;
+
+  /*
+   * Danish
+   */
+  DANISH = 19;
+
+  /*
+   * Simplified Chinese (experimental)
+   */
+  SIMPLIFIED_CHINESE = 30;
+
+  /*
+   * Traditional Chinese (experimental)
+   */
+  TRADITIONAL_CHINESE = 31;
+}

meshtastic/deviceonly.options

@@ -1,14 +1,18 @@
 # options for nanopb
 # https://jpa.kapsi.fi/nanopb/docs/reference.html#proto-file-options
 
-# FIXME pick a higher number someday? or do dynamic alloc in nanopb?
-*DeviceState.node_db max_count:80
-
 # FIXME - max_count is actually 32 but we save/load this as one long string of preencoded MeshPacket bytes - not a big array in RAM
 *DeviceState.receive_queue max_count:1
 
 *ChannelFile.channels max_count:8
 
-*OEMStore.oem_text max_size:40
-*OEMStore.oem_icon_bits max_size:2048
-*OEMStore.oem_aes_key max_size:32
+*DeviceState.node_remote_hardware_pins max_count:12
+
+*NodeInfoLite.channel int_size:8
+*NodeInfoLite.hops_away int_size:8
+*NodeInfoLite.next_hop int_size:8
+
+*UserLite.long_name max_size:40
+*UserLite.short_name max_size:5
+*UserLite.public_key max_size:32 # public key
+*UserLite.macaddr max_size:6 fixed_length:true

meshtastic/deviceonly.proto

@@ -2,15 +2,176 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "DeviceOnly";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
+/* trunk-ignore(buf-lint/COMPILE) */
 import "meshtastic/channel.proto";
+import "meshtastic/config.proto";
 import "meshtastic/localonly.proto";
 import "meshtastic/mesh.proto";
+import "meshtastic/telemetry.proto";
+import "nanopb.proto";
+
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "DeviceOnly";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
+option (nanopb_fileopt).include = "<vector>";
+
+/*
+ * Position with static location information only for NodeDBLite
+ */
+message PositionLite {
+  /*
+   * The new preferred location encoding, multiply by 1e-7 to get degrees
+   * in floating point
+   */
+  sfixed32 latitude_i = 1;
+
+  /*
+   * TODO: REPLACE
+   */
+  sfixed32 longitude_i = 2;
+
+  /*
+   * In meters above MSL (but see issue #359)
+   */
+  int32 altitude = 3;
+
+  /*
+   * This is usually not sent over the mesh (to save space), but it is sent
+   * from the phone so that the local device can set its RTC If it is sent over
+   * the mesh (because there are devices on the mesh without GPS), it will only
+   * be sent by devices which has a hardware GPS clock.
+   * seconds since 1970
+   */
+  fixed32 time = 4;
+
+  /*
+   * TODO: REPLACE
+   */
+  Position.LocSource location_source = 5;
+}
+
+message UserLite {
+  /*
+   * This is the addr of the radio.
+   */
+  bytes macaddr = 1 [deprecated = true];
+
+  /*
+   * A full name for this user, i.e. "Kevin Hester"
+   */
+  string long_name = 2;
+
+  /*
+   * A VERY short name, ideally two characters.
+   * Suitable for a tiny OLED screen
+   */
+  string short_name = 3;
+
+  /*
+   * TBEAM, HELTEC, etc...
+   * Starting in 1.2.11 moved to hw_model enum in the NodeInfo object.
+   * Apps will still need the string here for older builds
+   * (so OTA update can find the right image), but if the enum is available it will be used instead.
+   */
+  HardwareModel hw_model = 4;
+
+  /*
+   * In some regions Ham radio operators have different bandwidth limitations than others.
+   * If this user is a licensed operator, set this flag.
+   * Also, "long_name" should be their licence number.
+   */
+  bool is_licensed = 5;
+
+  /*
+   * Indicates that the user's role in the mesh
+   */
+  Config.DeviceConfig.Role role = 6;
+
+  /*
+   * The public key of the user's device.
+   * This is sent out to other nodes on the mesh to allow them to compute a shared secret key.
+   */
+  bytes public_key = 7;
+
+  /*
+   * Whether or not the node can be messaged
+   */
+  optional bool is_unmessagable = 9;
+}
+
+message NodeInfoLite {
+  /*
+   * The node number
+   */
+  uint32 num = 1;
+
+  /*
+   * The user info for this node
+   */
+  UserLite user = 2;
+
+  /*
+   * This position data. Note: before 1.2.14 we would also store the last time we've heard from this node in position.time, that is no longer true.
+   * Position.time now indicates the last time we received a POSITION from that node.
+   */
+  PositionLite position = 3;
+
+  /*
+   * Returns the Signal-to-noise ratio (SNR) of the last received message,
+   * as measured by the receiver. Return SNR of the last received message in dB
+   */
+  float snr = 4;
+
+  /*
+   * Set to indicate the last time we received a packet from this node
+   */
+  fixed32 last_heard = 5;
+  /*
+   * The latest device metrics for the node.
+   */
+  DeviceMetrics device_metrics = 6;
+
+  /*
+   * local channel index we heard that node on. Only populated if its not the default channel.
+   */
+  uint32 channel = 7;
+
+  /*
+   * True if we witnessed the node over MQTT instead of LoRA transport
+   */
+  bool via_mqtt = 8;
+
+  /*
+   * Number of hops away from us this node is (0 if direct neighbor)
+   */
+  optional uint32 hops_away = 9;
+
+  /*
+   * True if node is in our favorites list
+   * Persists between NodeDB internal clean ups
+   */
+  bool is_favorite = 10;
+
+  /*
+   * True if node is in our ignored list
+   * Persists between NodeDB internal clean ups
+   */
+  bool is_ignored = 11;
+
+  /*
+   * Last byte of the node number of the node that should be used as the next hop to reach this node.
+   */
+  uint32 next_hop = 12;
+
+  /*
+   * Bitfield for storing booleans.
+   * LSB 0 is_key_manually_verified
+   * LSB 1 is_muted
+   */
+  uint32 bitfield = 13;
+}
 
 /*
  * This message is never sent over the wire, but it is used for serializing DB
@@ -20,7 +181,6 @@ import "meshtastic/mesh.proto";
  * the receive queue and use the preferences store for the other stuff
  */
 message DeviceState {
-
   /*
    * Read only settings/info about this node
    */
@@ -31,11 +191,6 @@ message DeviceState {
    */
   User owner = 3;
 
-  /*
-   * TODO: REPLACE
-   */
-  repeated NodeInfo node_db = 4;
-
   /*
    * Received packets saved for delivery to the phone
    */
@@ -58,21 +213,47 @@ message DeviceState {
   /*
    * Used only during development.
    * Indicates developer is testing and changes should never be saved to flash.
+   * Deprecated in 2.3.1
    */
-  bool no_save = 9;
+  bool no_save = 9 [deprecated = true];
 
   /*
-   * Some GPS receivers seem to have bogus settings from the factory, so we always do one factory reset.
+   * Previously used to manage GPS factory resets.
+   * Deprecated in 2.5.23
    */
-  bool did_gps_reset = 11;
+  bool did_gps_reset = 11 [deprecated = true];
 
+  /*
+   * We keep the last received waypoint stored in the device flash,
+   * so we can show it on the screen.
+   * Might be null
+   */
+  MeshPacket rx_waypoint = 12;
+
+  /*
+   * The mesh's nodes with their available gpio pins for RemoteHardware module
+   */
+  repeated NodeRemoteHardwarePin node_remote_hardware_pins = 13;
+}
+
+message NodeDatabase {
+  /*
+   * A version integer used to invalidate old save files when we make
+   * incompatible changes This integer is set at build time and is private to
+   * NodeDB.cpp in the device code.
+   */
+  uint32 version = 1;
+
+  /*
+   * New lite version of NodeDB to decrease memory footprint
+   */
+  repeated NodeInfoLite nodes = 2 [(nanopb).callback_datatype = "std::vector<meshtastic_NodeInfoLite>"];
 }
 
 /*
  * The on-disk saved channels
  */
 message ChannelFile {
-
   /*
    * The channels our node knows about
    */
@@ -87,69 +268,36 @@ message ChannelFile {
 }
 
 /*
- * TODO: REPLACE
+ * The on-disk backup of the node's preferences
  */
-enum ScreenFonts {
+message BackupPreferences {
+  /*
+   * The version of the backup
+   */
+  uint32 version = 1;
 
   /*
-   * TODO: REPLACE
+   * The timestamp of the backup (if node has time)
    */
-  FONT_SMALL = 0;
+  fixed32 timestamp = 2;
 
   /*
-   * TODO: REPLACE
+   * The node's configuration
    */
-  FONT_MEDIUM = 1;
+  LocalConfig config = 3;
 
   /*
-   * TODO: REPLACE
+   * The node's module configuration
    */
-  FONT_LARGE = 2;
-}
-
-/*
- * This can be used for customizing the firmware distribution. If populated,
- * show a secondary bootup screen with custom logo and text for 2.5 seconds.
- */
-message OEMStore {
-
-  /*
-   * The Logo width in Px
-   */
-  uint32 oem_icon_width = 1;
-
-  /*
-   * The Logo height in Px
-   */
-  uint32 oem_icon_height = 2;
-
-  /*
-   * The Logo in XBM bytechar format
-   */
-  bytes oem_icon_bits = 3;
-
-  /*
-   * Use this font for the OEM text.
-   */
-  ScreenFonts oem_font = 4;
-
-  /*
-   * Use this font for the OEM text.
-   */
-  string oem_text = 5;
-
-  /*
-   * The default device encryption key, 16 or 32 byte
-   */
-  bytes oem_aes_key = 6;
-
-  /*
-   * A Preset LocalConfig to apply during factory reset
-   */
-  LocalConfig oem_local_config = 7;
-
-  /*
-   * A Preset LocalModuleConfig to apply during factory reset
-   */
-  LocalModuleConfig oem_local_module_config = 8;
+  LocalModuleConfig module_config = 4;
+
+  /*
+   * The node's channels
+   */
+  ChannelFile channels = 5;
+
+  /*
+   * The node's user (owner) information
+   */
+  User owner = 6;
 }

meshtastic/interdevice.options

@@ -0,0 +1 @@
+*InterdeviceMessage.nmea max_size:1024

meshtastic/interdevice.proto

@@ -0,0 +1,44 @@
+syntax = "proto3";
+
+package meshtastic;
+
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "InterdeviceProtos";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
+
+// encapsulate up to 1k of NMEA string data
+
+enum MessageType {
+  ACK = 0;
+  COLLECT_INTERVAL = 160; // in ms
+  BEEP_ON = 161; // duration ms
+  BEEP_OFF = 162; // cancel prematurely
+  SHUTDOWN = 163;
+  POWER_ON = 164;
+  SCD41_TEMP = 176;
+  SCD41_HUMIDITY = 177;
+  SCD41_CO2 = 178;
+  AHT20_TEMP = 179;
+  AHT20_HUMIDITY = 180;
+  TVOC_INDEX = 181;
+}
+
+message SensorData {
+  // The message type
+  MessageType type = 1;
+  // The sensor data, either as a float or an uint32
+  oneof data {
+    float float_value = 2;
+    uint32 uint32_value = 3;
+  }
+}
+
+message InterdeviceMessage {
+  // The message data
+  oneof data {
+    string nmea = 1;
+    SensorData sensor = 2;
+  }
+}

meshtastic/localonly.proto

@@ -2,15 +2,15 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "LocalOnlyProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
 import "meshtastic/config.proto";
 import "meshtastic/module_config.proto";
 
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "LocalOnlyProtos";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
+
 /*
  * Protobuf structures common to apponly.proto and deviceonly.proto
  * This is never sent over the wire, only for local use
@@ -58,6 +58,11 @@ message LocalConfig {
    * NodeDB.cpp in the device code.
    */
   uint32 version = 8;
+
+  /*
+   * The part of the config that is specific to Security settings
+   */
+  Config.SecurityConfig security = 9;
 }
 
 message LocalModuleConfig {
@@ -106,6 +111,41 @@ message LocalModuleConfig {
    */
   ModuleConfig.RemoteHardwareConfig remote_hardware = 10;
 
+  /*
+   * The part of the config that is specific to the Neighbor Info module
+   */
+  ModuleConfig.NeighborInfoConfig neighbor_info = 11;
+
+  /*
+   * The part of the config that is specific to the Ambient Lighting module
+   */
+  ModuleConfig.AmbientLightingConfig ambient_lighting = 12;
+
+  /*
+   * The part of the config that is specific to the Detection Sensor module
+   */
+  ModuleConfig.DetectionSensorConfig detection_sensor = 13;
+
+  /*
+   * Paxcounter Config
+   */
+  ModuleConfig.PaxcounterConfig paxcounter = 14;
+
+  /*
+   * StatusMessage Config
+   */
+  ModuleConfig.StatusMessageConfig statusmessage = 15;
+
+  /*
+   * The part of the config that is specific to the Traffic Management module
+   */
+  ModuleConfig.TrafficManagementConfig traffic_management = 16;
+
+  /*
+   * TAK Config
+   */
+  ModuleConfig.TAKConfig tak = 17;
+
   /*
    * A version integer used to invalidate old save files when we make
    * incompatible changes This integer is set at build time and is private to

meshtastic/mesh.options

@@ -3,28 +3,46 @@
 
 *macaddr max_size:6 fixed_length:true # macaddrs
 *id max_size:16 # node id strings
+*public_key max_size:32 # public key
 
 *User.long_name max_size:40
 *User.short_name max_size:5
 
 *RouteDiscovery.route max_count:8
+*RouteDiscovery.snr_towards max_count:8
+*RouteDiscovery.snr_towards int_size:8
+*RouteDiscovery.route_back max_count:8
+*RouteDiscovery.snr_back max_count:8
+*RouteDiscovery.snr_back int_size:8
 
 # note: this payload length is ONLY the bytes that are sent inside of the Data protobuf (excluding protobuf overhead). The 16 byte header is
 # outside of this envelope
-*Data.payload max_size:237
+*Data.payload max_size:233
+*Data.bitfield int_size:8
+
+*NodeInfo.channel int_size:8
+*NodeInfo.hops_away int_size:8
 
 # Big enough for 1.2.28.568032c-d
 *MyNodeInfo.firmware_version max_size:18
+*MyNodeInfo.device_id max_size:16
+*MyNodeInfo.pio_env max_size:40
 
 *MyNodeInfo.air_period_tx       max_count:8
 *MyNodeInfo.air_period_rx       max_count:8
 
+*MyNodeInfo.firmware_edition int_size:8
+*MyNodeInfo.nodedb_count int_size:16
+
 # Note: the actual limit (because of header bytes) on the size of encrypted payloads is 251 bytes, but I use 256
 # here because we might need to fill with zeros for padding to encryption block size (16 bytes per block)
 *MeshPacket.encrypted max_size:256
 *MeshPacket.payload_variant anonymous_oneof:true
 *MeshPacket.hop_limit int_size:8
+*MeshPacket.hop_start int_size:8
 *MeshPacket.channel int_size:8
+*MeshPacket.next_hop int_size:8
+*MeshPacket.relay_node int_size:8
 
 *QueueStatus.res int_size:8
 *QueueStatus.free int_size:8
@@ -36,17 +54,47 @@
 
 *Routing.variant anonymous_oneof:true
 
-*LogRecord.message max_size:64
-*LogRecord.source max_size:8
+*LogRecord.message max_size:384
+*LogRecord.source max_size:32
+
+*FileInfo.file_name max_size:228
+
+*ClientNotification.message max_size:400
+
+*KeyVerificationNumberInform.remote_longname max_size:40
+*KeyVerificationNumberRequest.remote_longname max_size:40
+*KeyVerificationFinal.remote_longname max_size:40
+*KeyVerificationFinal.verification_characters max_size:10
+
+*KeyVerification.hash1 max_size:32
+*KeyVerification.hash2 max_size:32
+
+*StoreForwardPlusPlus.message_hash max_size:32
+*StoreForwardPlusPlus.commit_hash max_size:32
+*StoreForwardPlusPlus.root_hash max_size:32
+*StoreForwardPlusPlus.message max_size:240
+
+*RemoteShell.payload max_size:200
+
+*StatusMessage.status max_size:80
 
 # MyMessage.name         max_size:40 
 # or fixed_length or fixed_count, or max_count
 
-
 #This value may want to be a few bytes smaller to compensate for the parent fields.
-*Compressed.data max_size:237
+*Compressed.data max_size:233
 
 *Waypoint.name         max_size:30
 *Waypoint.description  max_size:100
 
+*NeighborInfo.neighbors max_count:10
+
 *DeviceMetadata.firmware_version max_size:18
+
+*MqttClientProxyMessage.topic max_size:60
+*MqttClientProxyMessage.data max_size:435
+*MqttClientProxyMessage.text max_size:435
+
+*ChunkedPayload.chunk_count int_size:16
+*ChunkedPayload.chunk_index int_size:16
+*ChunkedPayload.payload_chunk max_size:228

meshtastic/module_config.options

@@ -2,7 +2,8 @@
 
 *MQTTConfig.address max_size:64
 *MQTTConfig.username max_size:64
-*MQTTConfig.password max_size:64
+*MQTTConfig.password max_size:32
+*MQTTConfig.root max_size:32
 
 *AudioConfig.ptt_pin int_size:8
 *AudioConfig.i2s_ws int_size:8
@@ -13,3 +14,18 @@
 *ExternalNotificationConfig.output_vibra int_size:8
 *ExternalNotificationConfig.output_buzzer int_size:8
 *ExternalNotificationConfig.nag_timeout int_size:16
+
+*RemoteHardwareConfig.available_pins max_count:4
+*RemoteHardwarePin.name max_size:15
+*RemoteHardwarePin.gpio_pin int_size:8
+
+*AmbientLightingConfig.current int_size:8
+*AmbientLightingConfig.red int_size:8
+*AmbientLightingConfig.green int_size:8
+*AmbientLightingConfig.blue int_size:8
+
+*DetectionSensorConfig.monitor_pin int_size:8
+*DetectionSensorConfig.name max_size:20
+*DetectionSensorConfig.detection_trigger_type max_size:8
+
+*StatusMessageConfig.node_status max_size:80

meshtastic/module_config.proto

@@ -2,26 +2,26 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "ModuleConfigProtos";
-option go_package = "github.com/meshtastic/go/generated";
+import "meshtastic/atak.proto";
+
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "ModuleConfigProtos";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
  * Module Config
  */
 message ModuleConfig {
-
   /*
    * MQTT Client Config
    */
   message MQTTConfig {
-
     /*
      * If a meshtastic node is able to reach the internet it will normally attempt to gateway any channels that are marked as
      * is_uplink_enabled or is_downlink_enabled.
-    */
+     */
     bool enabled = 1;
 
     /*
@@ -56,38 +56,183 @@ message ModuleConfig {
      * Whether to send / consume json packets on MQTT
      */
     bool json_enabled = 6;
+
+    /*
+     * If true, we attempt to establish a secure connection using TLS
+     */
+    bool tls_enabled = 7;
+
+    /*
+     * The root topic to use for MQTT messages. Default is "msh".
+     * This is useful if you want to use a single MQTT server for multiple meshtastic networks and separate them via ACLs
+     */
+    string root = 8;
+
+    /*
+     * If true, we can use the connected phone / client to proxy messages to MQTT instead of a direct connection
+     */
+    bool proxy_to_client_enabled = 9;
+
+    /*
+     * If true, we will periodically report unencrypted information about our node to a map via MQTT
+     */
+    bool map_reporting_enabled = 10;
+
+    /*
+     * Settings for reporting information about our node to a map via MQTT
+     */
+    MapReportSettings map_report_settings = 11;
+  }
+
+  /*
+   * Settings for reporting unencrypted information about our node to a map via MQTT
+   */
+  message MapReportSettings {
+    /*
+     * How often we should report our info to the map (in seconds)
+     */
+    uint32 publish_interval_secs = 1;
+
+    /*
+     * Bits of precision for the location sent (default of 32 is full precision).
+     */
+    uint32 position_precision = 2;
+
+    /*
+     * Whether we have opted-in to report our location to the map
+     */
+    bool should_report_location = 3;
   }
 
   /*
    * RemoteHardwareModule Config
    */
   message RemoteHardwareConfig {
-
     /*
      * Whether the Module is enabled
      */
     bool enabled = 1;
+
+    /*
+     * Whether the Module allows consumers to read / write to pins not defined in available_pins
+     */
+    bool allow_undefined_pin_access = 2;
+
+    /*
+     * Exposes the available pins to the mesh for reading and writing
+     */
+    repeated RemoteHardwarePin available_pins = 3;
+  }
+
+  /*
+   * NeighborInfoModule Config
+   */
+  message NeighborInfoConfig {
+    /*
+     * Whether the Module is enabled
+     */
+    bool enabled = 1;
+
+    /*
+     * Interval in seconds of how often we should try to send our
+     * Neighbor Info (minimum is 14400, i.e., 4 hours)
+     */
+    uint32 update_interval = 2;
+
+    /*
+     * Whether in addition to sending it to MQTT and the PhoneAPI, our NeighborInfo should be transmitted over LoRa.
+     * Note that this is not available on a channel with default key and name.
+     */
+    bool transmit_over_lora = 3;
+  }
+
+  /*
+   * Detection Sensor Module Config
+   */
+  message DetectionSensorConfig {
+    enum TriggerType {
+      // Event is triggered if pin is low
+      LOGIC_LOW = 0;
+      // Event is triggered if pin is high
+      LOGIC_HIGH = 1;
+      // Event is triggered when pin goes high to low
+      FALLING_EDGE = 2;
+      // Event is triggered when pin goes low to high
+      RISING_EDGE = 3;
+      // Event is triggered on every pin state change, low is considered to be
+      // "active"
+      EITHER_EDGE_ACTIVE_LOW = 4;
+      // Event is triggered on every pin state change, high is considered to be
+      // "active"
+      EITHER_EDGE_ACTIVE_HIGH = 5;
+    }
+    /*
+     * Whether the Module is enabled
+     */
+    bool enabled = 1;
+
+    /*
+     * Interval in seconds of how often we can send a message to the mesh when a
+     * trigger event is detected
+     */
+    uint32 minimum_broadcast_secs = 2;
+
+    /*
+     * Interval in seconds of how often we should send a message to the mesh
+     * with the current state regardless of trigger events When set to 0, only
+     * trigger events will be broadcasted Works as a sort of status heartbeat
+     * for peace of mind
+     */
+    uint32 state_broadcast_secs = 3;
+
+    /*
+     * Send ASCII bell with alert message
+     * Useful for triggering ext. notification on bell
+     */
+    bool send_bell = 4;
+
+    /*
+     * Friendly name used to format message sent to mesh
+     * Example: A name "Motion" would result in a message "Motion detected"
+     * Maximum length of 20 characters
+     */
+    string name = 5;
+
+    /*
+     * GPIO pin to monitor for state changes
+     */
+    uint32 monitor_pin = 6;
+
+    /*
+     * The type of trigger event to be used
+     */
+    TriggerType detection_trigger_type = 7;
+
+    /*
+     * Whether or not use INPUT_PULLUP mode for GPIO pin
+     * Only applicable if the board uses pull-up resistors on the pin
+     */
+    bool use_pullup = 8;
   }
 
   /*
    * Audio Config for codec2 voice
    */
   message AudioConfig {
-
     /*
      * Baudrate for codec2 voice
      */
     enum Audio_Baud {
       CODEC2_DEFAULT = 0;
-      CODEC2_3200 = 1; 
-      CODEC2_2400 = 2; 
-      CODEC2_1600 = 3; 
-      CODEC2_1400 = 4; 
-      CODEC2_1300 = 5; 
-      CODEC2_1200 = 6; 
+      CODEC2_3200 = 1;
+      CODEC2_2400 = 2;
+      CODEC2_1600 = 3;
+      CODEC2_1400 = 4;
+      CODEC2_1300 = 5;
+      CODEC2_1200 = 6;
       CODEC2_700 = 7;
-      CODEC2_700B = 8; 
-    };
+      CODEC2_700B = 8;
+    }
 
     /*
      * Whether Audio is enabled
@@ -125,11 +270,113 @@ message ModuleConfig {
     uint32 i2s_sck = 7;
   }
 
+  /*
+   * Config for the Paxcounter Module
+   */
+  message PaxcounterConfig {
+    /*
+     * Enable the Paxcounter Module
+     */
+    bool enabled = 1;
+
+    /*
+     * Interval in seconds of how often we should try to send our
+     * metrics to the mesh
+     */
+
+    uint32 paxcounter_update_interval = 2;
+
+    /*
+     * WiFi RSSI threshold. Defaults to -80
+     */
+    int32 wifi_threshold = 3;
+
+    /*
+     * BLE RSSI threshold. Defaults to -80
+     */
+    int32 ble_threshold = 4;
+  }
+
+  /*
+   * Config for the Traffic Management module.
+   * Provides packet inspection and traffic shaping to help reduce channel utilization
+   */
+  message TrafficManagementConfig {
+    /*
+     * Master enable for traffic management module
+     */
+    bool enabled = 1;
+
+    /*
+     * Enable position deduplication to drop redundant position broadcasts
+     */
+    bool position_dedup_enabled = 2;
+
+    /*
+     * Number of bits of precision for position deduplication (0-32)
+     */
+    uint32 position_precision_bits = 3;
+
+    /*
+     * Minimum interval in seconds between position updates from the same node
+     */
+    uint32 position_min_interval_secs = 4;
+
+    /*
+     * Enable direct response to NodeInfo requests from local cache
+     */
+    bool nodeinfo_direct_response = 5;
+
+    /*
+     * Minimum hop distance from requestor before responding to NodeInfo requests
+     */
+    uint32 nodeinfo_direct_response_max_hops = 6;
+
+    /*
+     * Enable per-node rate limiting to throttle chatty nodes
+     */
+    bool rate_limit_enabled = 7;
+
+    /*
+     * Time window in seconds for rate limiting calculations
+     */
+    uint32 rate_limit_window_secs = 8;
+
+    /*
+     * Maximum packets allowed per node within the rate limit window
+     */
+    uint32 rate_limit_max_packets = 9;
+
+    /*
+     * Enable dropping of unknown/undecryptable packets per rate_limit_window_secs
+     */
+    bool drop_unknown_enabled = 10;
+
+    /*
+     * Number of unknown packets before dropping from a node
+     */
+    uint32 unknown_packet_threshold = 11;
+
+    /*
+     * Set hop_limit to 0 for relayed telemetry broadcasts (own packets unaffected)
+     */
+    bool exhaust_hop_telemetry = 12;
+
+    /*
+     * Set hop_limit to 0 for relayed position broadcasts (own packets unaffected)
+     */
+    bool exhaust_hop_position = 13;
+
+    /*
+     * Preserve hop_limit for router-to-router traffic
+     */
+    bool router_preserve_hops = 14;
+  }
+
   /*
    * Serial Config
    */
   message SerialConfig {
-
     /*
      * TODO: REPLACE
      */
@@ -150,7 +397,7 @@ message ModuleConfig {
       BAUD_460800 = 13;
       BAUD_576000 = 14;
       BAUD_921600 = 15;
-    };
+    }
 
     /*
      * TODO: REPLACE
@@ -161,11 +408,23 @@ message ModuleConfig {
       PROTO = 2;
       TEXTMSG = 3;
       NMEA = 4;
-    };
+      // NMEA messages specifically tailored for CalTopo
+      CALTOPO = 5;
+      // Ecowitt WS85 weather station
+      WS85 = 6;
+      // VE.Direct is a serial protocol used by Victron Energy products
+      // https://beta.ivc.no/wiki/index.php/Victron_VE_Direct_DIY_Cable
+      VE_DIRECT = 7;
+      // Used to configure and view some parameters of MeshSolar.
+      // https://heltec.org/project/meshsolar/
+      MS_CONFIG = 8;
+      // Logs mesh traffic to the serial pins, ideal for logging via openLog or similar.
+      LOG = 9; // includes other packets
+      LOGTEXT = 10; // only text (channel & DM)
+    }
 
     /*
      * Preferences for the SerialModule
-     * FIXME - Move this out of UserPreferences and into a section for module configuration.
      */
     bool enabled = 1;
 
@@ -173,19 +432,19 @@ message ModuleConfig {
      * TODO: REPLACE
      */
     bool echo = 2;
- 
+
     /*
-     * TODO: REPLACE
+     * RX pin (should match Arduino gpio pin number)
      */
     uint32 rxd = 3;
- 
+
     /*
-     * TODO: REPLACE
+     * TX pin (should match Arduino gpio pin number)
      */
     uint32 txd = 4;
 
     /*
-     * TODO: REPLACE
+     * Serial baud rate
      */
     Serial_Baud baud = 5;
 
@@ -193,19 +452,24 @@ message ModuleConfig {
      * TODO: REPLACE
      */
     uint32 timeout = 6;
- 
+
     /*
-     * TODO: REPLACE
+     * Mode for serial module operation
      */
     Serial_Mode mode = 7;
 
+    /*
+     * Overrides the platform's defacto Serial port instance to use with Serial module config settings
+     * This is currently only usable in output modes like NMEA / CalTopo and may behave strangely or not work at all in other modes
+     * Existing logging over the Serial Console will still be present
+     */
+    bool override_console_serial_port = 8;
   }
 
   /*
    * External Notifications Config
    */
   message ExternalNotificationConfig {
-
     /*
      * Enable the ExternalNotificationModule
      */
@@ -285,6 +549,12 @@ message ModuleConfig {
      * and/or beep for 60 seconds
      */
     uint32 nag_timeout = 14;
+
+    /*
+     * When true, enables devices with native I2S audio output to use the RTTTL over speaker like a buzzer
+     * T-Watch S3 and T-Deck for example have this capability
+     */
+    bool use_i2s_as_buzzer = 15;
   }
 
   /*
@@ -300,22 +570,26 @@ message ModuleConfig {
      * TODO: REPLACE
      */
     bool heartbeat = 2;
- 
+
     /*
      * TODO: REPLACE
      */
     uint32 records = 3;
- 
+
     /*
      * TODO: REPLACE
      */
     uint32 history_return_max = 4;
- 
+
     /*
      * TODO: REPLACE
      */
     uint32 history_return_window = 5;
 
+    /*
+     * Set to true to let this node act as a server that stores received messages and resends them upon request.
+     */
+    bool is_server = 6;
   }
 
   /*
@@ -333,17 +607,22 @@ message ModuleConfig {
     uint32 sender = 2;
 
     /*
-     * Bool value indicating that this node should save a RangeTest.csv file. 
+     * Bool value indicating that this node should save a RangeTest.csv file.
      * ESP32 Only
      */
     bool save = 3;
+
+    /*
+     * Bool indicating that the node should cleanup / destroy it's RangeTest.csv file.
+     * ESP32 Only
+     */
+    bool clear_on_reboot = 4;
   }
 
   /*
    * Configuration for both device and environment metrics
    */
   message TelemetryConfig {
-    
     /*
      * Interval in seconds of how often we should try to send our
      * device metrics to the mesh
@@ -384,53 +663,95 @@ message ModuleConfig {
      * air quality metrics to the mesh
      */
     uint32 air_quality_interval = 7;
+
+    /*
+     * Enable/disable Power metrics
+     */
+    bool power_measurement_enabled = 8;
+
+    /*
+     * Interval in seconds of how often we should try to send our
+     * power metrics to the mesh
+     */
+    uint32 power_update_interval = 9;
+
+    /*
+     * Enable/Disable the power measurement module on-device display
+     */
+    bool power_screen_enabled = 10;
+
+    /*
+     * Preferences for the (Health) Telemetry Module
+     * Enable/Disable the telemetry measurement module measurement collection
+     */
+    bool health_measurement_enabled = 11;
+
+    /*
+     * Interval in seconds of how often we should try to send our
+     * health metrics to the mesh
+     */
+    uint32 health_update_interval = 12;
+
+    /*
+     * Enable/Disable the health telemetry module on-device display
+     */
+    bool health_screen_enabled = 13;
+
+    /*
+     * Enable/Disable the device telemetry module to send metrics to the mesh
+     * Note: We will still send telemtry to the connected phone / client every minute over the API
+     */
+    bool device_telemetry_enabled = 14;
+
+    /*
+     * Enable/Disable the air quality telemetry measurement module on-device display
+     */
+    bool air_quality_screen_enabled = 15;
   }
 
   /*
-   * TODO: REPLACE
+   * Canned Messages Module Config
    */
   message CannedMessageConfig {
-    
     /*
      * TODO: REPLACE
      */
     enum InputEventChar {
-    
       /*
        * TODO: REPLACE
        */
-      NONE  = 0;
-    
+      NONE = 0;
+
       /*
        * TODO: REPLACE
        */
-      UP    = 17;
-    
+      UP = 17;
+
       /*
        * TODO: REPLACE
        */
-      DOWN  = 18;
-    
+      DOWN = 18;
+
       /*
        * TODO: REPLACE
        */
-      LEFT  = 19;
-    
+      LEFT = 19;
+
       /*
        * TODO: REPLACE
        */
-      RIGHT =  20;
-    
+      RIGHT = 20;
+
       /*
        * '\n'
        */
       SELECT = 10;
-    
+
       /*
        * TODO: REPLACE
        */
-      BACK  = 27;
-    
+      BACK = 27;
+
       /*
        * TODO: REPLACE
        */
@@ -446,48 +767,48 @@ message ModuleConfig {
      * GPIO pin for rotary encoder A port.
      */
     uint32 inputbroker_pin_a = 2;
- 
+
     /*
      * GPIO pin for rotary encoder B port.
      */
     uint32 inputbroker_pin_b = 3;
- 
+
     /*
      * GPIO pin for rotary encoder Press port.
      */
     uint32 inputbroker_pin_press = 4;
- 
+
     /*
      * Generate input event on CW of this kind.
      */
     InputEventChar inputbroker_event_cw = 5;
- 
+
     /*
      * Generate input event on CCW of this kind.
      */
     InputEventChar inputbroker_event_ccw = 6;
- 
+
     /*
      * Generate input event on Press of this kind.
      */
     InputEventChar inputbroker_event_press = 7;
- 
+
     /*
      * Enable the Up/Down/Select input device. Can be RAK rotary encoder or 3 buttons. Uses the a/b/press definitions from inputbroker.
      */
     bool updown1_enabled = 8;
-    
+
     /*
      * Enable/disable CannedMessageModule.
      */
-    bool enabled = 9;
- 
+    bool enabled = 9 [deprecated = true];
+
     /*
      * Input event origin accepted by the canned message module.
-     * Can be e.g. "rotEnc1", "upDownEnc1" or keyword "_any"
+     * Can be e.g. "rotEnc1", "upDownEnc1", "scanAndSelect", "cardkb", "serialkb", or keyword "_any"
      */
-    string allow_input_source = 10;
- 
+    string allow_input_source = 10 [deprecated = true];
+
     /*
      * CannedMessageModule also sends a bell character with the messages.
      * ExternalNotificationModule can benefit from this feature.
@@ -495,11 +816,51 @@ message ModuleConfig {
     bool send_bell = 11;
   }
 
+  /*
+     Ambient Lighting Module - Settings for control of onboard LEDs to allow users to adjust the brightness levels and respective color levels.
+     Initially created for the RAK14001 RGB LED module.
+  */
+  message AmbientLightingConfig {
+    /*
+     * Sets LED to on or off.
+     */
+    bool led_state = 1;
+
+    /*
+     * Sets the current for the LED output. Default is 10.
+     */
+    uint32 current = 2;
+
+    /*
+     * Sets the red LED level. Values are 0-255.
+     */
+    uint32 red = 3;
+
+    /*
+     * Sets the green LED level. Values are 0-255.
+     */
+    uint32 green = 4;
+
+    /*
+     * Sets the blue LED level. Values are 0-255.
+     */
+    uint32 blue = 5;
+  }
+
+  /*
+   * StatusMessage config - Allows setting a status message for a node to periodically rebroadcast
+   */
+  message StatusMessageConfig {
+    /*
+     * The actual status string
+     */
+    string node_status = 1;
+  }
+
   /*
    * TODO: REPLACE
    */
   oneof payload_variant {
-
     /*
      * TODO: REPLACE
      */
@@ -545,5 +906,92 @@ message ModuleConfig {
      */
     RemoteHardwareConfig remote_hardware = 9;
 
+    /*
+     * TODO: REPLACE
+     */
+    NeighborInfoConfig neighbor_info = 10;
+
+    /*
+     * TODO: REPLACE
+     */
+    AmbientLightingConfig ambient_lighting = 11;
+
+    /*
+     * TODO: REPLACE
+     */
+    DetectionSensorConfig detection_sensor = 12;
+
+    /*
+     * TODO: REPLACE
+     */
+    PaxcounterConfig paxcounter = 13;
+
+    /*
+     * TODO: REPLACE
+     */
+    StatusMessageConfig statusmessage = 14;
+
+    /*
+     * Traffic management module config for mesh network optimization
+     */
+    TrafficManagementConfig traffic_management = 15;
+
+    /*
+     * TAK team/role configuration for TAK_TRACKER
+     */
+    TAKConfig tak = 16;
+  }
+
+  /*
+   * TAK team/role configuration
+   */
+  message TAKConfig {
+    /*
+     * Team color.
+     * Default Unspecifed_Color -> firmware uses Cyan
+     */
+    Team team = 1;
+    /*
+     * Member role.
+     * Default Unspecifed -> firmware uses TeamMember
+     */
+    MemberRole role = 2;
   }
 }
+
+/*
+ * A GPIO pin definition for remote hardware module
+ */
+message RemoteHardwarePin {
+  /*
+   * GPIO Pin number (must match Arduino)
+   */
+  uint32 gpio_pin = 1;
+
+  /*
+   * Name for the GPIO pin (i.e. Front gate, mailbox, etc)
+   */
+  string name = 2;
+
+  /*
+   * Type of GPIO access available to consumers on the mesh
+   */
+  RemoteHardwarePinType type = 3;
+}
+
+enum RemoteHardwarePinType {
+  /*
+   * Unset/unused
+   */
+  UNKNOWN = 0;
+
+  /*
+   * GPIO pin can be read (if it is high / low)
+   */
+  DIGITAL_READ = 1;
+
+  /*
+   * GPIO pin can be written to (high / low)
+   */
+  DIGITAL_WRITE = 2;
+}

meshtastic/mqtt.options

@@ -1,3 +1,8 @@
 *ServiceEnvelope.packet type:FT_POINTER
 *ServiceEnvelope.channel_id type:FT_POINTER
-*ServiceEnvelope.gateway_id type:FT_POINTER
+*ServiceEnvelope.gateway_id type:FT_POINTER
+
+*MapReport.long_name max_size:40
+*MapReport.short_name max_size:5
+*MapReport.firmware_version max_size:18
+*MapReport.num_online_local_nodes int_size:16

meshtastic/mqtt.proto

@@ -2,19 +2,19 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "MQTTProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
+import "meshtastic/config.proto";
 import "meshtastic/mesh.proto";
 
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "MQTTProtos";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
+
 /*
  * This message wraps a MeshPacket with extra metadata about the sender and how it arrived.
  */
 message ServiceEnvelope {
-
   /*
    * The (probably encrypted) packet
    */
@@ -32,3 +32,81 @@ message ServiceEnvelope {
    */
   string gateway_id = 3;
 }
+
+/*
+ * Information about a node intended to be reported unencrypted to a map using MQTT.
+ */
+message MapReport {
+  /*
+   * A full name for this user, i.e. "Kevin Hester"
+   */
+  string long_name = 1;
+
+  /*
+   * A VERY short name, ideally two characters.
+   * Suitable for a tiny OLED screen
+   */
+  string short_name = 2;
+
+  /*
+   * Role of the node that applies specific settings for a particular use-case
+   */
+  Config.DeviceConfig.Role role = 3;
+
+  /*
+   * Hardware model of the node, i.e. T-Beam, Heltec V3, etc...
+   */
+  HardwareModel hw_model = 4;
+
+  /*
+   * Device firmware version string
+   */
+  string firmware_version = 5;
+
+  /*
+   * The region code for the radio (US, CN, EU433, etc...)
+   */
+  Config.LoRaConfig.RegionCode region = 6;
+
+  /*
+   * Modem preset used by the radio (LongFast, MediumSlow, etc...)
+   */
+  Config.LoRaConfig.ModemPreset modem_preset = 7;
+
+  /*
+   * Whether the node has a channel with default PSK and name (LongFast, MediumSlow, etc...)
+   * and it uses the default frequency slot given the region and modem preset.
+   */
+  bool has_default_channel = 8;
+
+  /*
+   * Latitude: multiply by 1e-7 to get degrees in floating point
+   */
+  sfixed32 latitude_i = 9;
+
+  /*
+   * Longitude: multiply by 1e-7 to get degrees in floating point
+   */
+  sfixed32 longitude_i = 10;
+
+  /*
+   * Altitude in meters above MSL
+   */
+  int32 altitude = 11;
+
+  /*
+   * Indicates the bits of precision for latitude and longitude set by the sending node
+   */
+  uint32 position_precision = 12;
+
+  /*
+   * Number of online nodes (heard in the last 2 hours) this node has in its list that were received locally (not via MQTT)
+   */
+  uint32 num_online_local_nodes = 13;
+
+  /*
+   * User has opted in to share their location (map report) with the mqtt server
+   * Controlled by map_report.should_report_location
+   */
+  bool has_opted_report_location = 14;
+}

meshtastic/paxcount.proto

@@ -0,0 +1,29 @@
+syntax = "proto3";
+
+package meshtastic;
+
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "PaxcountProtos";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
+
+/*
+ * TODO: REPLACE
+ */
+message Paxcount {
+  /*
+   * seen Wifi devices
+   */
+  uint32 wifi = 1;
+
+  /*
+   * Seen BLE devices
+   */
+  uint32 ble = 2;
+
+  /*
+   * Uptime in seconds
+   */
+  uint32 uptime = 3;
+}

meshtastic/portnums.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "Portnums";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "Portnums";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
@@ -23,11 +23,11 @@ option swift_prefix = "";
  * This change is backwards compatible by treating the legacy OPAQUE/CLEAR_TEXT values identically.
  */
 enum PortNum {
-
   /*
    * Deprecated: do not use in new code (formerly called OPAQUE)
    * A message sent from a device outside of the mesh, in a form the mesh does not understand
    * NOTE: This must be 0, because it is documented in IMeshService.aidl to be so
+   * ENCODING: binary undefined
    */
   UNKNOWN_APP = 0;
 
@@ -35,89 +35,154 @@ enum PortNum {
    * A simple UTF-8 text message, which even the little micros in the mesh
    * can understand and show on their screen eventually in some circumstances
    * even signal might send messages in this form (see below)
+   * ENCODING: UTF-8 Plaintext (?)
    */
   TEXT_MESSAGE_APP = 1;
 
   /*
    * Reserved for built-in GPIO/example app.
    * See remote_hardware.proto/HardwareMessage for details on the message sent/received to this port number
+   * ENCODING: Protobuf
    */
   REMOTE_HARDWARE_APP = 2;
 
   /*
    * The built-in position messaging app.
-   * Payload is a [Position](/docs/developers/protobufs/api#position) message
+   * Payload is a Position message.
+   * ENCODING: Protobuf
    */
   POSITION_APP = 3;
 
   /*
    * The built-in user info app.
-   * Payload is a [User](/docs/developers/protobufs/api#user) message
+   * Payload is a User message.
+   * ENCODING: Protobuf
    */
   NODEINFO_APP = 4;
 
   /*
    * Protocol control packets for mesh protocol use.
-   * Payload is a [Routing](/docs/developers/protobufs/api#routing) message
+   * Payload is a Routing message.
+   * ENCODING: Protobuf
    */
   ROUTING_APP = 5;
 
   /*
    * Admin control packets.
-   * Payload is a [AdminMessage](/docs/developers/protobufs/api#adminmessage) message
+   * Payload is a AdminMessage message.
+   * ENCODING: Protobuf
    */
   ADMIN_APP = 6;
 
   /*
    * Compressed TEXT_MESSAGE payloads.
+   * ENCODING: UTF-8 Plaintext (?) with Unishox2 Compression
+   * NOTE: The Device Firmware converts a TEXT_MESSAGE_APP to TEXT_MESSAGE_COMPRESSED_APP if the compressed
+   * payload is shorter. There's no need for app developers to do this themselves. Also the firmware will decompress
+   * any incoming TEXT_MESSAGE_COMPRESSED_APP payload and convert to TEXT_MESSAGE_APP.
    */
   TEXT_MESSAGE_COMPRESSED_APP = 7;
 
   /*
    * Waypoint payloads.
-   * Payload is a [Waypoint](/docs/developers/protobufs/api#waypoint) message
+   * Payload is a Waypoint message.
+   * ENCODING: Protobuf
    */
   WAYPOINT_APP = 8;
 
-  /* Audio Payloads.
+  /*
+   * Audio Payloads.
    * Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now
+   * ENCODING: codec2 audio frames
+   * NOTE: audio frames contain a 3 byte header (0xc0 0xde 0xc2) and a one byte marker for the decompressed bitrate.
+   * This marker comes from the 'moduleConfig.audio.bitrate' enum minus one.
    */
   AUDIO_APP = 9;
 
+  /*
+   * Same as Text Message but originating from Detection Sensor Module.
+   * NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
+   */
+  DETECTION_SENSOR_APP = 10;
+
+  /*
+   * Same as Text Message but used for critical alerts.
+   */
+  ALERT_APP = 11;
+
+  /*
+   * Module/port for handling key verification requests.
+   */
+  KEY_VERIFICATION_APP = 12;
+
+  /*
+   * Module/port for handling primitive remote shell access.
+   */
+  REMOTE_SHELL_APP = 13;
+
   /*
    * Provides a 'ping' service that replies to any packet it receives.
    * Also serves as a small example module.
+   * ENCODING: ASCII Plaintext
    */
   REPLY_APP = 32;
 
   /*
    * Used for the python IP tunnel feature
+   * ENCODING: IP Packet. Handled by the python API, firmware ignores this one and pases on.
    */
   IP_TUNNEL_APP = 33;
 
+  /*
+   * Paxcounter lib included in the firmware
+   * ENCODING: protobuf
+   */
+  PAXCOUNTER_APP = 34;
+
+  /*
+   * Store and Forward++ module included in the firmware
+   * ENCODING: protobuf
+   * This module is specifically for Native Linux nodes, and provides a Git-style
+   * chain of messages.
+   */
+  STORE_FORWARD_PLUSPLUS_APP = 35;
+
+  /*
+   * Node Status module
+   * ENCODING: protobuf
+   * This module allows setting an extra string of status for a node.
+   * Broadcasts on change and on a timer, possibly once a day.
+   */
+  NODE_STATUS_APP = 36;
+
   /*
    * Provides a hardware serial interface to send and receive from the Meshtastic network.
    * Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
    * network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.
    * Maximum packet size of 240 bytes.
    * Module is disabled by default can be turned on by setting SERIAL_MODULE_ENABLED = 1 in SerialPlugh.cpp.
+   * ENCODING: binary undefined
    */
   SERIAL_APP = 64;
 
   /*
    * STORE_FORWARD_APP (Work in Progress)
    * Maintained by Jm Casler (MC Hamster) : jm@casler.org
+   * ENCODING: Protobuf
    */
   STORE_FORWARD_APP = 65;
 
   /*
    * Optional port for messages for the range test module.
+   * ENCODING: ASCII Plaintext
+   * NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
    */
   RANGE_TEST_APP = 66;
 
   /*
    * Provides a format to send and receive telemetry data from the Meshtastic network.
    * Maintained by Charles Crossan (crossan007) : crossan007@gmail.com
+   * ENCODING: Protobuf
    */
   TELEMETRY_APP = 67;
 
@@ -125,23 +190,81 @@ enum PortNum {
    * Experimental tools for estimating node position without a GPS
    * Maintained by Github user a-f-G-U-C (a Meshtastic contributor)
    * Project files at https://github.com/a-f-G-U-C/Meshtastic-ZPS
+   * ENCODING: arrays of int64 fields
    */
   ZPS_APP = 68;
 
   /*
-   * Used to let multiple instances of Linux native applications communicate 
+   * Used to let multiple instances of Linux native applications communicate
    * as if they did using their LoRa chip.
-   * Maintained by GitHub user GUVWAF. 
-   * Project files at https://github.com/GUVWAF/Meshtasticator 
+   * Maintained by GitHub user GUVWAF.
+   * Project files at https://github.com/GUVWAF/Meshtasticator
+   * ENCODING: Protobuf (?)
    */
   SIMULATOR_APP = 69;
 
   /*
    * Provides a traceroute functionality to show the route a packet towards
-   * a certain destination would take on the mesh.
+   * a certain destination would take on the mesh. Contains a RouteDiscovery message as payload.
+   * ENCODING: Protobuf
    */
   TRACEROUTE_APP = 70;
 
+  /*
+   * Aggregates edge info for the network by sending out a list of each node's neighbors
+   * ENCODING: Protobuf
+   */
+  NEIGHBORINFO_APP = 71;
+
+  /*
+   * ATAK Plugin
+   * Portnum for payloads from the official Meshtastic ATAK plugin
+   */
+  ATAK_PLUGIN = 72;
+
+  /*
+   * Provides unencrypted information about a node for consumption by a map via MQTT
+   */
+  MAP_REPORT_APP = 73;
+
+  /*
+   * PowerStress based monitoring support (for automated power consumption testing)
+   */
+  POWERSTRESS_APP = 74;
+
+  /*
+   * LoraWAN Payload Transport
+   * ENCODING: compact binary LoRaWAN uplink (10-byte RF metadata + PHY payload) - see LoRaWANBridgeModule
+   */
+  LORAWAN_BRIDGE = 75;
+
+  /*
+   * Reticulum Network Stack Tunnel App
+   * ENCODING: Fragmented RNS Packet. Handled by Meshtastic RNS interface
+   */
+  RETICULUM_TUNNEL_APP = 76;
+
+  /*
+   * App for transporting Cayenne Low Power Payload, popular for LoRaWAN sensor nodes. Offers ability to send
+   * arbitrary telemetry over meshtastic that is not covered by telemetry.proto
+   * ENCODING: CayenneLLP
+   */
+  CAYENNE_APP = 77;
+
+  /*
+   * ATAK Plugin V2
+   * Portnum for payloads from the official Meshtastic ATAK plugin using
+   * TAKPacketV2 with zstd dictionary compression.
+   */
+  ATAK_PLUGIN_V2 = 78;
+
+  /*
+   * 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"
@@ -151,6 +274,7 @@ enum PortNum {
 
   /*
    * ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder
+   * ENCODING: libcotshrink
    */
   ATAK_FORWARDER = 257;
 

meshtastic/powermon.proto

@@ -0,0 +1,103 @@
+syntax = "proto3";
+
+package meshtastic;
+
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "PowerMonProtos";
+option java_package = "org.meshtastic.proto";
+option swift_prefix = "";
+
+/* Note: There are no 'PowerMon' messages normally in use (PowerMons are sent only as structured logs - slogs).
+ * But we wrap our State enum in this message to effectively nest a namespace (without our linter yelling at us)
+ */
+message PowerMon {
+  /* Any significant power changing event in meshtastic should be tagged with a powermon state transition.
+   * If you are making new meshtastic features feel free to add new entries at the end of this definition.
+   */
+  enum State {
+    None = 0;
+
+    CPU_DeepSleep = 0x01;
+    CPU_LightSleep = 0x02;
+
+    /*
+       The external Vext1 power is on.  Many boards have auxillary power rails that the CPU turns on only
+       occasionally.  In cases where that rail has multiple devices on it we usually want to have logging on
+       the state of that rail as an independent record.
+       For instance on the Heltec Tracker 1.1 board, this rail is the power source for the GPS and screen.
+
+       The log messages will be short and complete (see PowerMon.Event in the protobufs for details).
+       something like "S:PM:C,0x00001234,REASON" where the hex number is the bitmask of all current states.
+       (We use a bitmask for states so that if a log message gets lost it won't be fatal)
+    */
+    Vext1_On = 0x04;
+
+    Lora_RXOn = 0x08;
+    Lora_TXOn = 0x10;
+    Lora_RXActive = 0x20;
+    BT_On = 0x40;
+    LED_On = 0x80;
+
+    Screen_On = 0x100;
+    Screen_Drawing = 0x200;
+    Wifi_On = 0x400;
+
+    /*
+     * GPS is actively trying to find our location
+     * See GPSPowerState for more details
+     */
+    GPS_Active = 0x800;
+  }
+}
+
+/*
+ * PowerStress testing support via the C++ PowerStress module
+ */
+message PowerStressMessage {
+  /*
+   * What operation would we like the UUT to perform.
+   * note: senders should probably set want_response in their request packets, so that they can know when the state
+   * machine has started processing their request
+   */
+  enum Opcode {
+    /*
+     * Unset/unused
+     */
+    UNSET = 0;
+
+    PRINT_INFO = 1; // Print board version slog and send an ack that we are alive and ready to process commands
+    FORCE_QUIET = 2; // Try to turn off all automatic processing of packets, screen, sleeping, etc (to make it easier to measure in isolation)
+    END_QUIET = 3; // Stop powerstress processing - probably by just rebooting the board
+
+    SCREEN_ON = 16; // Turn the screen on
+    SCREEN_OFF = 17; // Turn the screen off
+
+    CPU_IDLE = 32; // Let the CPU run but we assume mostly idling for num_seconds
+    CPU_DEEPSLEEP = 33; // Force deep sleep for FIXME seconds
+    CPU_FULLON = 34; // Spin the CPU as fast as possible for num_seconds
+
+    LED_ON = 48; // Turn the LED on for num_seconds (and leave it on - for baseline power measurement purposes)
+    LED_OFF = 49; // Force the LED off for num_seconds
+
+    LORA_OFF = 64; // Completely turn off the LORA radio for num_seconds
+    LORA_TX = 65; // Send Lora packets for num_seconds
+    LORA_RX = 66; // Receive Lora packets for num_seconds (node will be mostly just listening, unless an external agent is helping stress this by sending packets on the current channel)
+
+    BT_OFF = 80; // Turn off the BT radio for num_seconds
+    BT_ON = 81; // Turn on the BT radio for num_seconds
+
+    WIFI_OFF = 96; // Turn off the WIFI radio for num_seconds
+    WIFI_ON = 97; // Turn on the WIFI radio for num_seconds
+
+    GPS_OFF = 112; // Turn off the GPS radio for num_seconds
+    GPS_ON = 113; // Turn on the GPS radio for num_seconds
+  }
+
+  /*
+   * What type of HardwareMessage is this?
+   */
+  Opcode cmd = 1;
+
+  float num_seconds = 2;
+}

meshtastic/remote_hardware.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "RemoteHardware";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "RemoteHardware";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
@@ -20,12 +20,10 @@ option swift_prefix = "";
  * (a special channel once multichannel support is included?)
  */
 message HardwareMessage {
-
   /*
    * TODO: REPLACE
    */
   enum Type {
-
     /*
      * Unset/unused
      */

meshtastic/rtttl.options

@@ -1 +1 @@
-*RTTTLConfig.ringtone max_size:230
+*RTTTLConfig.ringtone max_size:231

meshtastic/rtttl.proto

@@ -2,17 +2,16 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "RTTTLConfigProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "RTTTLConfigProtos";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
  * Canned message module configuration.
  */
 message RTTTLConfig {
-
   /*
    * Ringtone for PWM Buzzer in RTTTL Format.
    */

meshtastic/storeforward.options

@@ -0,0 +1 @@
+*StoreAndForward.text max_size:233

meshtastic/storeforward.proto

@@ -2,23 +2,21 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "StoreAndForwardProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "StoreAndForwardProtos";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
  * TODO: REPLACE
  */
 message StoreAndForward {
-
   /*
    * 001 - 063 = From Router
    * 064 - 127 = From Client
    */
   enum RequestResponse {
-
     /*
      * Unset/unused
      */
@@ -60,6 +58,16 @@ message StoreAndForward {
      */
     ROUTER_STATS = 7;
 
+    /*
+     * Router sends a text message from its history that was a direct message.
+     */
+    ROUTER_TEXT_DIRECT = 8;
+
+    /*
+     * Router sends a text message from its history that was a broadcast.
+     */
+    ROUTER_TEXT_BROADCAST = 9;
+
     /*
      * Client is an in error state.
      */
@@ -96,7 +104,6 @@ message StoreAndForward {
    * TODO: REPLACE
    */
   message Statistics {
-
     /*
      * Number of messages we have ever seen
      */
@@ -133,12 +140,12 @@ message StoreAndForward {
     bool heartbeat = 7;
 
     /*
-     * Is the heartbeat enabled on the server?
+     * Maximum number of messages the server will return.
      */
     uint32 return_max = 8;
 
     /*
-     * Is the heartbeat enabled on the server?
+     * Maximum history window in minutes the server will return messages from.
      */
     uint32 return_window = 9;
   }
@@ -147,7 +154,6 @@ message StoreAndForward {
    * TODO: REPLACE
    */
   message History {
-
     /*
      * Number of that will be sent to the client
      */
@@ -159,7 +165,8 @@ message StoreAndForward {
     uint32 window = 2;
 
     /*
-     * The window of messages that was used to filter the history client requested
+     * Index in the packet history of the last message sent in a previous request to the server.
+     * Will be sent to the client before sending the history and can be set in a subsequent request to avoid getting packets the server already sent to the client.
      */
     uint32 last_request = 3;
   }
@@ -168,9 +175,8 @@ message StoreAndForward {
    * TODO: REPLACE
    */
   message Heartbeat {
-
     /*
-     * Number of that will be sent to the client
+     * Period in seconds that the heartbeat is sent out that will be sent to the client
      */
     uint32 period = 1;
 
@@ -205,8 +211,8 @@ message StoreAndForward {
     Heartbeat heartbeat = 4;
 
     /*
-     * Empty Payload
+     * Text from history message.
      */
-    bool empty = 5;
+    bytes text = 5;
   }
 }

meshtastic/telemetry.options

@@ -1,4 +1,19 @@
 # options for nanopb
 # https://jpa.kapsi.fi/nanopb/docs/reference.html#proto-file-options
 
+*EnvironmentMetrics.iaq int_size:16
+*EnvironmentMetrics.wind_direction int_size:16
+*EnvironmentMetrics.soil_moisture int_size:8
+*EnvironmentMetrics.one_wire_temperature max_count:8
 
+*LocalStats.num_online_nodes int_size:16
+*LocalStats.num_total_nodes int_size:16
+*LocalStats.num_tx_dropped int_size:16
+
+*HealthMetrics.heart_bpm int_size:8
+*HealthMetrics.spO2 int_size:8
+
+*HostMetrics.load1 int_size:16
+*HostMetrics.load5 int_size:16
+*HostMetrics.load15 int_size:16
+*HostMetrics.user_string max_size:200

meshtastic/xmodem.proto

@@ -2,21 +2,21 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "XmodemProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "XmodemProtos";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 message XModem {
   enum Control {
-    NUL   = 0;
-    SOH   = 1;
-    STX   = 2;
-    EOT   = 4;
-    ACK   = 6;
-    NAK   = 21;
-    CAN   = 24;
+    NUL = 0;
+    SOH = 1;
+    STX = 2;
+    EOT = 4;
+    ACK = 6;
+    NAK = 21;
+    CAN = 24;
     CTRLZ = 26;
   }
 
@@ -24,4 +24,4 @@ message XModem {
   uint32 seq = 2;
   uint32 crc16 = 3;
   bytes buffer = 4;
-}
+}

nanopb.proto

@@ -0,0 +1,185 @@
+// Custom options for defining:
+// - Maximum size of string/bytes
+// - Maximum number of elements in array
+//
+// These are used by nanopb to generate statically allocable structures
+// for memory-limited environments.
+
+syntax = "proto2";
+
+import "google/protobuf/descriptor.proto";
+
+option go_package = "github.com/meshtastic/go/generated";
+option java_package = "fi.kapsi.koti.jpa.nanopb";
+
+enum FieldType {
+  FT_DEFAULT = 0; // Automatically decide field type, generate static field if possible.
+  FT_CALLBACK = 1; // Always generate a callback field.
+  FT_POINTER = 4; // Always generate a dynamically allocated field.
+  FT_STATIC = 2; // Generate a static field or raise an exception if not possible.
+  FT_IGNORE = 3; // Ignore the field completely.
+  FT_INLINE = 5; // Legacy option, use the separate 'fixed_length' option instead
+}
+
+enum IntSize {
+  IS_DEFAULT = 0; // Default, 32/64bit based on type in .proto
+  IS_8 = 8;
+  IS_16 = 16;
+  IS_32 = 32;
+  IS_64 = 64;
+}
+
+enum TypenameMangling {
+  M_NONE = 0; // Default, no typename mangling
+  M_STRIP_PACKAGE = 1; // Strip current package name
+  M_FLATTEN = 2; // Only use last path component
+  M_PACKAGE_INITIALS = 3; // Replace the package name by the initials
+}
+
+enum DescriptorSize {
+  DS_AUTO = 0; // Select minimal size based on field type
+  DS_1 = 1; // 1 word; up to 15 byte fields, no arrays
+  DS_2 = 2; // 2 words; up to 4095 byte fields, 4095 entry arrays
+  DS_4 = 4; // 4 words; up to 2^32-1 byte fields, 2^16-1 entry arrays
+  DS_8 = 8; // 8 words; up to 2^32-1 entry arrays
+}
+
+// This is the inner options message, which basically defines options for
+// a field. When it is used in message or file scope, it applies to all
+// fields.
+message NanoPBOptions {
+  // Allocated size for 'bytes' and 'string' fields.
+  // For string fields, this should include the space for null terminator.
+  optional int32 max_size = 1;
+
+  // Maximum length for 'string' fields. Setting this is equivalent
+  // to setting max_size to a value of length+1.
+  optional int32 max_length = 14;
+
+  // Allocated number of entries in arrays ('repeated' fields)
+  optional int32 max_count = 2;
+
+  // Size of integer fields. Can save some memory if you don't need
+  // full 32 bits for the value.
+  optional IntSize int_size = 7 [default = IS_DEFAULT];
+
+  // Force type of field (callback or static allocation)
+  optional FieldType type = 3 [default = FT_DEFAULT];
+
+  // Use long names for enums, i.e. EnumName_EnumValue.
+  optional bool long_names = 4 [default = true];
+
+  // Add 'packed' attribute to generated structs.
+  // Note: this cannot be used on CPUs that break on unaligned
+  // accesses to variables.
+  optional bool packed_struct = 5 [default = false];
+
+  // Add 'packed' attribute to generated enums.
+  optional bool packed_enum = 10 [default = false];
+
+  // Skip this message
+  optional bool skip_message = 6 [default = false];
+
+  // Generate oneof fields as normal optional fields instead of union.
+  optional bool no_unions = 8 [default = false];
+
+  // integer type tag for a message
+  optional uint32 msgid = 9;
+
+  // decode oneof as anonymous union
+  optional bool anonymous_oneof = 11 [default = false];
+
+  // Proto3 singular field does not generate a "has_" flag
+  optional bool proto3 = 12 [default = false];
+
+  // Force proto3 messages to have no "has_" flag.
+  // This was default behavior until nanopb-0.4.0.
+  optional bool proto3_singular_msgs = 21 [default = false];
+
+  // Generate an enum->string mapping function (can take up lots of space).
+  optional bool enum_to_string = 13 [default = false];
+
+  // Generate bytes arrays with fixed length
+  optional bool fixed_length = 15 [default = false];
+
+  // Generate repeated field with fixed count
+  optional bool fixed_count = 16 [default = false];
+
+  // Generate message-level callback that is called before decoding submessages.
+  // This can be used to set callback fields for submsgs inside oneofs.
+  optional bool submsg_callback = 22 [default = false];
+
+  // Shorten or remove package names from type names.
+  // This option applies only on the file level.
+  optional TypenameMangling mangle_names = 17 [default = M_NONE];
+
+  // Data type for storage associated with callback fields.
+  optional string callback_datatype = 18 [default = "pb_callback_t"];
+
+  // Callback function used for encoding and decoding.
+  // Prior to nanopb-0.4.0, the callback was specified in per-field pb_callback_t
+  // structure. This is still supported, but does not work inside e.g. oneof or pointer
+  // fields. Instead, a new method allows specifying a per-message callback that
+  // will be called for all callback fields in a message type.
+  optional string callback_function = 19 [default = "pb_default_field_callback"];
+
+  // Select the size of field descriptors. This option has to be defined
+  // for the whole message, not per-field. Usually automatic selection is
+  // ok, but if it results in compilation errors you can increase the field
+  // size here.
+  optional DescriptorSize descriptorsize = 20 [default = DS_AUTO];
+
+  // Set default value for has_ fields.
+  optional bool default_has = 23 [default = false];
+
+  // Extra files to include in generated `.pb.h`
+  repeated string include = 24;
+
+  // Automatic includes to exclude from generated `.pb.h`
+  // Same as nanopb_generator.py command line flag -x.
+  repeated string exclude = 26;
+
+  // Package name that applies only for nanopb.
+  optional string package = 25;
+
+  // Override type of the field in generated C code. Only to be used with related field types
+  optional google.protobuf.FieldDescriptorProto.Type type_override = 27;
+
+  // Due to historical reasons, nanopb orders fields in structs by their tag number
+  // instead of the order in .proto. Set this to false to keep the .proto order.
+  // The default value will probably change to false in nanopb-0.5.0.
+  optional bool sort_by_tag = 28 [default = true];
+
+  // Set the FT_DEFAULT field conversion strategy.
+  // A field that can become a static member of a c struct (e.g. int, bool, etc)
+  // will be a a static field.
+  // Fields with dynamic length are converted to either a pointer or a callback.
+  optional FieldType fallback_type = 29 [default = FT_CALLBACK];
+}
+
+// Extensions to protoc 'Descriptor' type in order to define options
+// inside a .proto file.
+//
+// Protocol Buffers extension number registry
+// --------------------------------
+// Project:  Nanopb
+// Contact:  Petteri Aimonen <jpa@kapsi.fi>
+// Web site: http://kapsi.fi/~jpa/nanopb
+// Extensions: 1010 (all types)
+// --------------------------------
+
+extend google.protobuf.FileOptions {
+  optional NanoPBOptions nanopb_fileopt = 1010;
+}
+
+extend google.protobuf.MessageOptions {
+  optional NanoPBOptions nanopb_msgopt = 1010;
+}
+
+extend google.protobuf.EnumOptions {
+  optional NanoPBOptions nanopb_enumopt = 1010;
+}
+
+extend google.protobuf.FieldOptions {
+  optional NanoPBOptions nanopb = 1010;
+}

packages/rust/Cargo.lock

@@ -0,0 +1,105 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+
+[[package]]
+name = "bytes"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "meshtastic_protobufs"
+version = "2.5.5"
+dependencies = [
+ "prost",
+ "prost-types",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prost"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"

packages/rust/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "meshtastic_protobufs"
+edition = "2021"
+version = "__PACKAGE_VERSION__"
+description = "Meshtastic Protobuf definitions"
+repository = "https://github.com/meshtastic/protobufs"
+license-file = "LICENSE"
+include = [
+    "**/*.rs",
+    "Cargo.toml",
+]
+
+[dependencies]
+prost = "0.14.3"
+prost-types = "0.14.3"

packages/rust/src/lib.rs

@@ -0,0 +1,5 @@
+extern crate prost;
+extern crate core;
+extern crate prost_types;
+
+include!("generated/mod.rs");

packages/ts/deno.json

@@ -0,0 +1,15 @@
+{
+  "name": "@meshtastic/protobufs",
+  "version": "__PACKAGE_VERSION__",
+  "exports": {
+    ".": "./mod.ts"
+  },
+  "imports": {
+    "@bufbuild/protobuf": "npm:@bufbuild/protobuf@^2.2.3"
+  },
+  "publish": {
+    "exclude": [
+      "!lib"
+    ]
+  }
+}

packages/ts/deno.lock

@@ -0,0 +1,16 @@
+{
+  "version": "4",
+  "specifiers": {
+    "npm:@bufbuild/protobuf@^2.2.3": "2.2.3"
+  },
+  "npm": {
+    "@bufbuild/protobuf@2.2.3": {
+      "integrity": "sha512-tFQoXHJdkEOSwj5tRIZSPNUuXK3RaR7T1nUrPgbYX1pUbvqqaaZAsfo+NXBPsz5rZMSKVFrgK1WL8Q/MSLvprg=="
+    }
+  },
+  "workspace": {
+    "dependencies": [
+      "npm:@bufbuild/protobuf@^2.2.3"
+    ]
+  }
+}

packages/ts/mod.ts

@@ -0,0 +1,20 @@
+export * as Admin from "./lib/admin_pb.ts";
+export * as AppOnly from "./lib/apponly_pb.ts";
+export * as ATAK from "./lib/atak_pb.ts";
+export * as CannedMessages from "./lib/cannedmessages_pb.ts";
+export * as Channel from "./lib/channel_pb.ts";
+export * as ClientOnly from "./lib/clientonly_pb.ts";
+export * as Config from "./lib/config_pb.ts";
+export * as ConnectionStatus from "./lib/connection_status_pb.ts";
+export * as LocalOnly from "./lib/localonly_pb.ts";
+export * as Mesh from "./lib/mesh_pb.ts";
+export * as ModuleConfig from "./lib/module_config_pb.ts";
+export * as Mqtt from "./lib/mqtt_pb.ts";
+export * as PaxCount from "./lib/paxcount_pb.ts";
+export * as Portnums from "./lib/portnums_pb.ts";
+export * as PowerMon from "./lib/powermon_pb.ts";
+export * as RemoteHardware from "./lib/remote_hardware_pb.ts";
+export * as Rtttl from "./lib/rtttl_pb.ts";
+export * as StoreForward from "./lib/storeforward_pb.ts";
+export * as Telemetry from "./lib/telemetry_pb.ts";
+export * as Xmodem from "./lib/xmodem_pb.ts";

packages/ts/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "@meshtastic/protobufs",
+  "description": "Protobuf definitions for the Meshtastic project",
+  "version": "__PACKAGE_VERSION__",
+  "homepage": "https://github.com/meshtastic/protobufs",
+  "license": "GPLV3",
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "main": "./dist/mod.js",
+  "module": "./dist/mod.js",
+  "types": "./dist/mod.d.ts",
+  "dependencies": {
+    "@bufbuild/protobuf": "^2.2.3"
+  },
+  "devDependencies": {
+    "tsdown": "^0.13.4",
+    "typescript": "^5.8.3"
+  },
+  "scripts": {
+    "build": "tsdown"
+  },
+  "tsdown": {
+    "entry": "mod.ts",
+    "dts": true,
+    "format": [
+      "esm"
+    ],
+    "splitting": false
+  }
+}

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}