Merge branch 'master' into patch-8

This commit is contained in:
Foster Irwin 2023-02-02 09:11:15 -07:00 committed by GitHub
commit afb0821936
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions

View file

@ -36,7 +36,7 @@ The presets are designed to provide further options for optimizing either speed
1. A high number of devices exist in the mesh, or messages are sent very frequently. Faster speeds (and therefore lower radio time per device) can help with mesh network congestion. 1. A high number of devices exist in the mesh, or messages are sent very frequently. Faster speeds (and therefore lower radio time per device) can help with mesh network congestion.
2. Maximum range is desired, for long range scenarios where a several second delay in message receipt is acceptable (for instance, attempting to send messages from a town to a distant mountain top). 2. Maximum range is desired, for long range scenarios where a several second delay in message receipt is acceptable (for instance, attempting to send messages from a town to a distant mountain top).
The Presets available as as follows, and follow a linear pattern of Fastest <--> Slowest, and Shortest <--> Longest range: The Presets available are as follows, and follow a linear pattern of Fastest <--> Slowest, and Shortest <--> Longest range:
1. `SHORT_FAST` (Fastest, highest bandwidth, lowest airtime, shortest range) 1. `SHORT_FAST` (Fastest, highest bandwidth, lowest airtime, shortest range)
@ -48,8 +48,11 @@ The Presets available as as follows, and follow a linear pattern of Fastest <-->
5. `LONG_FAST` (Default) 5. `LONG_FAST` (Default)
6. `LONG_SLOW` 6. `LONG_MODERATE`
7. `VERY_LONG_SLOW` (Slowest, lowest bandwidth, highest airtime, longest range)
7. `LONG_SLOW`
8. `VERY_LONG_SLOW` (Slowest, lowest bandwidth, highest airtime, longest range)
### Max Hops ### Max Hops

View file

@ -16,7 +16,7 @@ Power settings are advanced configuration, most users should choose a role under
### Power Saving ### Power Saving
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. If set, Bluetooth, Wifi, and screen (if applicable) are turned off. When using the Router device role, this setting is on by default. The assumption for a Router is that the device will be used in a standalone manner where these features are not needed, and will be shut off to conserve power. This is especially useful when a device is powered from a low-current source (i.e. solar).
### Shutdown after losing power ### Shutdown after losing power

View file

@ -85,6 +85,7 @@ This is an earlier version of the T-Beam board. Due to changes in the design thi
- Firmware file: `firmware-tbeam-X.X.X.xxxxxxx.bin` - Firmware file: `firmware-tbeam-X.X.X.xxxxxxx.bin`
- Purchase link: [AliExpress](https://www.aliexpress.com/item/4001178678568.html) - Purchase link: [AliExpress](https://www.aliexpress.com/item/4001178678568.html)
- US Distributor - Purchase link: [Rokland](https://store.rokland.com/products/lilygo-ttgo-t-beam-v1-1-lora-esp32-development-board-wifi-bluetooth-module-gps-neo-6m-sx1276-915mhz-q219?ref=8Bb2mUO5i-jKwt)
![TTGO T-Beam v1.1](/img/hardware/t-beam-v1.1.png) ![TTGO T-Beam v1.1](/img/hardware/t-beam-v1.1.png)
![TTGO T-Beam v1.1 pinmap](/img/hardware/t-beam_v1.1_pinmap.webp) ![TTGO T-Beam v1.1 pinmap](/img/hardware/t-beam_v1.1_pinmap.webp)
@ -118,6 +119,7 @@ This is an earlier version of the T-Beam board. Due to changes in the design thi
- Firmware file: `firmware-tbeam-X.X.X.xxxxxxx.bin` - Firmware file: `firmware-tbeam-X.X.X.xxxxxxx.bin`
- Purchase link: [AliExpress](https://www.aliexpress.com/item/33047631119.html) - Purchase link: [AliExpress](https://www.aliexpress.com/item/33047631119.html)
- US Distributor - Purchase link: [Rokland](https://store.rokland.com/products/lilygo-ttgo-t-beam-v1-1-ipex-esp32-lora-915mhz-wifi-wireless-bluetooth-module-gps-neo-m8n-ipex-18650-battery-holder-q107?ref=8Bb2mUO5i-jKwt)
![TTGO T-Beam M8N](/img/hardware/t-beam-m8n.png) ![TTGO T-Beam M8N](/img/hardware/t-beam-m8n.png)
@ -149,6 +151,7 @@ This is an earlier version of the T-Beam board. Due to changes in the design thi
- Firmware file: `firmware-tbeam-X.X.X.xxxxxxx.bin` - Firmware file: `firmware-tbeam-X.X.X.xxxxxxx.bin`
- Purchase link: [AliExpress](https://www.aliexpress.com/item/4001287221970.html) - Purchase link: [AliExpress](https://www.aliexpress.com/item/4001287221970.html)
- US Distributor - Purchase link: [Rokland](https://store.rokland.com/products/lilygo-t-beam-v1-1-neo-m8n-gnss-ipex-lora-sx1262-915mhz-wireless-module-wifi-bluetooth-board-q215?ref=8Bb2mUO5i-jKwt)
![T-Beam M8N & SX1262](/img/hardware/t-beam-sx1262.png) ![T-Beam M8N & SX1262](/img/hardware/t-beam-sx1262.png)