meshtastic/protobufs
1
0
Fork 0
mirror of https://github.com/meshtastic/protobufs.git synced 2026-04-20 22:13:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 2.2-proposed-changes

Browse source
This commit is contained in:
Ben Meadors 2023-07-31 18:27:03 -05:00 • committed by GitHub
commit cf175a37f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
meshtastic/admin.proto
View file

@ -114,6 +114,11 @@ message AdminMessage {
* TODO: REPLACE
*/
NEIGHBORINFO_CONFIG = 9;
/*
* TODO: REPLACE
*/
AMBIENTLIGHTING_CONFIG = 10;
}
/*

11
meshtastic/mesh.proto
View file

@ -305,6 +305,11 @@ enum HardwareModel {
*/
NANO_G1_EXPLORER = 17;
/*
* B&Q Consulting Nano G2 Ultra: https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra
*/
NANO_G2_ULTRA = 18;
/*
* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station
*/
@ -745,9 +750,9 @@ message MeshPacket {
* to make sure that critical packets are sent ASAP.
* In the case of meshtastic that means we want to send protocol acks as soon as possible
* (to prevent unneeded retransmissions), we want routing messages to be sent next,
* then messages marked as reliable and finally ‘background’ packets like periodic position updates.
* then messages marked as reliable and finally 'background' packets like periodic position updates.
* So I bit the bullet and implemented a new (internal - not sent over the air)
* field in MeshPacket called ‘priority’.
* field in MeshPacket called 'priority'.
* And the transmission queue in the router object is now a priority queue.
*/
enum Priority {
@ -1457,4 +1462,4 @@ message DeviceMetadata {
* Has Remote Hardware enabled
*/
bool hasRemoteHardware = 10;
}
}