Merge branch 'master' into i18n

This commit is contained in:
Thomas Göttgens 2023-12-12 13:15:27 +01:00 committed by GitHub
commit c169766590
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 296 additions and 323 deletions

View file

@ -9,6 +9,9 @@ import Link from "@docusaurus/Link";
Meshtastic® is a project that enables you to use inexpensive LoRa radios as a long range off-grid communication platform in areas without existing or reliable communications infrastructure. This project is 100% community driven and open source!
![LoRa Topology](/img/introduction/lora-topology-2.png)
### Features
- Long range ([_254km record by kboxlabs_](/docs/overview/range-tests#current-record))

View file

@ -146,11 +146,11 @@ values={[
Navigate to: Vertical Ellipsis (3 dots top right) > Radio configuration > MQTT: Turn on the slider for **MQTT enabled** and tap **Send**.
[![MQTT Settings](/img/modules/mqtt/android_mqtt_sm.png)](/img/modules/mqtt/android_mqtt.png)
[![MQTT Settings](/img/modules/mqtt/android_mqtt_encryption_sm.png)](/img/modules/mqtt/android_mqtt_encryption.png)
*Optional:* To use your phone's internet connection to send and receive packets over the web, also enable the slider for **MQTT Client Proxy** and skip the Configure Network Settings step below.
[![Client Proxy](/img/modules/mqtt/android_mqtt_proxy_sm.png)](/img/modules/mqtt/android_mqtt_proxy.png)
[![Client Proxy](/img/modules/mqtt/android_mqtt_proxy_sm.png)](/img/modules/mqtt/android_mqtt_proxy_encryption.png)
<h3>2. Enable Channel Uplink & Downlink</h3>
@ -171,12 +171,12 @@ Navigate to: Vertical Ellipsis (3 dots top right) > Radio configuration > Networ
Navigate to Settings > MQTT: Turn on the slider for MQTT enabled and tap **Save**
[![MQTT Settings 1](/img/modules/mqtt/apple_mqtt_1_sm.png)](/img/modules/mqtt/apple_mqtt_1.png)
[![MQTT Settings 1](/img/modules/mqtt/apple_mqtt_1_encryption_sm.png)](/img/modules/mqtt/apple_mqtt_1_encryption.png)
[![MQTT Settings 2](/img/modules/mqtt/apple_mqtt_2_sm.png)](/img/modules/mqtt/apple_mqtt_2.png)
*Optional:* To use your phone's internet connection to send and receive packets over the web, also enable the slider for **MQTT Client Proxy** and skip the Configure Network Settings step below.
[![Client Proxy](/img/modules/mqtt/apple_mqtt_1_proxy_sm.png)](/img/modules/mqtt/apple_mqtt_1_proxy.png)
[![Client Proxy](/img/modules/mqtt/apple_mqtt_1_proxy_sm.png)](/img/modules/mqtt/apple_mqtt_1_proxy_encryption.png)
<h3>2. Enable Channel Uplink & Downlink</h3>
@ -231,11 +231,11 @@ meshtastic --set network.wifi_enabled true --set network.wifi_ssid "your network
Navigate to Config > Module Config > MQTT - Turn on the slider for MQTT enabled - Click the **Save** icon.
[![MQTT Settings](/img/modules/mqtt/web_mqtt_sm.png)](/img/modules/mqtt/web_mqtt.png)
[![MQTT Settings](/img/modules/mqtt/web_mqtt_encryption_sm.png)](/img/modules/mqtt/web_mqtt_encryption.png)
*Optional:* To use your client's internet connection to send and receive packets over the web, also enable the slider for **Proxy to Client Enabled** and skip the Configure Network Settings step below.
[![Client Proxy](/img/modules/mqtt/web_mqtt_proxy_sm.png)](/img/modules/mqtt/web_mqtt_proxy.png)
[![Client Proxy](/img/modules/mqtt/web_mqtt_proxy_sm.png)](/img/modules/mqtt/web_mqtt_proxy_encryption.png)
:::caution

View file

@ -1,6 +1,6 @@
---
id: drag-n-drop
title: Drag & Drop nRF52 Firmware Updates
title: Drag & Drop nRF52 & RP2040 Firmware Updates
sidebar_label: Drag & Drop (recommended)
sidebar_position: 1
---
@ -11,15 +11,23 @@ import Link from "@docusaurus/Link";
## Flash Firmware
Download and unzip the latest firmware from [Meshtastic Downloads](https://meshtastic.org/downloads).
### nRF52
1. Connect your device to your computer with a USB data cable.
2. Double click the reset button on your device (this will put it into bootloader mode)
3. Notice a new drive will be mounted on your computer (Windows, Mac, or Linux)
4. Open this drive and you should see three files: `CURRENT.UF2`, `INDEX.HTM`, and `INFO_UF2.TXT`
5. Drop the appropriate firmware file (`firmware-DEVICE_NAME-x.x.x-xxxxxxx.uf2`) from the release onto this drive.
1. Download and unzip the latest firmware from [Meshtastic Downloads](https://meshtastic.org/downloads).
2. Connect your device to your computer with a USB data cable.
3. Double click the reset button on your device (this will put it into bootloader mode).
4. Notice a new drive will be mounted on your computer (Windows, Mac, or Linux).
5. Open this drive and you should see three files: `CURRENT.UF2`, `INDEX.HTM`, and `INFO_UF2.TXT`.
6. Copy the appropriate firmware file (`firmware-DEVICE_NAME-X.X.X-xxxxxxx.uf2`) from the release onto this drive.
7. Once the file has finished copying onto the drive, the device will reboot and install the Meshtastic firmware.
Once the file has finished copying onto the drive, the device will reboot and install the Meshtastic firmware.
### RP2040
1. Download and unzip the latest firmware from [Meshtastic Downloads](https://meshtastic.org/downloads).
2. Press the BOOTSEL button and while keeping it pressed, connect the device to your computer via a USB cable.
3. Notice a new drive will be mounted on your computer (Windows, Mac, or Linux).
4. Open this drive and you should see two files: `INDEX.HTM` and `INFO_UF2.TXT`.
5. Copy the appropriate firmware file (`firmware-DEVICE_NAME-X.X.X-xxxxxxx.uf2`) from the release onto this drive.
6. Once the file has finished copying onto the drive, the device will reboot and install the Meshtastic firmware.
## Connect and Configure Device

View file

@ -1,21 +1,21 @@
---
id: flashing-nrf52-devices
title: Flash nRF52 Devices
sidebar_label: nRF52 Device
title: Flash nRF52 & RP2040 Devices
sidebar_label: nRF52/RP2040 Device
sidebar_position: 2
---
## Flashing Methods for nRF52 Devices
## Flashing Methods for nRF52 and RP2040 Devices
The nRF52 based devices have the easiest firmware upgrade process. No driver or software install is required on any platform.
nRF52 and RP2040 based devices have the easiest firmware upgrade process. No driver or software install is required on any platform.
### Drag & Drop
nRF52 devices use the [Drag & Drop](/docs/getting-started/flashing-firmware/nrf52/drag-n-drop) installation method to install firmware releases.
nRF52 and RP2040 devices use the [Drag & Drop](/docs/getting-started/flashing-firmware/nrf52/drag-n-drop) installation method to install firmware releases.
### Over-The-Air (OTA)
nRF52 devices are able to accept [OTA firmware updates](/docs/getting-started/flashing-firmware/nrf52/ota) from a mobile device over bluetooth.
### Factory Erase
### nRF Factory Erase
You may wish to perform a [Factory Erase](/docs/getting-started/flashing-firmware/nrf52/nrf52-erase) prior to installing firmware to clear data that may change format and location between releases.
### Convert RAK4631-R to RAK4631

View file

@ -1,25 +1,39 @@
---
id: nrf52-erase
title: Flash nRF52 Factory Erase
sidebar_label: Factory Erase nRF52
title: Flash nRF52/RP2040 Factory Erase
sidebar_label: Factory Erase
sidebar_position: 3
---
import Link from "@docusaurus/Link";
Meshtastic uses the [littlefs](https://github.com/littlefs-project/littlefs) library to store configuration, logs, and other data in the internal flash of nRF52 devices. Updating the firmware does _not_ erase this additional data, which can cause issues when the format and location of data changes between releases.
Meshtastic uses the [littlefs](https://github.com/littlefs-project/littlefs) library to store configuration, logs, and other data in the internal flash of nRF52 & RP2040 devices. Updating the firmware does _not_ erase this additional data, which can cause issues when the format and location of data changes between releases.
### nRF52
To reset the flash storage on your nRF52 board:
Download and unzip the latest firmware from [Meshtastic Downloads](https://meshtastic.org/downloads).
1. Download and unzip the latest firmware from [Meshtastic Downloads](https://meshtastic.org/downloads).
2. Connect your device to your computer with a USB data cable.
3. Double click the reset button on your device (this will put it into bootloader mode)
4. Notice a new drive will be mounted on your computer (Windows, Mac, or Linux)
5. Open this drive and you should see three files: `CURRENT.UF2`, `INDEX.HTM`, and `INFO_UF2.TXT`
6. Find the file included in the downloaded firmware named `Meshtastic_nRF52_factory_erase.uf2` and copy it onto the new drive. The device should reboot.
7. With the [Meshtastic CLI](/docs/software/python/cli/) installed, open your Terminal/Console and enter the command: `meshtastic --noproto`.
8. Press any key, you should see the message: `Formatting... Done`.
Once the device has been erased, you can proceed to install the latest Meshtastic firmware on a clean storage filesystem by clicking the link below.
### RP2040
To reset the flash storage on your RP2040 board:
1. Download [flash_nuke.uf2](https://datasheets.raspberrypi.com/soft/flash_nuke.uf2) to your computer.
2. Press the BOOTSEL button and while keeping it pressed, connect it to your computer via a USB cable.
3. The board should now appear as a mass storage device on your computer with the label RPI-RP2.
4. Copy the flash_nuke.uf2 file to the device.
5. The board will now restart and the flash memory will be erased.
1. Connect your device to your computer with a USB data cable.
2. Double click the reset button on your device (this will put it into bootloader mode)
3. Notice a new drive will be mounted on your computer (Windows, Mac, or Linux)
4. Open this drive and you should see three files: `CURRENT.UF2`, `INDEX.HTM`, and `INFO_UF2.TXT`
5. Copy the included file named `Meshtastic_nRF52_factory_erase.uf2` onto the virtual disk device. The device should reboot.
6. Connect to the device via serial console using the [Meshtastic CLI `--noproto`](/docs/software/python/cli/#--noproto) mode or a standalone serial client like `minicom`.
7. Press any key, you should see the message: `Formatting... Done`.
Once the device has been erased, you can proceed to install the latest Meshtastic firmware on a clean storage filesystem by clicking the link below.
@ -28,6 +42,6 @@ Once the device has been erased, you can proceed to install the latest Meshtasti
className={"button button--outline button--lg cta--button"}
to={"/docs/getting-started/flashing-firmware/nrf52/"}
>
Flash nRF52 Firmware
Flash nRF52/RP2040 Firmware
</Link>
</div>

View file

@ -220,8 +220,10 @@ This is an earlier version of the T-Beam board. Due to changes in the design thi
## Resources
- Firmware file: `firmware-tbeam-s3-core-X.X.X.xxxxxxx.bin`
- Purchase Link: [AliExpress](https://www.aliexpress.com/item/1005005418286231.html)
- Firmware file: `firmware-tbeam-s3-core-X.X.X.xxxxxxx.bin`
- Purchase links:
- LilyGO Store: [Meshtastic T-Beam 433/868/915/923Mhz](https://www.lilygo.cc/products/t-beam-v1-1-esp32-lora-module)
- AliExpress: [Meshtastic T-Beam 868/915MHz](https://www.aliexpress.com/item/1005005418286231.html)
- US Distributor - Purchase link: Rokland [NEO-M10S](https://store.rokland.com/products/lilygo-t-beam-supreme-esp32-s3-lora-development-board-sx1262-915mhz-gps-l76k-or-u-blox?variant=41051191378003), [Quectel L76K](https://store.rokland.com/products/lilygo-t-beam-supreme-esp32-s3-lora-development-board-sx1262-915mhz-gps-l76k-or-u-blox?variant=41051191345235)

View file

@ -35,7 +35,8 @@ Further information on the LILYGO® T-Echo devices can be found on LILYGO®'s [G
- Firmware file: `firmware-t-echo-2.x.x.uf2`
- Purchase links:
- AliExpress: [Lilygo Official Store](https://www.aliexpress.com/item/1005003026107533.html)
- LilyGO Store: [T-Echo Meshtastic 433/868/915MHz](https://www.lilygo.cc/products/t-echo)
- AliExpress: [T-Echo Meshtastic 433/868/915MHz with optional BME280 sensor](https://www.aliexpress.com/item/1005003026107533.html)
- US Distributor - Rokland: [915MHz](https://store.rokland.com/products/lilygo-ttgo-meshtastic-t-echo-white-lora-sx1262-wireless-module-915mhz-nrf52840-gps-for-arduino?ref=8Bb2mUO5i-jKwt) [915MHz BME280 Kit](https://store.rokland.com/products/lilygo-ttgo-meshtastic-t-echo-white-bme280-lora-sx1262-wireless-module-915mhz-nrf52840-gps-rtc-nfc-for-arduino?ref=8Bb2mUO5i-jKwt)
![LILYGO T-Echo](/img/hardware/t-echo.png)

View file

@ -40,10 +40,10 @@
"@docusaurus/module-type-aliases": "3.0.0",
"@tailwindcss/typography": "^0.5.10",
"@tsconfig/docusaurus": "^2.0.2",
"@types/node": "^20.9.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@types/node": "^20.9.3",
"@types/react": "^18.2.38",
"@types/react-dom": "^18.2.16",
"biome": "^0.3.3",
"typescript": "^5.2.2"
"typescript": "^5.3.2"
}
}

File diff suppressed because it is too large Load diff

View file

@ -60,11 +60,11 @@ const Firmware = (): JSX.Element => {
</div>
<div className="card m-4 border-2 border-secondary w-full">
<div className="card__header">
<h3>nRF52 Drag & Drop</h3>
<h3>nRF52/RP2040 Drag & Drop</h3>
</div>
<div className="card__body">
<p>
Devices such as T-Echo and RAK4631 are flashed via filesystem.
Devices such as T-Echo, RAK4631, and RAK11300 are flashed via filesystem.
</p>
</div>
<div className="card__footer mt-auto">

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 711 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 714 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB