From b48ecf810e6a0d41a0a17e0b8aaa6ea1c902e923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 31 May 2023 12:07:16 +0200 Subject: [PATCH 1/2] make NeighborInfo switchable also update trunk --- .trunk/trunk.yaml | 10 +++++----- meshtastic/module_config.proto | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index d8f9f4b..b685b59 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,16 +1,16 @@ version: 0.1 cli: - version: 1.9.1 + version: 1.10.0 plugins: sources: - id: trunk - ref: v0.0.15 + ref: v0.0.17 uri: https://github.com/trunk-io/plugins lint: enabled: - - yamllint@1.31.0 - - buf-lint@1.19.0 - - buf-breaking@1.19.0 + - yamllint@1.32.0 + - buf-lint@1.20.0 + - buf-breaking@1.20.0 - actionlint@1.6.24 - markdownlint@0.34.0 - prettier@2.8.8 diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto index d023814..f186af0 100644 --- a/meshtastic/module_config.proto +++ b/meshtastic/module_config.proto @@ -87,6 +87,22 @@ message ModuleConfig { 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 to the mesh + */ + uint32 update_interval = 2; + } + /* * Audio Config for codec2 voice */ From 659004c4704d9afe0031b09ae2a45da81ca03989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 31 May 2023 12:15:41 +0200 Subject: [PATCH 2/2] add more plumbing --- meshtastic/localonly.proto | 5 +++++ meshtastic/module_config.proto | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/meshtastic/localonly.proto b/meshtastic/localonly.proto index 132aec1..4b51795 100644 --- a/meshtastic/localonly.proto +++ b/meshtastic/localonly.proto @@ -106,6 +106,11 @@ 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; + /* * 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 diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto index f186af0..5008afb 100644 --- a/meshtastic/module_config.proto +++ b/meshtastic/module_config.proto @@ -577,6 +577,11 @@ message ModuleConfig { * TODO: REPLACE */ RemoteHardwareConfig remote_hardware = 9; + + /* + * TODO: REPLACE + */ + NeighborInfoConfig neighbor_info = 10; } }