Merge branch '7943-mute-target' of https://github.com/ford-jones/protobufs into 7943-mute-target

This commit is contained in:
ford-jones 2025-09-23 14:59:10 +12:00
commit c6a06d51ec
6 changed files with 108 additions and 53 deletions

View file

@ -414,16 +414,6 @@ message AdminMessage {
*/
uint32 remove_ignored_node = 48;
/*
* Set specified node-num to be muted
*/
uint32 set_muted_node = 49;
/*
* Set specified node-num to be heard / not-muted
*/
uint32 remove_muted_node = 50;
/*
* 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)

View file

@ -108,6 +108,14 @@ message Config {
* consuming hops.
*/
ROUTER_LATE = 11;
/*
* Description: Treats packets from or to favorited nodes as ROUTER, and all other packets as CLIENT.
* Technical Details: Used for stronger attic/roof nodes to distribute messages more widely
* from weaker, indoor, or less-well-positioned nodes. Recommended for users with multiple nodes
* where one CLIENT_BASE acts as a more powerful base station, such as an attic/roof node.
*/
CLIENT_BASE = 12;
}
/*
@ -590,47 +598,12 @@ message Config {
*/
message DisplayConfig {
/*
* How the GPS coordinates are displayed on the OLED screen.
* Deprecated in 2.7.4: Unused
*/
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;
enum DeprecatedGpsCoordinateFormat {
UNUSED = 0;
}
/*
* Unit display preference
*/
@ -686,7 +659,7 @@ message Config {
* Deprecated in 2.7.4: Unused
* How the GPS coordinates are formatted on the OLED screen.
*/
GpsCoordinateFormat gps_format = 2 [deprecated = true];
DeprecatedGpsCoordinateFormat gps_format = 2 [deprecated = true];
/*
* Automatically toggles to the next page on the screen like a carousel, based the specified interval in seconds.
@ -803,6 +776,12 @@ message Config {
* If true, the device will display the time in 12-hour format on screen.
*/
bool use_12h_clock = 12;
/*
* If false (default), the device will use short names for various display screens.
* If true, node names will show in long format
*/
bool use_long_node_name = 13;
}
/*

View file

@ -3,9 +3,10 @@
*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
*Map.style max_size:20

View file

@ -88,6 +88,59 @@ message DeviceUIConfig {
* 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 {
@ -314,6 +367,11 @@ enum Language {
*/
BULGARIAN = 17;
/*
* Czech
*/
CZECH = 18;
/*
* Simplified Chinese (experimental)
*/

View file

@ -755,9 +755,9 @@ enum HardwareModel {
T_LORA_PAGER = 103;
/*
* GAT562 Mesh Trial Tracker
* M5Stack Reserved
*/
GAT562_MESH_TRIAL_TRACKER = 104;
M5STACK_RESERVED = 104; // 0x68
/*
* RAKwireless WisMesh Tag
@ -785,6 +785,21 @@ enum HardwareModel {
*/
T_ECHO_LITE = 109;
/*
* New Heltec LoRA32 with ESP32-S3 CPU
*/
HELTEC_V4 = 110;
/*
* M5Stack C6L
*/
M5STACK_C6L = 111;
/*
* M5Stack Cardputer Adv
*/
M5STACK_CARDPUTER_ADV = 112;
/*
* ------------------------------------------------------------------------------------------------------------------------------------------
* Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.

View file

@ -530,6 +530,12 @@ message ModuleConfig {
* 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;
}
/*
@ -609,6 +615,12 @@ message ModuleConfig {
* 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;
}
/*