From bb6fb3e02a6575152e4e10dc7b2e5ae8011376dd Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Jun 2022 18:44:42 -0700 Subject: [PATCH 01/11] Update config.proto --- config.proto | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config.proto b/config.proto index c98b5b2..6ab6fba 100644 --- a/config.proto +++ b/config.proto @@ -132,6 +132,14 @@ message Config { * Include positional timestamp (from GPS solution) */ POS_TIMESTAMP = 0x0080; + /* + * Include positional heading (from GPS solution) + */ + POS_HEADING = )0x0160; + /* + * Include positional speed (from GPS solution) + */ + POS_SPEED = 0x0320; } /* From 15ff64d5508ca0506020b74d1d5af4f20f2ffb5f Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Jun 2022 18:45:19 -0700 Subject: [PATCH 02/11] Update config.proto --- config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.proto b/config.proto index 6ab6fba..d7e1c95 100644 --- a/config.proto +++ b/config.proto @@ -135,7 +135,7 @@ message Config { /* * Include positional heading (from GPS solution) */ - POS_HEADING = )0x0160; + POS_HEADING = 0x0160; /* * Include positional speed (from GPS solution) */ From 18bfc92167a9f5548a56b4de32bfad771fb44f74 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Jun 2022 18:46:45 -0700 Subject: [PATCH 03/11] Update config.proto --- config.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.proto b/config.proto index d7e1c95..652771b 100644 --- a/config.proto +++ b/config.proto @@ -131,10 +131,12 @@ message Config { /* * Include positional timestamp (from GPS solution) */ + POS_TIMESTAMP = 0x0080; /* * Include positional heading (from GPS solution) */ + POS_HEADING = 0x0160; /* * Include positional speed (from GPS solution) From 2a1d79a9effde9e272fc837659fc8c15895baf2c Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Jun 2022 20:09:09 -0700 Subject: [PATCH 04/11] Update config.proto --- config.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.proto b/config.proto index 652771b..fd2fdbc 100644 --- a/config.proto +++ b/config.proto @@ -131,13 +131,13 @@ message Config { /* * Include positional timestamp (from GPS solution) */ - POS_TIMESTAMP = 0x0080; + /* * Include positional heading (from GPS solution) - */ - + * POS_HEADING = 0x0160; + /* * Include positional speed (from GPS solution) */ From 903f88a020be940057b2f6c2c6a69951133ecbfc Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Jun 2022 20:09:38 -0700 Subject: [PATCH 05/11] Update config.proto --- config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.proto b/config.proto index fd2fdbc..25cdd14 100644 --- a/config.proto +++ b/config.proto @@ -135,7 +135,7 @@ message Config { /* * Include positional heading (from GPS solution) - * + */ POS_HEADING = 0x0160; /* From 30aa8f23b1282fe8f25ddc4cdf2e4364bf6715a4 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Jun 2022 20:46:01 -0700 Subject: [PATCH 06/11] Update config.proto --- config.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.proto b/config.proto index 25cdd14..a7a0896 100644 --- a/config.proto +++ b/config.proto @@ -136,12 +136,12 @@ message Config { /* * Include positional heading (from GPS solution) */ - POS_HEADING = 0x0160; + POS_HEADING = 0x0100; /* * Include positional speed (from GPS solution) */ - POS_SPEED = 0x0320; + POS_SPEED = 0x0200; } /* From 2fbea37ff65ee46616ca051267c42570d0fe5722 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Jun 2022 21:12:31 -0700 Subject: [PATCH 07/11] Update config.proto --- config.proto | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/config.proto b/config.proto index a7a0896..499b87c 100644 --- a/config.proto +++ b/config.proto @@ -134,12 +134,16 @@ message Config { POS_TIMESTAMP = 0x0080; /* - * Include positional heading (from GPS solution) + * Include positional heading + * Indended for use with vehicle not walking speeds + * walking speeds are likely to be error prone like the compass */ POS_HEADING = 0x0100; /* - * Include positional speed (from GPS solution) + * Include positional speed + * Indended for use with vehicle not walking speeds + * walking speeds are likely to be error prone like the compass */ POS_SPEED = 0x0200; } @@ -340,7 +344,7 @@ message Config { * Light Sleep Seconds * In light sleep the CPU is suspended, LoRa radio is on, BLE is off an GPS is on * ESP32 Only - * 0 for default of 3600 + * 0 for default of 300 */ uint32 ls_secs = 11; From 18bdd4d9aee64709676cd3ea181e7c329f54548d Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 19 Jun 2022 09:59:12 -0700 Subject: [PATCH 08/11] Update config.proto Fix spelling of Intended --- config.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.proto b/config.proto index 499b87c..0be654d 100644 --- a/config.proto +++ b/config.proto @@ -135,14 +135,14 @@ message Config { /* * Include positional heading - * Indended for use with vehicle not walking speeds + * Intended for use with vehicle not walking speeds * walking speeds are likely to be error prone like the compass */ POS_HEADING = 0x0100; /* * Include positional speed - * Indended for use with vehicle not walking speeds + * Intended for use with vehicle not walking speeds * walking speeds are likely to be error prone like the compass */ POS_SPEED = 0x0200; From fedd1f390fba8f40f1dec90b11bff0287e4d36c9 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 20 Jun 2022 10:47:30 -0700 Subject: [PATCH 09/11] Update config.proto --- config.proto | 150 ++++++++++++--------------------------------------- 1 file changed, 35 insertions(+), 115 deletions(-) diff --git a/config.proto b/config.proto index 0be654d..c1e4ef1 100644 --- a/config.proto +++ b/config.proto @@ -12,7 +12,6 @@ message Config { message DeviceConfig { /* * Defines the device's role on the Mesh network - * unset - 0 */ enum Role { @@ -22,26 +21,21 @@ message Config { Client = 0; /* - * ClientMute device role - * This is like the client but packets will not hop over this node. Would be - * useful if you want to save power by not contributing to the mesh. + * Client Mute device role + * Same as a client except packets will not hop over this node, does not contribute to routing packets for mesh. */ ClientMute = 1; /* * Router device role. - * Uses an agressive algirithem for the flood networking so packets will - * prefer to be routed over this node. Also assume that this will be - * unattended and so will turn off the wifi/ble radio as well as the oled screen. + * Mesh packets will prefer to be routed over this node. This node will not be used by client apps. + * The wifi/ble radios and the oled screen will be put to sleep. */ Router = 2; /* - * RouterClient device role - * Uses an agressive algirithem for the flood networking so packets will - * prefer to be routed over this node. Similiar power management as a regular - * client, so the RouterClient can be used as both a Router and a Client. Useful - * as a well placed base station that you could also use to send messages. + * Router Client device role + * Mesh packets will prefer to be routed over this node. The Router Client can be used as both a Router and an app connected Client. */ RouterClient = 3; @@ -59,7 +53,6 @@ message Config { /* * This setting is never saved to disk, but if set, all device settings will be returned to factory defaults. - * (Region, serial number etc... will be preserved) */ bool factory_reset = 3; @@ -206,89 +199,22 @@ message Config { */ enum ChargeCurrent { - /* - * TODO: REPLACE - */ MAUnset = 0; - - /* - * TODO: REPLACE - */ MA100 = 1; - - /* - * TODO: REPLACE - */ MA190 = 2; - - /* - * TODO: REPLACE - */ MA280 = 3; - - /* - * TODO: REPLACE - */ MA360 = 4; - - /* - * TODO: REPLACE - */ MA450 = 5; - - /* - * TODO: REPLACE - */ MA550 = 6; - - /* - * TODO: REPLACE - */ MA630 = 7; - - /* - * TODO: REPLACE - */ MA700 = 8; - - /* - * TODO: REPLACE - */ MA780 = 9; - - /* - * TODO: REPLACE - */ MA880 = 10; - - /* - * TODO: REPLACE - */ MA960 = 11; - - /* - * TODO: REPLACE - */ MA1000 = 12; - - /* - * TODO: REPLACE - */ MA1080 = 13; - - /* - * TODO: REPLACE - */ MA1160 = 14; - - /* - * TODO: REPLACE - */ MA1240 = 15; - - /* - * TODO: REPLACE - */ MA1320 = 16; } @@ -302,7 +228,7 @@ message Config { * If set, we are powered from a low-current source (i.e. solar), so even if it looks like we have power flowing in * we should try to minimize power consumption as much as possible. * YOU DO NOT NEED TO SET THIS IF YOU'VE set is_router (it is implied in that case). - * CLI Only Option + * Advanced Option */ bool is_power_saving = 2; @@ -314,12 +240,14 @@ message Config { /* * Ratio of voltage divider for battery pin eg. 3.20 (R1=100k, R2=220k) * Overrides the ADC_MULTIPLIER defined in variant for battery voltage calculation. + * Should be set to floating point value between 2 and 4 + * Fixes issues on Heltec v2 */ float adc_multiplier_override = 6; /* * Wait Bluetooth Seconds - * The number of seconds for to wait before turning of BLE in No Bluetooth states\ + * The number of seconds for to wait before turning off BLE in No Bluetooth states * 0 for default of 1 minute */ uint32 wait_bluetooth_secs = 7; @@ -358,7 +286,7 @@ message Config { } /* - * TODO: REPLACE + * WifFi Config */ message WiFiConfig { @@ -407,40 +335,39 @@ message Config { GpsFormatDMS = 1; /* - * GPS coordinates are displayed in Universal Transverse Mercator format: + * Universal Transverse Mercator format: * ZZB EEEEEE NNNNNNN, where Z is zone, B is band, E is easting, N is northing */ GpsFormatUTM = 2; /* - * GPS coordinates are displayed in Military Grid Reference System format: + * 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 */ GpsFormatMGRS = 3; /* - * GPS coordinates are displayed in Open Location Code (aka Plus Codes). + * Open Location Code (aka Plus Codes). */ GpsFormatOLC = 4; /* - * GPS coordinates are displayed in 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 + * 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 */ GpsFormatOSGR = 5; } /* - * Power management state machine option. - * See [power management](/docs/software/other/power) for details. - * 0 for default of one minute + * Number of seconds the screen stays on after pressing the user button or receiving a message + * 0 for default of one minute MAXUINT for always on */ uint32 screen_on_secs = 1; /* - * How the GPS coordinates are displayed on the OLED screen. + * How the GPS coordinates are formatted on the OLED screen. */ GpsCoordinateFormat gps_format = 2; @@ -453,81 +380,74 @@ message Config { } /* - * TODO: REPLACE + * Lora Config */ message LoRaConfig { - /* - * The frequency/regulatory region the user has selected. - * Note: In 1.0 builds (which must still be supported by the android app for a - * long time) this field will be unpopulated. - * If firmware is ever upgraded from an old 1.0ish build, the old - * MyNodeInfo.region string will be used to set UserPreferences.region and the - * old value will be no longer set. - */ + enum RegionCode { /* - * TODO: REPLACE + * Region is not set */ Unset = 0; /* - * TODO: REPLACE + * United States */ US = 1; /* - * TODO: REPLACE + * European Union 433mhz */ EU433 = 2; /* - * TODO: REPLACE + * European Union 433mhz */ EU868 = 3; /* - * TODO: REPLACE + * China */ CN = 4; /* - * TODO: REPLACE + * Japan */ JP = 5; /* - * TODO: REPLACE + * Australia / New Zealand */ ANZ = 6; /* - * TODO: REPLACE + * Korea */ KR = 7; /* - * TODO: REPLACE + * Taiwan */ TW = 8; /* - * TODO: REPLACE + * Russia */ RU = 9; /* - * TODO: REPLACE + * India */ IN = 10; /* - * TODO: REPLACE + * New Zealand 865mhz */ NZ865 = 11; /* - * TODO: REPLACE + * Thailand */ TH = 12; } From 7c904d81a5541975b19d8b5d2b36d42fcc2d65eb Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 20 Jun 2022 10:55:03 -0700 Subject: [PATCH 10/11] Update config.proto Additional comment cleanup --- config.proto | 43 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/config.proto b/config.proto index c1e4ef1..8e89dbf 100644 --- a/config.proto +++ b/config.proto @@ -459,37 +459,37 @@ message Config { enum ModemPreset { /* - * TODO: REPLACE + * Long Range - Fast */ LongFast = 0; /* - * TODO: REPLACE + * Long Range - Slow */ LongSlow = 1; /* - * TODO: REPLACE + * Very Long Range - Slow */ VLongSlow = 2; /* - * TODO: REPLACE + * Medium Range - Slow */ MidSlow = 3; /* - * TODO: REPLACE + * Medium Range - Fast */ MidFast = 4; /* - * TODO: REPLACE + * Short Range - Slow */ ShortSlow = 5; /* - * TODO: REPLACE + * Short Range - Fast */ ShortFast = 6; } @@ -503,7 +503,6 @@ message Config { int32 tx_power = 1; /* - * Note: This is the 'old' mechanism for specifying channel parameters. * Either modem_config or bandwidth/spreading/coding will be specified - NOT BOTH. * As a heuristic: If bandwidth is specified, do not use modem_config. * Because protobufs take ZERO space when the value is zero this works out nicely. @@ -539,12 +538,13 @@ message Config { float frequency_offset = 6; /* - * The region code for my radio (US, CN, EU433, etc...) + * The region code for the radio (US, CN, EU433, etc...) */ RegionCode region = 7; /* * Overrides HOPS_RELIABLE and sets the maximum number of hops. This can't be greater than 7. + * 0 for default of 3 */ uint32 hop_limit = 8; @@ -564,38 +564,15 @@ message Config { } /* - * TODO: REPLACE + * Payload Variant */ oneof payloadVariant { - /* - * TODO: REPLACE - */ DeviceConfig device = 1; - - /* - * TODO: REPLACE - */ PositionConfig position = 2; - - /* - * TODO: REPLACE - */ PowerConfig power = 3; - - /* - * TODO: REPLACE - */ WiFiConfig wifi = 4; - - /* - * TODO: REPLACE - */ DisplayConfig display = 5; - - /* - * TODO: REPLACE - */ LoRaConfig lora = 6; } From 4016ad76da40f8e016726e852a02e0a826c55d9e Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 20 Jun 2022 11:03:33 -0700 Subject: [PATCH 11/11] Update config.proto --- config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.proto b/config.proto index 8e89dbf..5685059 100644 --- a/config.proto +++ b/config.proto @@ -286,7 +286,7 @@ message Config { } /* - * WifFi Config + * WiFi Config */ message WiFiConfig {