mirror of
https://github.com/meshtastic/protobufs.git
synced 2026-04-20 22:13:55 +00:00
Merge pull request #368 from meshtastic/2.2-proposed-changes
2.2.X Proposed Protobuf changes
This commit is contained in:
commit
0ea704baf5
5 changed files with 24 additions and 94 deletions
|
|
@ -110,6 +110,11 @@ message AdminMessage {
|
|||
*/
|
||||
REMOTEHARDWARE_CONFIG = 8;
|
||||
|
||||
/*
|
||||
* TODO: REPLACE
|
||||
*/
|
||||
NEIGHBORINFO_CONFIG = 9;
|
||||
|
||||
/*
|
||||
* TODO: REPLACE
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -132,4 +132,4 @@ message Channel {
|
|||
* TODO: REPLACE
|
||||
*/
|
||||
Role role = 3;
|
||||
}
|
||||
}
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
# 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
|
||||
*DeviceState.node_db_lite 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
|
||||
|
|
|
|||
|
|
@ -32,12 +32,6 @@ message DeviceState {
|
|||
*/
|
||||
User owner = 3;
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x
|
||||
* Old node_db. See NodeInfoLite node_db_lite
|
||||
*/
|
||||
repeated NodeInfo node_db = 4 [deprecated = true];
|
||||
|
||||
/*
|
||||
* Received packets saved for delivery to the phone
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1110,102 +1110,17 @@ message MyNodeInfo {
|
|||
*/
|
||||
uint32 my_node_num = 1;
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x (Source from device_metadata)
|
||||
* Note: This flag merely means we detected a hardware GPS in our node.
|
||||
* Not the same as UserPreferences.location_sharing
|
||||
*/
|
||||
bool has_gps = 2 [deprecated = true];
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x
|
||||
* The maximum number of 'software' channels that can be set on this node.
|
||||
*/
|
||||
uint32 max_channels = 3 [deprecated = true];
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x (Source from device_metadata)
|
||||
* 0.0.5 etc...
|
||||
*/
|
||||
string firmware_version = 4 [deprecated = true];
|
||||
|
||||
/*
|
||||
* An error message we'd like to report back to the mothership through analytics.
|
||||
* It indicates a serious bug occurred on the device, the device coped with it,
|
||||
* but we still want to tell the devs about the bug.
|
||||
* This field will be cleared after the phone reads MyNodeInfo
|
||||
* (i.e. it will only be reported once)
|
||||
* a numeric error code to go with error message, zero means no error
|
||||
*/
|
||||
CriticalErrorCode error_code = 5 [deprecated = true];
|
||||
|
||||
/*
|
||||
* A numeric error address (nonzero if available)
|
||||
*/
|
||||
uint32 error_address = 6 [deprecated = true];
|
||||
|
||||
/*
|
||||
* The total number of errors this node has ever encountered
|
||||
* (well - since the last time we discarded preferences)
|
||||
*/
|
||||
uint32 error_count = 7 [deprecated = true];
|
||||
|
||||
/*
|
||||
* The total number of reboots this node has ever encountered
|
||||
* (well - since the last time we discarded preferences)
|
||||
*/
|
||||
uint32 reboot_count = 8;
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x
|
||||
* Calculated bitrate of the current channel (in Bytes Per Second)
|
||||
*/
|
||||
float bitrate = 9 [deprecated = true];
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x
|
||||
* How long before we consider a message abandoned and we can clear our
|
||||
* caches of any messages in flight Normally quite large to handle the worst case
|
||||
* message delivery time, 5 minutes.
|
||||
* Formerly called FLOOD_EXPIRE_TIME in the device code
|
||||
*/
|
||||
uint32 message_timeout_msec = 10 [deprecated = true];
|
||||
|
||||
/*
|
||||
* The minimum app version that can talk to this device.
|
||||
* Phone/PC apps should compare this to their build number and if too low tell the user they must update their app
|
||||
*/
|
||||
uint32 min_app_version = 11;
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x (Only used on device to keep track of utilization)
|
||||
* 24 time windows of 1hr each with the airtime transmitted out of the device per hour.
|
||||
*/
|
||||
repeated uint32 air_period_tx = 12 [deprecated = true];
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x (Only used on device to keep track of utilization)
|
||||
* 24 time windows of 1hr each with the airtime of valid packets for your mesh.
|
||||
*/
|
||||
repeated uint32 air_period_rx = 13 [deprecated = true];
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x (Source from DeviceMetadata instead)
|
||||
* Is the device wifi capable?
|
||||
*/
|
||||
bool has_wifi = 14 [deprecated = true];
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x (Source from DeviceMetrics telemetry payloads)
|
||||
* Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).
|
||||
*/
|
||||
float channel_utilization = 15 [deprecated = true];
|
||||
|
||||
/*
|
||||
* Deprecated in 2.1.x (Source from DeviceMetrics telemetry payloads)
|
||||
* Percent of airtime for transmission used within the last hour.
|
||||
*/
|
||||
float air_util_tx = 16 [deprecated = true];
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1456,10 +1371,15 @@ message NeighborInfo {
|
|||
* Field to pass neighbor info for the next sending cycle
|
||||
*/
|
||||
uint32 last_sent_by_id = 2;
|
||||
|
||||
/*
|
||||
* Broadcast interval of the represented node (in seconds)
|
||||
*/
|
||||
uint32 node_broadcast_interval_secs = 3;
|
||||
/*
|
||||
* The list of out edges from this node
|
||||
*/
|
||||
repeated Neighbor neighbors = 3;
|
||||
repeated Neighbor neighbors = 4;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1475,6 +1395,18 @@ message Neighbor {
|
|||
* SNR of last heard message
|
||||
*/
|
||||
float snr = 2;
|
||||
|
||||
/*
|
||||
* Reception time (in secs since 1970) of last message that was last sent by this ID.
|
||||
* Note: this is for local storage only and will not be sent out over the mesh.
|
||||
*/
|
||||
fixed32 last_rx_time = 3;
|
||||
|
||||
/*
|
||||
* Broadcast interval of this neighbor (in seconds).
|
||||
* Note: this is for local storage only and will not be sent out over the mesh.
|
||||
*/
|
||||
uint32 node_broadcast_interval_secs = 4;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue