-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Feat/mesh beacon #10618
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
NomDeTom
wants to merge
25
commits into
meshtastic:develop
Choose a base branch
from
NomDeTom:feat/mesh-beacon
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feat/mesh beacon #10618
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
e9864f8
Tips robot virtual node / relayer to different LoRa modes & channels
erayd 3ba64b3
fix: repair mesh tips CI build
Komzpa e380d96
feat: add MeshBeacon module (Phase 1 — proto + generated code + initi…
NomDeTom dd57b9e
feat(beacon): implement broadcaster + listener (phases 2-5)
NomDeTom a05d38a
feat(beacon): wire RadioLibInterface hooks + admin validation (phases…
NomDeTom 98e068b
fix(beacon): fix LocalModuleConfig flat access (no payload_variant), …
NomDeTom 66c089c
feat(beacon): fix broadcaster inheritance, add preset/region validati…
NomDeTom e0a369d
feat(beacon): add unit tests for MeshBeaconModule and AdminModule con…
NomDeTom 819cfb8
remove old meshtips
NomDeTom 74af323
more validation in NodeDB and AdminModule, and userprefs for baked i…
NomDeTom 7e8b749
copilot is my gravity
NomDeTom 112c437
mmmmm... beacon
NomDeTom 41bd325
oops
NomDeTom 6ef0b5a
Enhance unit tests for MeshBeaconModule with detailed validation chec…
NomDeTom 2a8a643
new lines. Why not?
NomDeTom d27a9e6
finally
NomDeTom f23fbd6
legacy mode activate!
NomDeTom 34fbac5
Update protobufs (#16)
github-actions[bot] 98c14b4
Update protobufs (#17)
github-actions[bot] f2cb730
better logic, fixed a test
NomDeTom 785a0c7
updated for packet signing
NomDeTom a6876ac
Merge branch 'meshtastic:develop' into feat/mesh-beacon
NomDeTom 290f553
channel numbers
NomDeTom fe6f2d0
beacon: encrypt on the beacon channel PSK; fix split note
NomDeTom 5eeaa88
test/beacon: drain toPhoneQueue in tearDown to fix LSan leak abort
NomDeTom File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Submodule protobufs
updated
8 files
| +3 −13 | .github/workflows/snapshot-kmp.yml | |
| +5 −0 | meshtastic/localonly.proto | |
| +3 −0 | meshtastic/mesh_beacon.options | |
| +42 −0 | meshtastic/mesh_beacon.proto | |
| +6 −0 | meshtastic/module_config.options | |
| +84 −0 | meshtastic/module_config.proto | |
| +8 −0 | meshtastic/portnums.proto | |
| +17 −5 | packages/kmp/README.md |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| /* Automatically generated nanopb constant definitions */ | ||
| /* Generated by nanopb-0.4.9.1 */ | ||
|
|
||
| #include "meshtastic/mesh_beacon.pb.h" | ||
| #if PB_PROTO_HEADER_VERSION != 40 | ||
| #error Regenerate this file with the current version of nanopb generator. | ||
| #endif | ||
|
|
||
| PB_BIND(meshtastic_MeshBeacon, meshtastic_MeshBeacon, AUTO) | ||
|
|
||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* Automatically generated nanopb header */ | ||
| /* Generated by nanopb-0.4.9.1 */ | ||
|
|
||
| #ifndef PB_MESHTASTIC_MESHTASTIC_MESH_BEACON_PB_H_INCLUDED | ||
| #define PB_MESHTASTIC_MESHTASTIC_MESH_BEACON_PB_H_INCLUDED | ||
| #include <pb.h> | ||
| #include "meshtastic/channel.pb.h" | ||
| #include "meshtastic/config.pb.h" | ||
|
|
||
| #if PB_PROTO_HEADER_VERSION != 40 | ||
| #error Regenerate this file with the current version of nanopb generator. | ||
| #endif | ||
|
|
||
| /* Struct definitions */ | ||
| /* Payload for MESH_BEACON_APP packets. | ||
| Periodically broadcast by nodes in beacon mode. | ||
| Listeners deliver the text message to the local inbox and cache any offered | ||
| channel/preset for the client app to act on — the firmware never auto-applies them. */ | ||
| typedef struct _meshtastic_MeshBeacon { | ||
| /* Human-readable beacon message. Max 100 bytes enforced by firmware on send. */ | ||
| char message[101]; | ||
| /* Optional channel (name + PSK) being advertised to listening clients. | ||
| A client app may offer to switch the user to this channel; firmware never applies it automatically. */ | ||
| bool has_offer_channel; | ||
| meshtastic_ChannelSettings offer_channel; | ||
| /* Optional region being advertised alongside offer_preset. */ | ||
| meshtastic_Config_LoRaConfig_RegionCode offer_region; | ||
| /* Optional modem preset being advertised. | ||
| Combined with offer_region, tells a client "there is a mesh on this preset/region". */ | ||
| bool has_offer_preset; | ||
| meshtastic_Config_LoRaConfig_ModemPreset offer_preset; | ||
| } meshtastic_MeshBeacon; | ||
|
|
||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| /* Initializer values for message structs */ | ||
| #define meshtastic_MeshBeacon_init_default {"", false, meshtastic_ChannelSettings_init_default, _meshtastic_Config_LoRaConfig_RegionCode_MIN, false, _meshtastic_Config_LoRaConfig_ModemPreset_MIN} | ||
| #define meshtastic_MeshBeacon_init_zero {"", false, meshtastic_ChannelSettings_init_zero, _meshtastic_Config_LoRaConfig_RegionCode_MIN, false, _meshtastic_Config_LoRaConfig_ModemPreset_MIN} | ||
|
|
||
| /* Field tags (for use in manual encoding/decoding) */ | ||
| #define meshtastic_MeshBeacon_message_tag 1 | ||
| #define meshtastic_MeshBeacon_offer_channel_tag 2 | ||
| #define meshtastic_MeshBeacon_offer_region_tag 3 | ||
| #define meshtastic_MeshBeacon_offer_preset_tag 4 | ||
|
|
||
| /* Struct field encoding specification for nanopb */ | ||
| #define meshtastic_MeshBeacon_FIELDLIST(X, a) \ | ||
| X(a, STATIC, SINGULAR, STRING, message, 1) \ | ||
| X(a, STATIC, OPTIONAL, MESSAGE, offer_channel, 2) \ | ||
| X(a, STATIC, SINGULAR, UENUM, offer_region, 3) \ | ||
| X(a, STATIC, OPTIONAL, UENUM, offer_preset, 4) | ||
| #define meshtastic_MeshBeacon_CALLBACK NULL | ||
| #define meshtastic_MeshBeacon_DEFAULT NULL | ||
| #define meshtastic_MeshBeacon_offer_channel_MSGTYPE meshtastic_ChannelSettings | ||
|
|
||
| extern const pb_msgdesc_t meshtastic_MeshBeacon_msg; | ||
|
|
||
| /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ | ||
| #define meshtastic_MeshBeacon_fields &meshtastic_MeshBeacon_msg | ||
|
|
||
| /* Maximum encoded size of messages (where known) */ | ||
| #define MESHTASTIC_MESHTASTIC_MESH_BEACON_PB_H_MAX_SIZE meshtastic_MeshBeacon_size | ||
| #define meshtastic_MeshBeacon_size 180 | ||
|
|
||
| #ifdef __cplusplus | ||
| } /* extern "C" */ | ||
| #endif | ||
|
|
||
| #endif |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.