From 1696eab00ab9c78ee7ca918a68eba144ee0d5a3c Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Fri, 11 Aug 2023 07:35:14 -0700 Subject: [PATCH 1/3] remove sds references --- docs/configuration/device-config/power.mdx | 32 ++-------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/docs/configuration/device-config/power.mdx b/docs/configuration/device-config/power.mdx index ae8ba0c2..8f80d332 100644 --- a/docs/configuration/device-config/power.mdx +++ b/docs/configuration/device-config/power.mdx @@ -13,10 +13,10 @@ import calculateADC from "/src/utils/calculateADC"; Power settings are advanced configuration, most users should choose a role under [Device Config](/docs/settings/config/device) to manage power for their device and shouldn't ever need to adjust these settings. ::: -The power config options are: Power Saving, Shutdown after losing power, ADC Multiplier Override, Wait Bluetooth Interval, Mesh Super Deep Sleep Timeout, Super Deep Sleep Interval, Light Sleep Interval, Minimum Wake Interval, and Device Battery INA2xx Address. Power config uses an admin message sending a `Config.Power` protobuf. +The power config options are: Power Saving, Shutdown after losing power, ADC Multiplier Override, Wait Bluetooth Interval, Light Sleep Interval, Minimum Wake Interval, and Device Battery INA2xx Address. Power config uses an admin message sending a `Config.Power` protobuf. :::info -ADC Multiplier, Super Deep Sleep, and Light Sleep settings only apply to ESP32-based boards. These settings will have no effect on nRF52 modules. +ADC Multiplier, The Light Sleep setting only applies to ESP32-based boards. This settings will have no effect on nRF52 modules. ::: ## Power Config Values @@ -95,20 +95,6 @@ How long to wait before turning off BLE in no Bluetooth states `0` for default of 1 minute -### Mesh Super Deep Sleep Timeout - -While in Light Sleep if this value is exceeded we will lower into super deep sleep - -or Super Deep Sleep Interval (default 1 year) or a button press - -`0` for default of two hours, MAXUINT for disabled - -### Super Deep Sleep Interval - -While in Light Sleep if Mesh Super Deep Sleep Timeout Seconds is exceeded we will lower into super deep sleep or this value (default 1 year) or a button press - -`0` for default of one year - ### Light Sleep Interval In light sleep the CPU is suspended, LoRa radio is on, BLE is off and GPS is on @@ -174,8 +160,6 @@ All Power config options are available in the python CLI. | power.on_battery_shutdown_after_secs | `integer` (seconds) | Default of `0` is off | | power.adc_multiplier_override | `2-4` (floating point value) | Default of `0` uses firmware values | | power.wait_bluetooth_secs | `integer` (seconds) | Default of `0` is 1 minute | -| power.mesh_sds_timeout_secs | `integer` (seconds) | Default of `0` is 2 hours | -| power.sds_secs | `integer` (seconds) | Default of `0` is 1 year | | power.ls_secs | `integer` (seconds) | Default of `0` is 5 minutes | | power.min_wake_secs | `integer` (seconds) | Default of `0` is 10 seconds | | power.device_battery_ina_address | `integer` (I2C address as decimal) | Default of `0` is no address set | @@ -205,18 +189,6 @@ meshtastic --set power.wait_bluetooth_secs 0 meshtastic --set power.wait_bluetooth_secs 120 ``` -```shell title="Set Mesh Super Deep Sleep Timeout (Default of 0 is 2 hours/7200 seconds)" -meshtastic --set power.mesh_sds_timeout_secs 0 -meshtastic --set power.mesh_sds_timeout_secs 120 -// Disable using MAXUINT -meshtastic --set power.mesh_sds_timeout_secs 4294967295 -``` - -```shell title="Set Super Deep Sleep (Default of 0 is 1 year)" -meshtastic --set power.sds_secs 0 -meshtastic --set power.sds_secs 120 -``` - ```shell title="Set Light Sleep to default (Default of 0 is 5 minutes)" meshtastic --set power.ls_secs 0 meshtastic --set power.ls_secs 120 From 969674d7f2022cca8cc2ae7a1b69034f5b4f86f2 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Fri, 11 Aug 2023 07:38:33 -0700 Subject: [PATCH 2/3] more-sds-references --- docs/configuration/device-config/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/device-config/index.mdx b/docs/configuration/device-config/index.mdx index eb6f2a2c..54578d4d 100644 --- a/docs/configuration/device-config/index.mdx +++ b/docs/configuration/device-config/index.mdx @@ -17,5 +17,5 @@ There are several config sections in the Meshtastic firmware, these are broken o | [LoRa](/docs/settings/config/lora) | The LoRa config options are: Region, Modem Preset, Max Hops, Transmit Power, Bandwidth, Spread Factor, Coding Rate, Frequency Offset, Transmit Disabled and Ignore Incoming Array. | | [Network](/docs/settings/config/network) | Network config options are: WiFi Enabled, WiFi SSID, WiFi PSK, WiFi Mode and NTP Server. | | [Position](/docs/settings/config/position) | Position config options are: GPS Enabled, GPS Update Interval, GPS Attempt Time, Fixed Position, Smart Broadcast, Broadcast Interval and Position Packet Flags. | -| [Power](/docs/settings/config/power) | Power config options are: Charge Current, Power Saving, Shutdown after losing power, ADC Multiplier Override Wait Bluetooth Interval, Mesh Super Deep Sleep Timeout, Super Deep Sleep Interval, Light Sleep Interval and Minimum Wake Interval. | +| [Power](/docs/settings/config/power) | Power config options are: Charge Current, Power Saving, Shutdown after losing power, ADC Multiplier Override Wait Bluetooth Interval, Light Sleep Interval and Minimum Wake Interval. | | [User](/docs/settings/config/user) | The user config options are: Long Name, Short Name, and Is Licensed | From 5db79ff93f64f6af16cd167e1c8c14e38a98a18b Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Sun, 13 Aug 2023 13:19:05 -0700 Subject: [PATCH 3/3] @thebentern Remove trademark grant for now officially adopted ATAK plugin --- docs/legal/trademark-grants.mdx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/legal/trademark-grants.mdx b/docs/legal/trademark-grants.mdx index cadcea54..13b70880 100644 --- a/docs/legal/trademark-grants.mdx +++ b/docs/legal/trademark-grants.mdx @@ -23,6 +23,4 @@ sidebar_label: Trademark Grants - Grant: [Keith Monaghan](http://voltaicenclosures.com/) - Details: Keith is a contributer of computer aided design (CAD)/3D designs primarily for device enclosures and accessories, and runs an online shop for Meshtastic powered devices which carry the "Meshtastic" and "M" logos. The use of the Meshtastic Logo and Trademarks does not imply Keith is sponsored or endorsed by Meshtastic. Keith also agrees to maintain compliance with the Meshtastic Legal requirements. This grant is revokable at any time for any reason. - Grant: [Neil Hao](https://shop.uniteng.com/) - - Details: Neil is a contributer of hardware designs, and runs an online shop for Meshtastic powered devices which carry the "Meshtastic" and "M" logos. The use of the Meshtastic Logo and Trademarks does not imply Neil is sponsored or endorsed by Meshtastic. Neil also agrees to maintain compliance with the Meshtastic Legal requirements. This grant is revokable at any time for any reason. -- Grant: (https://github.com/niccellular/Meshtastic-Plugin) - - Details: The Meshtastic-Plugin is an Android Tactical Assault Kit (ATAK) plugin that interacts with the Meshtastic Android App's IMeshService for sending/receving Cursor on Target (CoT) messages. The use of the Meshtastic Logo and Trademarks does not imply Meshtastic-Plugin is sponsored or endorsed by Meshtastic. Meshtastic-Plugin also agrees to maintain compliance with the Meshtastic Legal requirements. This grant is revokable at any time for any reason. \ No newline at end of file + - Details: Neil is a contributer of hardware designs, and runs an online shop for Meshtastic powered devices which carry the "Meshtastic" and "M" logos. The use of the Meshtastic Logo and Trademarks does not imply Neil is sponsored or endorsed by Meshtastic. Neil also agrees to maintain compliance with the Meshtastic Legal requirements. This grant is revokable at any time for any reason. \ No newline at end of file