mirror of
https://github.com/meshtastic/meshtastic.git
synced 2025-02-21 03:25:51 -08:00
Merge branch 'master' into flash-web
This commit is contained in:
Ben Lipsey
GitHub
commit
c206f95c89
|
|
@ -252,7 +252,7 @@ Navigate to Channels > Primary: Turn on the sliders for **Uplink Enabled** and *
|
|||
|
||||
<h3>3. Configure Network Settings</h3>
|
||||
|
||||
Navigate to Config > Device Config > Network: Turn on the slider for **Enabled** - Enter your **SSID** and **PSK** for your network - Click the **Save** icon.
|
||||
Navigate to Radio Config > Device > Network: Turn on the slider for **Enabled** - Enter your **SSID** and **PSK** for your network - Click the **Save** icon.
|
||||
|
||||
[](/img/modules/mqtt/web_network.png)
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ This option is used to configure the interval (in seconds) that should be used t
|
|||
|
||||
Default is `900` seconds (15 minutes).
|
||||
|
||||
## Device Config Client Availability
|
||||
## Telemetry Config Client Availability
|
||||
|
||||
<Tabs
|
||||
groupId="settings"
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ meshtastic --set bluetooth.fixed_pin 111111
|
|||
All Bluetooth module config options are available for the Web UI.
|
||||
|
||||
1. Open the Meshtastic Web UI.
|
||||
2. Navigate to: **Device Config > Bluetooth**
|
||||
2. Navigate to: **Radio Config > Bluetooth**
|
||||
|
||||
:::
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import TabItem from "@theme/TabItem";
|
|||
|
||||
The display config options are: Screen On Duration, Auto Carousel Interval, Always Point North, GPS Format, Preferred Display Units, OLED Definition, Display Mode, Heading Bold, and Wake on Tap or Motion. Display config uses an admin message sending a `Config.Display` protobuf.
|
||||
|
||||
## Device Config Values
|
||||
## Display Config Values
|
||||
|
||||
### Screen On Duration
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ The heading can be hard to read when 'INVERTED' or 'TWOCOLOR' display mode is us
|
|||
|
||||
This option enables the ability to wake the device screen when motion, such as a tap on the device, is detected via an attached accelerometer.
|
||||
|
||||
## Device Config Client Availability
|
||||
## Display Config Client Availability
|
||||
|
||||
<Tabs
|
||||
groupId="settings"
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@ Meshtastic nodes will rebroadcast all packets if they share [LoRa modem settings
|
|||
|
||||
Meshtastic uses the word "channels" to define two different configuration properties: [Messaging Channels](/docs/configuration/radio/channels) & [LoRa Modem Channels](/docs/configuration/radio/lora#channel-number)
|
||||
|
||||
### Device Config: Channels
|
||||
### Radio Config: Channels
|
||||
|
||||
These configure "message groups" and include your PRIMARY and SECONDARY channels. All SECONDARY channels use the same LoRa modem config as your PRIMARY channel (including LoRa channel number).
|
||||
|
||||
There are 8 total chat channels. Channel 0 is your PRIMARY channel, with channels 1-7 available for private group messaging and/or special channels such as [`admin`](/docs/configuration/remote-admin).
|
||||
|
||||
### Device Config: LoRa: Channel Number
|
||||
### Radio Config: LoRa: Channel Number
|
||||
|
||||
This configures the frequency the radio is set to. Check out the [frequency calculator](/docs/overview/radio-settings#channel-frequency-calculator) to view the relationship between "channel number" and radio frequency.
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ Before you flash your device start by verifying connectivity with the device bei
|
|||
:::note
|
||||
The [T-Beam 0.7](/docs/hardware/devices/tbeam#t-beam---v07) board is an earlier version of the T-Beam board, and due to changes in the design in subsequent iterations this board uses a specific firmware file different from the other T-Beam boards.
|
||||
|
||||
`firmware-tbeam0.7-1.x.x.bin` is the correct firmware. `firmware-tbeam-1.x.x.bin` is incompatible. For all other [T-Beam](/docs/hardware/devices/tbeam) boards `firmware-tbeam-1.x.x.bin` is the correct selection.
|
||||
`firmware-tbeam0.7-X.X.X.xxxxxxx.bin` is the correct firmware. `firmware-tbeam-X.X.X.xxxxxxx.bin` is incompatible. For all other [T-Beam](/docs/hardware/devices/tbeam) boards `firmware-tbeam-X.X.X.xxxxxxx.bin` is the correct selection.
|
||||
:::
|
||||
|
||||
## Command Line Interface Instructions
|
||||
|
|
@ -186,7 +186,7 @@ cd ~/Downloads/firmware/
|
|||
Install or Update the device that you have by using the following commands according to your operating system:
|
||||
|
||||
:::caution
|
||||
Be very careful to install the correct load for your board. In particular the popular 'T-BEAM' radio from TTGO is not called 'TTGO-Lora' (that is a different board). So don't install the 'TTGO-Lora' build on a TBEAM, it won't work correctly.
|
||||
Be very careful to install the correct firmware file for your board. In particular, the popular 'T-BEAM' radio from TTGO is not called 'TTGO-Lora' (that is a different board). So don't install the 'TTGO-Lora' build on a TBEAM, it won't work correctly. If you flash the incorrect device firmware, it may appear to successfully complete, yet the device will usually become unresponsive, displaying a blank screen (if equipped). Attempt to flash the correct version. Please note, while these devices are quite resilient and damage is not always likely, there is a possibility of onboard radio and peripheral damage due to incorrect GPIO pin direction.
|
||||
:::
|
||||
|
||||
<Tabs
|
||||
|
|
@ -214,12 +214,14 @@ values={[
|
|||
</TabItem>
|
||||
<TabItem value="macos">
|
||||
|
||||
<!-- trunk-ignore(markdownlint/MD024) -->
|
||||
#### Install
|
||||
|
||||
```shell title="Command"
|
||||
./device-install.sh -f firmware-BOARD-VERSION.bin
|
||||
```
|
||||
|
||||
<!-- trunk-ignore(markdownlint/MD024) -->
|
||||
#### Update
|
||||
|
||||
```shell title="Command"
|
||||
|
|
@ -229,12 +231,14 @@ values={[
|
|||
</TabItem>
|
||||
<TabItem value="windows">
|
||||
|
||||
<!-- trunk-ignore(markdownlint/MD024) -->
|
||||
#### Install
|
||||
|
||||
```shell title="Command"
|
||||
device-install.bat -f firmware-BOARD-VERSION.bin
|
||||
```
|
||||
|
||||
<!-- trunk-ignore(markdownlint/MD024) -->
|
||||
#### Update
|
||||
|
||||
```shell title="Command"
|
||||
|
|
@ -244,17 +248,6 @@ device-update.bat -f firmware-BOARD-VERSION.bin
|
|||
</TabItem>
|
||||
</Tabs>
|
||||
|
||||
### Select Firmware
|
||||
|
||||
Browse to the previously downloaded firmware and select the correct firmware based on the board type and frequency.
|
||||
|
||||
:::caution
|
||||
Be very careful to install the correct load for your board. In particular the popular 'T-BEAM' radio from TTGO is not called 'TTGO-Lora' (that is a different board). So don't install the 'TTGO-Lora' build on a TBEAM, it won't work correctly. If you flash the incorrect firmware: It may appear to flash correctly, but if your device has a screen it might stay blank. On-board radio peripherals might be damaged because of GPIO pin direction, but you should just try to flash with the correct version.
|
||||
:::
|
||||
|
||||
### Flash Firmware
|
||||
|
||||
Select `Flash ESP`. It may take a minute or two. Once complete, "Done! Flashing is complete!" will be shown.
|
||||
|
||||
## Connect and Configure Device
|
||||
|
||||
|
|
|
|||
14
docs/hardware/devices/raspberry-pi/peripherals.mdx
Normal file
14
docs/hardware/devices/raspberry-pi/peripherals.mdx
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
---
|
||||
id: peripherals
|
||||
title: Supported Peripherals
|
||||
sidebar_label: Peripherals
|
||||
sidebar_position: 1
|
||||
---
|
||||
|
||||
## I<sup>2</sup>C peripherals
|
||||
|
||||
I<sup>2</sup>C peripherals like OLED Displays (e.g. SSD1306 or SH1106) and keyboards (e.g. CardKB) can be connected to GPIO pins 4 (SDA) and 5 (SCL), which will be recognized on boot. Note that for keyboard input, the [Canned Message Module](/docs/configuration/module/canned-message) has to be enabled and the [input source](/docs/configuration/module/canned-message#input-source) should be specified.
|
||||
|
||||
## External device using Serial Module
|
||||
|
||||
For connecting an external device via the [Serial Module](/docs/configuration/module/serial), it's recommended to use GPIO pins 8 (`serial.txd`) and 9 (`serial.rxd`).
|
||||
|
|
@ -163,7 +163,7 @@ The debug panel allows you to see all packets sent between the application and t
|
|||
[](/img/android/android-radio-configuration.png)
|
||||
|
||||
Radio Configuration opens a list of all radio and module configuration settings.
|
||||
- See [Device Config](/docs/configuration/radio) for radio settings.
|
||||
- See [Radio Config](/docs/configuration/radio) for radio settings.
|
||||
- See [Module Config](/docs/configuration/module) for module settings.
|
||||
- At the end of this list are buttons for Reboot, Shutdown, Factory reset, and NodeDB reset.
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Below is a valid JSON envelope for information sent by MQTT to a device for broa
|
|||
Node-RED is a free cross-platform programming tool for wiring together hardware, APIs, and online services developed originally by IBM for IOT. It is widely used for home automation by many non-professional programmers and runs well on Pi's. Node-RED has many plug-in modules written by the community. I will use this platform as a practical example on how to interface with the MQTT features of Meshtastic. Everything can be done from GUI's without using command line.
|
||||
|
||||
Step one: use http://client.meshtastic.org/ , the python CLI, or an Apple or Android app to connect to your device and adjust these settings.
|
||||
Enable and enter network SSID/PSK. Settings--> Device Config--> Network; Save.
|
||||
Enable and enter network SSID/PSK. Settings--> Radio 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.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue