](/img/hardware/lora-v2.1-1.6.png)
\ No newline at end of file
diff --git a/website/docs/legal/privacy.md b/website/docs/legal/privacy.md
new file mode 100644
index 00000000..147cf429
--- /dev/null
+++ b/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!
\ No newline at end of file
diff --git a/website/docs/software/android/usage.md b/website/docs/software/android/usage.md
index f2460fb1..44e5f9ce 100644
--- a/website/docs/software/android/usage.md
+++ b/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
[](/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.
+
[](/img/android/android-settings-options.png)
### Advanced settings
diff --git a/website/docs/software/other/remote-hardware-service.md b/website/docs/software/other/remote-hardware-service.md
deleted file mode 100644
index dc4d37a1..00000000
--- a/website/docs/software/other/remote-hardware-service.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-id: remote-hardware-service
-title: Remote Hardware Service
-sidebar_label: Remote Hardware
----
-
-FIXME - the following are a collection of notes moved from elsewhere. We need to refactor these notes into actual documentation on the remote-hardware/gpio service.
-
-### 1.7.2. New 'no-code-IOT' mini-app
-
-Add a new 'remote GPIO/serial port/SPI/I2C access' mini-app. This new standard app would use the MQTT messaging layer to let users (developers that don't need to write device code) do basic (potentially dangerous) operations remotely.
-
-#### 1.7.2.1. Supported operations in the initial release
-
-Initially supported features for no-code-IOT.
-
-- Set any GPIO
-- Read any GPIO
-
-#### 1.7.2.2. Supported operations eventually
-
-General ideas for no-code IOT.
-
-- Subscribe for notification of GPIO input status change (i.e. when pin goes low, send my app a message)
-- Write/read N bytes over I2C/SPI bus Y (as one atomic I2C/SPI transaction)
-- Send N bytes out serial port Z
-- Subscribe for notification for when regex X matches the bytes that were received on serial port Z
diff --git a/website/docs/software/python/cli.md b/website/docs/software/python/cli.md
index ae154bc6..7f7fe11f 100644
--- a/website/docs/software/python/cli.md
+++ b/website/docs/software/python/cli.md
@@ -57,7 +57,7 @@ The channel settings can be changed similiarly. Either by using a standard (sha
The URL is constructed automatically based off of the current channel settings. So if you want to customize a channel you could do something like:
```bash
-meshtastic --setchan name mychan --setchan channel_num 4 --info
+meshtastic --ch-set name mychan --ch-set channel_num 4 --info
```
This will change some channel params and then show device info (which will include the current channel URL)
@@ -65,14 +65,14 @@ This will change some channel params and then show device info (which will inclu
You can even set the channel preshared key to a particular AES128 or AES256 sequence.
```bash
-meshtastic --setchan psk 0x1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b --info
+meshtastic --ch-set psk 0x1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b1a1a1a1a2b2b2b2b --info
```
-Use `--setchan psk none` to turn off encryption.
+Use `--ch-set psk none` to turn off encryption.
-Use `--setchan psk random` will assign a new (high quality) random AES256 key to the primary channel (similar to what the Android app does when making new channels).
+Use `--ch-set psk random` will assign a new (high quality) random AES256 key to the primary channel (similar to what the Android app does when making new channels).
-Use `--setchan psk default` to restore the standard 'default' (minimally secure, because it is in the source code for anyone to read) AES128 key.
+Use `--ch-set psk default` to restore the standard 'default' (minimally secure, because it is in the source code for anyone to read) AES128 key.
### Ham radio support
diff --git a/website/docs/software/web/partitions.md b/website/docs/software/web/partitions.md
index 1d75f0ee..224c67ab 100644
--- a/website/docs/software/web/partitions.md
+++ b/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). After loading the project in Visual Studio, select the PlatformIO alien icon, then find the appropriate device, and then click the Erase Flash command.
diff --git a/website/sidebars.js b/website/sidebars.js
index b1949275..ad9ca202 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -80,7 +80,6 @@ module.exports = {
{
Other: [
"software/other/sw-design",
- "software/other/remote-hardware-service",
"software/other/rak815",
"software/other/power",
"software/other/plugin-api",
@@ -120,7 +119,6 @@ module.exports = {
"developers/device/radio-settings",
"developers/device/encryption",
"developers/device/portnum",
- "developers/device/supported-hardware",
"developers/device/http-api",
"developers/device/documents",
],
@@ -130,6 +128,7 @@ module.exports = {
"legal/overview",
"legal/licensing",
"legal/trademark",
+ "legal/privacy",
],
},
};
From ea233c941a9cfa65abb90aec72e3d447e0d3478f Mon Sep 17 00:00:00 2001
From: apt105 <73254487+apt105@users.noreply.github.com>
Date: Mon, 3 May 2021 22:41:15 +0100
Subject: [PATCH 2/7] add RAK and small edits to hardware section
---
website/docs/hardware/rak4631.md | 29 ++++++++++++++++++++++++
website/docs/hardware/tbeam.md | 2 +-
website/docs/hardware/techo.md | 10 ++++++++
website/static/img/hardware/rak4631.png | Bin 0 -> 173905 bytes
4 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 website/docs/hardware/rak4631.md
create mode 100644 website/static/img/hardware/rak4631.png
diff --git a/website/docs/hardware/rak4631.md b/website/docs/hardware/rak4631.md
new file mode 100644
index 00000000..2cdfa70f
--- /dev/null
+++ b/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)
+
+
\ No newline at end of file
diff --git a/website/docs/hardware/tbeam.md b/website/docs/hardware/tbeam.md
index 0aea2670..61c35a61 100644
--- a/website/docs/hardware/tbeam.md
+++ b/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
diff --git a/website/docs/hardware/techo.md b/website/docs/hardware/techo.md
index eecff5d8..1c439b3e 100644
--- a/website/docs/hardware/techo.md
+++ b/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`
+
See this [recent tweet](https://twitter.com/lilygo9/status/1383323118756712457) from LILYGO® showing the function of the T-Echo.
\ No newline at end of file
diff --git a/website/static/img/hardware/rak4631.png b/website/static/img/hardware/rak4631.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1f2ff161dc697ef96e7d08be1aa3280ce6d098c
GIT binary patch
literal 173905
zcmeFYXEQoueF
znJIerFyWl^qF;_(om)>q{;-x0_?^g|?_{&<)hlY^A+E=JK{jb=JC{#$$@fOjDyjvE
z$e!{1faqk8%mCvW(+$+o~v@E^7~9dR|zZwLX