Merge pull request #125 from mc-hamster/router

Remove router implementation from RFC and change over to position_broadcast_smart_disabled
This commit is contained in:
Jm Casler 2022-03-14 18:05:04 -07:00 committed by GitHub
commit 69fc149328
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 40 deletions

View file

@ -21,10 +21,6 @@
*MyNodeInfo.air_period_tx max_count:8
*MyNodeInfo.air_period_rx max_count:8
*MyNodeInfo.router max_count:4
*MyNodeInfo.router_snr max_count:4
*MyNodeInfo.router_sec max_count:4 int_size:16
# Note: the actual limit (because of header bytes) on the size of encrypted payloads is 251 bytes, but I use 256
# here because we might need to fill with zeros for padding to encryption block size (16 bytes per block)
*MeshPacket.encrypted max_size:256

View file

@ -63,15 +63,6 @@ message Position {
*/
int32 battery_level = 4;
/*
* This is sent by node only if it a router and if hop_limit is set to 0
* and is not being sent as a reliable message.
*
* Note to Ben & Garth : When position is refactored, please move this to the same message
* "time" is moving to.
*/
bool router_heartbeat = 5;
/*
* This is usually not sent over the mesh (to save space), but it is sent
* from the phone so that the local device can set its RTC If it is sent over
@ -1210,22 +1201,6 @@ message MyNodeInfo {
* Percent of airtime for transmission used within the last hour.
*/
float air_util_tx = 20;
/*
* How many routers are we in range of?
*/
repeated uint32 router = 21;
/*
* What is the snr of the last router message?
*/
repeated float router_snr = 22;
/*
* How long has it been since we last heard from the router?
*/
repeated uint32 router_sec = 23;
}
/*

View file

@ -105,13 +105,10 @@ enum RegionCode {
/*
* Defines the device's role on the Mesh network
* unset
* - If there's no router, don't repeat packets that are below a certain treshold.
* Behave normally.
*
* Router
* Functions as a router
*
* Repeater
* - Repeats all packets.
*/
enum Role {
@ -125,11 +122,6 @@ enum Role {
*/
Router = 1;
/*
* Repeater device role
*/
Repeater = 2;
}
/*
@ -451,9 +443,8 @@ message RadioConfig {
/*
* We should send our position this often (but only if it has changed significantly)
* Defaults to 15 minutes
*/
bool position_broadcast_smart = 17;
bool position_broadcast_smart_disabled = 17;
/*
* Send our owner info at least this often (also we always send once at boot - to rejoin the mesh)