Merge branch 'master' into i18n

This commit is contained in:
Thomas Göttgens 2022-11-25 12:43:09 +01:00 committed by GitHub
commit 3d3cb1c8f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 17 deletions

View file

@ -40,11 +40,11 @@ Long press any message to select and show the menu with "delete" and "select all
### What version of iOS does the Meshtastic iOS App Require?
The now-in-beta iOS app requires iOS v15.
The iOS app requires iOS v16.
### How do I get the Meshtastic iOS App?
See [iOS App](/docs/category/apple-apps)
See [iOS App](/docs/software/apple/installation)
### After updating firmware, my node is not connecting via Bluetooth. What should I do?
@ -88,11 +88,11 @@ Your Meshtastic client (Android, Web, or Python) will provide you a URL or QR co
## Devices
### How do I turn off an ESP32 t-beam based device?
### How do I turn **off** an ESP32 T-Beam based device?
Hold down the left PWR button for about 10 seconds and the display should turn off.
### How do I turn on an ESP32 t-beam based device?
### How do I turn **on** an ESP32 T-Beam based device?
Push the left PWR button for about 1 second.
@ -116,14 +116,6 @@ The LoRa radio on the node is still active and will wake up the CPU when the dev
Once the node wakes up from sleep, your phone will relay any delayed messages through your node and to the mesh network. Give it a few minutes and it'll do the right thing.
### How do I turn off an ESP32 t-beam based device?
Hold down the left PWR button for about 10 seconds and the display should turn off.
### How do I turn on a t-beam?
Push the left PWR button for about 10 seconds.
### How can I tell the device not to sleep?
- Android instructions see: [Android Usage](/docs/software/android/usage#configuration-options)

View file

@ -243,7 +243,12 @@ Node-RED is a free cross-platform programming tool for wiring together hardware,
Step one: use http://client.meshtastic.org/ one of the Apple apps or the CLI to connect to your device and adjust these settings.
Enable and enter network SSID/PSK. Settings--> Device Config--> Network; Save.
Set MQTT server address. Settings--> Module Config--> MQTT config; Verify Encryption Enabled is OFF. Turn JSON Output Enabled ON. Save.
Go to Channel Editor and set Uplink and Downlink enabled to True. Save.
Go to Channel Editor and set Uplink and Downlink enabled to True. Save. There is currently a bug for setting Uplink and Downlink Saving for the default channel. If you encounter this use the CLI commands:
```
meshtastic --ch-index 0 --ch-set uplink_enabled true
meshtastic --ch-index 0 --ch-set downlink_enabled true
```
Step two: if you don't want to depend on JSON decoding on the device, you can decode the protobuf messages off-device. To do that you will need to get the .proto files from https://github.com/meshtastic/protobufs. They function as a schema and are required for decoding in Node-RED. Save the files where the node-RED application can access them and note the file path of the "mqtt.proto" file.
@ -266,9 +271,10 @@ Injecting a json message to be sent by a device is also very simple. You do need
Forwarding a text message from one device, through a broker, to another broker/device/channel would look like this.
[<img src="/documents/mqtt/Forward.jpg" style={{zoom:'50%'}} />](/documents/mqtt/Forward.jpg)
If you want to decode text and position messages without json, it gets complicated:
[<img src="/documents/mqtt/Decode.jpg" style={{zoom:'50%'}} />](/documents/mqtt/Decode.jpg)
[<img src="/documents/mqtt/DecodeNewest.jpg" style={{zoom:'50%'}} />](/documents/mqtt/Decode.jpg)
If you are interested in my flow for this it is here:
(documents/mqtt/Flow.txt)
But node-red can rapidly (minutes vs days) put together some pretty impressive output when paired with meshtastic. Here is an example of geofencing and mapping of a single device via mqtt data.
Node-red can rapidly (minutes vs days) put together some pretty impressive output when paired with meshtastic. Here is the output of that flow geofencing and mapping via mqtt data.
[<img src="/documents/mqtt/Mapping.jpg" style={{zoom:'50%'}} />](/documents/mqtt/Mapping.jpg)
[<img src="/documents/mqtt/MapFlow.jpg" style={{zoom:'50%'}} />](/documents/mqtt/MapFlow.jpg)

View file

@ -97,7 +97,7 @@ meshtastic --get lora.region
Sets a preferences field.
Configuration values are described in this section: [Configuration Sections](https://meshtastic.org/docs/mesh/device/config/)
Configuration values are described in this section: [Configuration Sections](https://meshtastic.org/docs/settings/config)
**Usage**

View file

@ -91,6 +91,13 @@ const SocialCards: SocialCardProps[] = [
<img alt="discord" className="m-auto h-10" src="/img/homepage/Discord-Logo-White.svg" />
),
},
{
color: 'bg-[#ffffff]',
link: 'https://twitter.com/TheMeshtastic',
children: (
<img alt="twitter" className="m-auto h-10" src="/img/homepage/Twitter-logo.svg" />
),
},
{
color: 'bg-[#FF0000]',
link: 'https://www.youtube.com/meshtastic',

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 248 204">
<path fill="#1d9bf0" d="M221.95 51.29c.15 2.17.15 4.34.15 6.53 0 66.73-50.8 143.69-143.69 143.69v-.04c-27.44.04-54.31-7.82-77.41-22.64 3.99.48 8 .72 12.02.73 22.74.02 44.83-7.61 62.72-21.66-21.61-.41-40.56-14.5-47.18-35.07 7.57 1.46 15.37 1.16 22.8-.87-23.56-4.76-40.51-25.46-40.51-49.5v-.64c7.02 3.91 14.88 6.08 22.92 6.32C11.58 63.31 4.74 33.79 18.14 10.71c25.64 31.55 63.47 50.73 104.08 52.76-4.07-17.54 1.49-35.92 14.61-48.25 20.34-19.12 52.33-18.14 71.45 2.19 11.31-2.23 22.15-6.38 32.07-12.26-3.77 11.69-11.66 21.62-22.2 27.93 10.01-1.18 19.79-3.86 29-7.95-6.78 10.16-15.32 19.01-25.2 26.16z"/>
</svg>

After

Width:  |  Height:  |  Size: 732 B