From 4e46082a24c6fed7f8bcfc34df3c19782cb4a5d8 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sat, 5 Dec 2020 08:47:06 +0800 Subject: [PATCH] doc updates --- docs/docs.md | 12 ++++++------ mesh.proto | 2 +- portnums.proto | 7 +++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/docs.md b/docs/docs.md index 7ef0a3d..959b459 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -250,7 +250,7 @@ Full information about a node on the mesh | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | num | [uint32](#uint32) | | the node number | -| user | [User](#User) | | | +| user | [User](#User) | | The user info for this node | | position | [Position](#Position) | | This position data will also contain a time last seen | | snr | [float](#float) | | Returns the Signal-to-noise ratio (SNR) of the last received message, as / measured by the receiver. return SNR of the last received message in dB | | next_hop | [uint32](#uint32) | | Our current preferred node node for routing - might be the same as num if / we are adjacent Or zero if we don't yet know a route to this node. | @@ -399,9 +399,9 @@ characteristic. Once the write completes the phone can assume it is handled. ### User Broadcast when a newly powered mesh node wants to find a node num it can use -Sent from the phone over bluetooth to set the user id for the owner of this +// Sent from the phone over bluetooth to set the user id for the owner of this node. -Also sent from nodes to each other when a new node signs on (so all clients +// Also sent from nodes to each other when a new node signs on (so all clients can have this info) The algorithm is as follows: @@ -579,11 +579,11 @@ This change is backwards compatible by treating the legacy OPAQUE/CLEAR_TEXT val | ---- | ------ | ----------- | | UNKNOWN_APP | 0 | Deprecated: do not use in new code (formerly called OPAQUE) A message sent from a device outside of the mesh, in a form the mesh does not understand NOTE: This must be 0, because it is documented in IMeshService.aidl to be so | | TEXT_MESSAGE_APP | 1 | a simple UTF-8 text message, which even the little micros in the mesh can understand and show on their screen eventually in some circumstances even signal might send messages in this form (see below) Formerly called CLEAR_TEXT | +| GPIO_APP | 2 | Reserved for a future built-in GPIO app | | POSITION_APP | 3 | The built-in position messaging app | -| GPIO_APP | 2 | Future standard app IDs | -| MESH_USERINFO_APP | 4 | | +| MESH_USERINFO_APP | 4 | The built-in user info app | | PRIVATE_APP | 256 | Private applications should use portnums >= 256. To simplify initial development and testing you can use "PRIVATE_APP" in your code without needing to rebuild protobuf files (via bin/regin_protos.sh) | -| IP_TUNNEL_APP | 1024 | | +| IP_TUNNEL_APP | 1024 | 1024-66559 Are reserved for use by IP tunneling (see FIXME for more information) | diff --git a/mesh.proto b/mesh.proto index 0bf05a2..d7b00b2 100644 --- a/mesh.proto +++ b/mesh.proto @@ -594,7 +594,7 @@ group) // Full information about a node on the mesh message NodeInfo { uint32 num = 1; // the node number - User user = 2; + User user = 2; // The user info for this node /// This position data will also contain a time last seen Position position = 3; diff --git a/portnums.proto b/portnums.proto index d448c1b..dcc4e34 100644 --- a/portnums.proto +++ b/portnums.proto @@ -46,16 +46,19 @@ enum PortNum { CLEAR_READACK = 2; */ + /** Reserved for a future built-in GPIO app */ + GPIO_APP = 2; + /** The built-in position messaging app */ POSITION_APP = 3; - /** Future standard app IDs */ - GPIO_APP = 2; + /** The built-in user info app */ MESH_USERINFO_APP = 4; /** Private applications should use portnums >= 256. To simplify initial development and testing you can use "PRIVATE_APP" in your code without needing to rebuild protobuf files (via bin/regin_protos.sh) */ PRIVATE_APP = 256; + /** 1024-66559 Are reserved for use by IP tunneling (see FIXME for more information) */ IP_TUNNEL_APP = 1024; } \ No newline at end of file