Merged changes from upstream

website/docs/developers/device/supported-hardware.md

@@ -1,14 +0,0 @@
----
-id: supported-hardware
-title: Supported Hardware
-sidebar_label: Supported Hardware
----
-
-| Vendor | Product line | Version | Board labels     | Notes                                                                                                                 | URL                                                       |
-| ------ | ------------ | ------- | ---------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------- |
-| TTGO   | T-Beam       | 0.7     | T22_V07 20180711 | LoRa 433/470MHz _OR_ LoRa 868/915MHz , <br/>GPS ublox NEO-6M , <br/>battery holder for Li-Ion 18650                   | [buy](https://www.aliexpress.com/item/4000574335430.html) |
-| TTGO   | T-Beam       | 1.0     |                  |                                                                                                                       | [buy](https://www.aliexpress.com/item/4001178678568.html) |
-| TTGO   | T-Beam       | 1.1     | T22_V11 20191212 | LoRa 433/470MHz _OR_ LoRa 868/915MHz _OR_ LoRa 923MHz , <br/>GPS ublox NEO-M8N , <br/>battery holder for Li-Ion 18650 | [buy](https://www.aliexpress.com/item/4001178678568.html) |
-| TTGO   | Lora32       | 2.0     | _missing_        | LoRa 433/470MHz _OR_ LoRa 868/915MHz , <br/>OLED SSD1306 , <br/>SD card holder                                        | [buy](https://www.aliexpress.com/item/4000211331316.html) |
-| TTGO   | Lora32       | 2.1     | T3_V1.6 20180606 | LoRa 32 (V2) , <br/>SD card holder                                                                                    | [buy](https://www.aliexpress.com/item/4000119208093.html) |
-| Heltec | Lora 32      | V2      | V2               | LoRa 433/470MHz _OR_ LoRa 868/915MHz                                                                                  | [buy](https://heltec.org/project/wifi-lora-32/)           |

website/docs/getting-started/about.md

@@ -7,8 +7,7 @@ slug: /about
 
 <!--- TODO create new about page and remove it from the "documentation" section --->
 
-Meshtastic® is a project that lets you use
-inexpensive ($30 ish) GPS radios as an extensible, long battery life, secure, mesh GPS communicator. These radios are great for hiking, skiing, paragliding - essentially any hobby where you don't have reliable internet access. Each member of your private mesh can always see the location and distance of all other members and any text messages sent to your group chat.
+Meshtastic® is a project that lets you use inexpensive ($30 ish) LoRa radios as an extensible, long battery life, secure, mesh GPS communicator. These radios are great for hiking, skiing, paragliding - essentially any hobby where you don't have reliable internet access. Each member of your private mesh can always see the location and distance of all other members and any text messages sent to your group chat.
 
 The radios automatically create a mesh to forward packets as needed, so everyone in the group can receive messages from even the furthest member. The radios will optionally work with your phone, but no phone is required.
 

website/docs/getting-started/getting_started.md

@@ -7,7 +7,7 @@ slug: /getting-started
 
 ## Purchase a Radio
 
-The easiest way is to [buy a device with the software already installed](https://www.aliexpress.com/item/4001178678568.html) In the Americas get the 915mhz version, In Europe the 868Mhz or Asia 923Mhz see [here](https://www.thethingsnetwork.org/docs/lorawan/frequencies-by-country.html).
+The easiest way is to [buy a device with the software already installed](https://www.aliexpress.com/item/4001178678568.html). Other devices are [available](/docs/hardware/tbeam-hardware). In the Americas get the 915mhz version, in Europe the 868Mhz, or Asia 923Mhz. See this listing by [The Things Network](https://www.thethingsnetwork.org/docs/lorawan/frequencies-by-country.html) for frequencies by specific countries.
 
 ## Setup the Radio
 
@@ -19,7 +19,7 @@ Make sure not to power the radio on without first attaching the antenna! You cou
 
 ## Download Firmware
 
-Prebuilt binaries for the supported radios are available in our releases. Your initial installation has to happen over USB from your Mac, Windows or Linux PC. Once our software is installed, all future software updates happen over bluetooth from your phone.
+Prebuilt binaries for the supported radios are available in our releases. Your initial installation has to happen over USB from your Mac, Windows or Linux PC. Once our software is installed, all future software updates can happen over bluetooth from your phone.
 
 <!--- TODO I'd like to create prettier buttons for this than just a table --->
 | [Current Firmware](https://github.com/meshtastic/meshtastic-device/releases/latest) | [List of Firmware Versions](https://github.com/meshtastic/meshtastic-device/releases/) |
@@ -27,7 +27,7 @@ Prebuilt binaries for the supported radios are available in our releases. Your i
 
 ## Flashing Firmware
 
-If your device already has Meshtastic flashed to it, You can update over the air (OTA). Otherwise you'll need a computer and a **data** USB cable.
+If your device already has Meshtastic flashed to it, You can update it over the air (OTA). Otherwise you'll need a computer and a **data** USB cable. This can be done in the following ways:
 
 - Install using the command line interface (CLI)
 - Install using a graphical user interface (GUI)
@@ -35,13 +35,13 @@ If your device already has Meshtastic flashed to it, You can update over the air
 
 ## Connect to your Device
 
-There are many ways to connect to your new radio! Using the command line interface
+There are many ways to connect to your new radio!
 
 - Command line interface (CLI)
 - Graphic user interface (GUI)
 - Serial connection
 - Bluetooth
-- Web (in development)
+- Web app over wifi (in development)
 
 ## Troubleshooting
 

website/docs/hardware/antenna.md

@@ -115,3 +115,36 @@ This can be done by utilising the [range test plugin](/docs/software/plugins/ran
 To comment on / join in antenna range [Meshtastic discourse](https://meshtastic.discourse.group/t/antenna-improved-range/227/35?u=sens8tion)
 
 There, you will also find reference to Meshtastic range achievements, aerial recommendations (note we've stopped short of making specific supplier aerial recommendations in this wiki).
+
+## Resources
+
+### Coverage prediction
+
+* [Tower Coverage.com](https://www.towercoverage.com/)
+    * Commercial but has free options
+
+
+* [HeyWhat'sThat](http://www.heywhatsthat.com/)
+    * Free with path profiling options
+
+
+* [Radio Mobile Online](https://www.ve2dbe.com/rmonline_s.asp)
+    * Radio Mobile Online is a radio wave propagation prediction tool dedicated to amateur radio
+
+
+### RF Tools
+
+* [Times Microwave Systems](https://www.timesmicrowave.com/calculator/?Product=RG-6&RunLength=10&Frequency=868)
+    * Coaxial Cable Attenuation & Power Handling Calculator
+
+
+* [Solwise Link Budget Calculator](https://www.solwise.co.uk/link-budget.htm)
+    * Predict the received signal strength
+
+
+### Antenna designs
+
+* [1/4 Wave Ground Plane Antenna Calculator](https://m0ukd.com/calculators/quarter-wave-ground-plane-antenna-calculator/)
+
+
+* [Quadrifilar helicoidal antenna calculator](https://jcoppens.com/ant/qfh/calc.en.php)

website/docs/hardware/lora.md

@@ -79,4 +79,8 @@ sidebar_label: LILYGO® Lora
 * Firmware file: `firmware-tlora-v2-1-1.6-1.x.x.bin`
 * [Purchase link](https://www.aliexpress.com/item/32915894264.html)
 
+:::warning
+Some of these boards contained the wrong component in the lipo battery charging circuit allowing the battery to be overcharged. While this does appear to have been fixed recently, please see the [warning](https://www.thethingsnetwork.org/community/berlin/post/warning-attention-users-of-ttgo21-v16-boards-labeled-t3_v16-on-pcb-battery-exploded-and-got-on-fire) on The Things Network for more information.
+:::
+
 [<img src="/img/hardware/lora-v2.1-1.6.png" alt="LILYGO® TTGO Lora V2.1-1.6" style={{zoom:'25%'}} />](/img/hardware/lora-v2.1-1.6.png)

website/docs/hardware/rak4631.md

@@ -0,0 +1,29 @@
+---
+id: wisBlock-hardware
+title: Wisblock RAK4631
+sidebar_label: WisBlock
+---
+
+There is currently fledgling support for the WisBlock RAK4631 module. The WisBlock ecosystem allows for an expansion of sensor, display and I/O devices.
+
+* nRF52840 - Bluetooth BLE 5.0 and very low power consumption
+* SX1262 - LoRa transceiver
+* Frequency options:
+    * 433 Mhz
+    * 470 Mhz
+    * 799 Mhz
+    * 865 Mhz
+    * 868 Mhz
+    * 915 Mhz
+    * 920 Mhz
+    * 923 Mhz
+* Optional GPS
+* U.FL antenna connector
+* Optional switches
+* Optional screen
+
+
+* Firmware file: `firmware-rak4631-1.x.x.uf2`
+* [Purchase Link](https://docs.rakwireless.com/Product-Categories/WisBlock/RAK4631/Overview)
+
+<img alt="RAK4631 Core Module" src="/img/hardware/rak4631.png" style={{zoom:'50%'}} />

website/docs/hardware/tbeam.md

@@ -88,7 +88,7 @@ sidebar_label: LILYGO® T-Beam
 ## T-Beam - M8N & SX1262
 
 * ESP32 - Wifi & Bluetooth
-* SX1272 - LoRa Transceiver - improved performance
+* SX1262 - LoRa Transceiver - improved performance
 * Frequency options:
     * 433 MHz
     * 868 MHz 

website/docs/hardware/techo.md

@@ -6,6 +6,16 @@ sidebar_label: LILYGO® T-Echo
 
 The T-Echo has been in development by LILYGO® over the past few months and appears to be nearing release. Once it is released we will update this page with more information.
 
+* nRF52840 - Bluetooth BLE 5.0 and very low power consumption
+* SX1262 - LoRa transceiver
+* 1.54" eInk display
+* Air530 - GPS receiver - Fast locking
+* Two buttons
+* RTC
+
+
+* firmware file: `firmware-t-echo-1.x.x.uf2`
+
 <img alt="LILYGO T-Echo" src="/img/hardware/t-echo.png" style={{zoom: '15%'}} />
 
 See this [recent tweet](https://twitter.com/lilygo9/status/1383323118756712457) from LILYGO® showing the function of the T-Echo.

website/docs/legal/privacy.md

@@ -0,0 +1,19 @@
+---
+id: privacy
+title: Meshtastic privacy policy
+sidebar_label: Privacy
+---
+
+We don't collect any personal identifying information.  
+
+If you have opted-in to analytics on the Android app (thank you - that helps us know what things we need to improve), we will receive anonymized information about user behavior.  This includes crash reports,  which screens you used in the app etc... Analytics is provided by [Crashlytics](https://firebase.google.com/products/crashlytics).
+
+We never capture usernames, the contents of your texts or your location.
+
+Maps provided by Mapbox require analytics to work. For more information about what they collect, please see the [Mapbox privacy policy](https://www.mapbox.com/legal/privacy/).
+
+The search engine for this website is provided by Algolia, please see their [privacy policy](https://www.algolia.com/policies/privacy/) for details of what information they collect.
+
+This is an open-source project run by hobbyists and we try to be completely transparent.  If you have questions on this policy, please post on the forum and we'll reply/clarify/correct.
+
+Keep being awesome!

website/docs/software/android/usage.md

@@ -121,7 +121,7 @@ There is no long-term store-and-forward of messages, so messages not received wi
 
 ### View your network
 
-The network list shows all the users (devices) that have connected to the same Channel. For each entry, it shows the last time they were active, their distance, and their last known power status (battery & percentage, or external power). In the example below, Eddie is the local user, Mike is active and 29m away, and a third node has been inactive since 9:02pm.
+The network list shows all the users (devices) that have connected to the same Channel. For each entry, it shows the last time they were active, their distance, and their last known power status (battery & percentage, or external power). In the example below, Lora V2 is the local user, m8n was last heard from 3 minutes ago and is 29m away, and 25C is active and 498m away.
 
 This is a list of network nodes, rather than users, so where there is a named user connected to the device, you will see the user name, otherwise the node is shown as `Unknown a3c9` (where `a3c9` is the last 4 hex digits from the MAC address.)
 
@@ -133,11 +133,13 @@ The Map tab will show a local map with an icon for each active mesh node that ha
 
 [![Mapping provided by Mapbox](/img/android/android-map-sm.png)](/img/android/android-map.png)
 
-The map is not developed by the Meshtastic project, and the source of the maps is [Mapbox](https://docs.mapbox.com/help/how-mapbox-works/) (free-tier), and the map data is sourced from [OpenStreetMap OSM](https://www.openstreetmap.org/). Mapbox currently requires analytics to be enabled for you to use their mapping system. There is currently no off-line maps (phone needs mobile data), although this will be improved in the future. If you don't see the features that you'd expect on the map then head over to [OpenStreetMap OSM](https://www.openstreetmap.org/) where you can contribute new data to the map.
+The map is not developed by the Meshtastic project, and the source of the mapping system is [Mapbox](https://docs.mapbox.com/help/how-mapbox-works/) (free-tier), and the map data is sourced from [OpenStreetMap OSM](https://www.openstreetmap.org/). Mapbox currently requires analytics to be enabled for you to use their mapping system. There is currently no off-line maps (phone needs mobile data or wifi), although this will be improved in the future. If you don't see the features that you'd expect on the map then head over to [OpenStreetMap OSM](https://www.openstreetmap.org/) where you can contribute new data to the map.
 
 
 ## Configuration options
 
+Pressing the three verticle dots in the top right corner shows the configuration menu.
+
 [![Meshtastic configuration options](/img/android/android-settings-options-c.png)](/img/android/android-settings-options.png)
 
 ### Advanced settings

website/docs/software/web/partitions.md

@@ -12,17 +12,17 @@ This problem seems to occur when your board has the partitioning structure set i
 
 There are a number of methods that essentially involve erasing the flash and then re-uploading the Meshtastic firmware.
 
-### Install Script
+## Install Script
 
 The most reliable way to fix this problem is to use the install script that is included in the meshtastic firmware zip. If that doesn’t work, these other methods may work:
 
-### Alternative methods
+## Alternative methods
 
-#### Using the Arduino IDE:
+### Using the Arduino IDE:
 
 https://meshtastic.discourse.group/t/solved-help-installing-with-other-than-esphome-flasher/2214/9
 
-#### Using Pio in Windows
+### Using Pio in Windows
 ```powershell
 pio run --target erase --environment tbeam
 ```
@@ -30,7 +30,7 @@ Then re-install the firmware ie using ESPHome Flasher
 
 Requires: [Python](https://www.python.org/), [Pio](https://pypi.org/project/pio/), command to be run in the root directory of the meshtastic-device project once you’ve cloned it (this last requirement is an assumption based on pio not knowing what a tbeam is, may also require Visual Studio Code and PlatformIO as these were installed during use).
 
-#### Esptool.py
+### Esptool.py
 @1984 posted another method using the python based esptool.py to erase and re-flash the firmware:
 ```bash
 esptool.py --baud 921600 erase_flash
@@ -41,7 +41,7 @@ esptool.py --baud 921600 write_flash 0x10000 firmware-tbeam-EU865-1.1.42.bin
 
 Requires: [Python](https://www.python.org/) and [esptool.py](https://github.com/espressif/esptool)
 
-#### Visual Studio & PlatformIO
+### Visual Studio & PlatformIO
 There is also the method of using the Visual Studio IDE. This requires having Visual Studio and PlatformIO installed, along with having cloned the meshtastic-device code as per the [build instructions](https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/build-instructions.md)<!-- link to be changed once build page is completed -->. After loading the project in Visual Studio, select the PlatformIO alien icon, then find the appropriate device, and then click the Erase Flash command.
 
 ![Erasing the flash using PlatformIO in Visual Studio Code](/img/platformio-erase.png)

website/sidebars.js

@@ -117,6 +117,7 @@ module.exports = {
           "hardware/lora-hardware",
           "hardware/heltec-hardware",
           "hardware/techo-hardware",
+          "hardware/wisBlock-hardware",
         ],
       },
       "hardware/behaviour",
@@ -133,7 +134,6 @@ module.exports = {
           "developers/device/radio-settings",
           "developers/device/encryption",
           "developers/device/portnum",
-          "developers/device/supported-hardware",
           "developers/device/http-api",
           "developers/device/documents",
         ],
@@ -143,6 +143,7 @@ module.exports = {
       "legal/overview",
       "legal/licensing",
       "legal/trademark",
+      "legal/privacy",
     ],
   },
 };