mudhorn/meshtastic
1
0
Fork 0
mirror of https://github.com/meshtastic/meshtastic.git synced 2024-12-26 22:19:46 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into hardware-unification

Browse source
This commit is contained in:
pdxlocations 2024-01-27 08:48:48 -08:00 committed by GitHub
parent d3f8edf979 7f9c707a3a
commit 225d29f67f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/about/introduction.mdx
View file

@ -13,7 +13,7 @@ Meshtastic® is a project that enables you to use inexpensive LoRa radios as a l
### Features
- Long range ([_254km record by kboxlabs_](/docs/overview/range-tests#current-record))
- Long range ([_254km record by kboxlabs_](/docs/overview/range-tests#current-ground-record-254km))
- No phone required for mesh communication
- Decentralized communication - no dedicated router required
- Encrypted communication

2
docs/about/overview/radio-settings.mdx
View file

@ -69,7 +69,7 @@ Various data-rate options are available when configuring a channel and are inver
### Presets
We have six LoRa radio presets. These are the most common settings and have been proven to work well:
We have eight LoRa radio presets. These are the most common settings and have been proven to work well:
| Channel setting | Alt Channel Name | Data-Rate | SF / Symbols | Coding Rate | Bandwidth | Link Budget |
| :--------------------: | :--------------: | :-----------------: | :----------: | :---------: | :-------: | :---------: |

2
docs/configuration/module/store-and-forward-module.mdx
View file

@ -44,7 +44,7 @@ Initial Requirements:
### Meshtastic channel configuration
Don't use this on the "LongRange" channel settings. You're welcome to try and report back, but those channels have a [low bitrate](/docs/overview/radio-settings#pre-defined).
Don't use this on the "LongRange" channel settings. You're welcome to try and report back, but those channels have a [low bitrate](/docs/overview/radio-settings#presets).
Either use a custom channel configuration with at an at least 1kbit data rate or use a Medium or Short range preset.

2
docs/configuration/radio/user.mdx
View file

@ -27,7 +27,7 @@ Auto-generated by default.
### Is Licensed (HAM)
If you are a licensed HAM operator and have considered the [privileges and restrictions](/docs/faq/#what-is-the-benefit-of-using-my-ham-license-with-meshtastic) of using Meshtastic with a HAM license, enable this flag.
If you are a licensed HAM operator and have considered the [privileges and restrictions](/docs/faq#what-is-the-benefit-of-using-a-ham-license-with-meshtastic) of using Meshtastic with a HAM license, enable this flag.
Disabled by default.

2
docs/getting-started/flashing-firmware/esp32/cli-script.mdx
View file

@ -16,7 +16,7 @@ Make sure not to power the radio on without first attaching the antenna! You cou
Before you flash your device start by verifying connectivity with the device being flashed. Outlined below are steps that can be taken to verify connectivity and, if necessary, to install the appropriate drivers. If you end up needing to install drivers be sure to reboot your computer afterwards to verify the installation is complete.
:::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.
The [T-Beam 0.7](/docs/hardware/devices/tbeam/?t-beam=0.7) 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-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.
:::

2
docs/getting-started/flashing-firmware/esp32/index.mdx
View file

@ -17,6 +17,6 @@ The recommended method for firmware flashing is the [Web-Based Installer.](https
:::info note
The [web client](http://localhost:3000/docs/software/web-client) at meshtastic.local is only updated with a full wipe and reinstall of the device. If you choose a reinstall, you will get the latest (bundled) web interface. To preserve your settings, you may [export your configuration](../../../software/python/cli/#--export-config) prior to a reinstall and load them back after.
The [web client](/docs/software/web-client) at meshtastic.local is only updated with a full wipe and reinstall of the device. If you choose a reinstall, you will get the latest (bundled) web interface. To preserve your settings, you may [export your configuration](/docs/software/python/cli#--export-config) prior to a reinstall and load them back after.
:::

2
docs/getting-started/serial-drivers/test-serial-driver-installation.mdx
View file

@ -69,7 +69,7 @@ values={[
If you are unable to see your device:
- Make sure that your cable is not only for charging but also for [data transfer](/docs/getting-started/#verify-data-cable).
- Make sure that your cable is not only for charging but also for [data transfer](/docs/getting-started#verify-data-cable).
- It's possible that you need to [reinstall the USB serial driver](/docs/getting-started/serial-drivers).
:::

2
docs/legal/index.mdx
View file

@ -10,7 +10,7 @@ sidebar_position: 9
**Safety and Regulations:** Please be aware that the devices related to this project are not manufactured by us and have not been tested by regulatory organizations such as UL or the FCC. Therefore, using these devices should be considered experimental. While we focus on safety in our designs, we advise users to exercise caution to avoid any potential risks.
**Encryption and Security:** Our encryption measures are robust and a significant aspect of our project. However, it's important to recognize the limitations and risks associated with any encryption technology. For an in-depth understanding of these aspects, kindly review this list of [caveats](/docs/overview/encryption#summary-of-strengthsweaknesses-of-our-current-implementation).
**Encryption and Security:** Our encryption measures are robust and a significant aspect of our project. However, it's important to recognize the limitations and risks associated with any encryption technology. For further understanding of these aspects, kindly review [encryption](/docs/overview/encryption).
## Legal FAQ

2
docs/software/mqtt/index.mdx
View file

@ -54,7 +54,7 @@ The payload is a raw protobuf, whose definitions for Meshtastic can be found [he
If [encryption_enabled](/docs/configuration/module/mqtt#encryption-enabled) is set to true, the payload of the MeshPacket will remain encrypted with the key for the specified channel.
#### JSON topic
If [JSON is enabled](/docs/configuration/module/mqtt/#json-enabled), packets from the following [port numbers](/docs/development/firmware/portnum) are serialized to JSON: `TEXT_MESSAGE_APP`, `TELEMETRY_APP`, `NODEINFO_APP`, `POSITION_APP`, `WAYPOINT_APP`, `NEIGHBORINFO_APP`, `TRACEROUTE_APP`, `DETECTION_SENSOR_APP`, `PAXCOUNTER_APP` and `REMOTE_HARDWARE_APP`. These are then forwarded to the topic:
If [JSON is enabled](/docs/configuration/module/mqtt#json-enabled), packets from the following [port numbers](/docs/development/firmware/portnum) are serialized to JSON: `TEXT_MESSAGE_APP`, `TELEMETRY_APP`, `NODEINFO_APP`, `POSITION_APP`, `WAYPOINT_APP`, `NEIGHBORINFO_APP`, `TRACEROUTE_APP`, `DETECTION_SENSOR_APP`, `PAXCOUNTER_APP` and `REMOTE_HARDWARE_APP`. These are then forwarded to the topic:
`msh/2/json/CHANNELNAME/USERID`.