mudhorn/meshtastic
1
0
Fork 0
mirror of https://github.com/meshtastic/meshtastic.git synced 2024-12-28 06:59:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse source
This commit is contained in:
rcarteraz 2023-06-02 09:28:27 -07:00 committed by GitHub
parent 289ccb022f 7fb6db6fb2
commit fc245c31a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ The maximum power allowed for Europe is +14 dBm ERP ([Effective Radiated Power](
The band range is from 433 to 434 MHz. The band range is from 433 to 434 MHz.
There are four channels defined with the standard radio preset `LongFast`. After factory reset the radio will be set to channel 3 with a center frequency of 433.875 MHz. There are four channels defined with the standard radio preset `LongFast`. After factory reset the radio will be set to channel 4 with a center frequency of 433.875 MHz.
### 868 MHz ### 868 MHz
@ -36,7 +36,7 @@ The maximum power allowed for Europe is +27 dBm ERP ([Effective Radiated Power](
The band range is from 869.40 to 869.65 MHz. This is less than the 863–870 MHz range defined as SRD Band, but allows for a higher ERP and a duty cycle of 10%. The band range is from 869.40 to 869.65 MHz. This is less than the 863–870 MHz range defined as SRD Band, but allows for a higher ERP and a duty cycle of 10%.
There is one channel defined with the standard radio preset `LongFast`. After factory reset the radio will be set to channel 0 with a center frequency of 869.525 MHz. There is one channel defined with the standard radio preset `LongFast`. After factory reset the radio will be set to channel 1 with a center frequency of 869.525 MHz.
## North America Frequency Bands ## North America Frequency Bands
@ -46,7 +46,7 @@ The maximum output power for North America is +30 dBm ERP ([Effective Radiated P
The band range is from 902 to 928 MHz. The band range is from 902 to 928 MHz.
There are 104 channels defined with the standard radio preset `LongFast`. After factory reset the radio will be set to channel 19 with a center frequency of 906.875 MHz. There are 104 channels defined with the standard radio preset `LongFast`. After factory reset the radio will be set to channel 20 with a center frequency of 906.875 MHz.
## Data Rates ## Data Rates

2
docs/configuration/gpio-peripherals.mdx
View file

@ -59,7 +59,7 @@ The procedure using the python command line tool is:
meshtastic --seturl theurlyoucopiedinstep3 meshtastic --seturl theurlyoucopiedinstep3
``` ```
Now both devices should be able to talk over the `gpio` channel. Send a text message from one the other other verify. Also run `--nodes` to verify the second node shows up. Now both devices should be able to talk over the `gpio` channel. Send a text message from one to the other to verify. Also run `--nodes` to verify the second node shows up.
### Masks ### Masks

9
docs/configuration/module-config/serial.mdx
View file

@ -35,6 +35,7 @@ Available Values:
- `PROTO` Exposes the Protobuf Client API on this serial port. You can use this to connect from another device. [API Reference](/docs/development/device/client-api) - `PROTO` Exposes the Protobuf Client API on this serial port. You can use this to connect from another device. [API Reference](/docs/development/device/client-api)
- `TEXTMSG` Will send the string received over the serial port as a Text Message for Display on the other devices. - `TEXTMSG` Will send the string received over the serial port as a Text Message for Display on the other devices.
- `NMEA` Will output a NMEA 0183 Data stream containing the internal GPS or fixed position and other node locations as Waypoints (WPL). - `NMEA` Will output a NMEA 0183 Data stream containing the internal GPS or fixed position and other node locations as Waypoints (WPL).
- `CALTOPO` Will output NMEA 0183 Waypoints (WPL) every 10 seconds for all valid node locations, to be consumed by [CalTopo / SARTopo](https://caltopo.com/)
### Receive GPIO Pin ### Receive GPIO Pin
@ -56,6 +57,10 @@ The serial baud rate.
The amount of time to wait before we consider your packet as "done". The amount of time to wait before we consider your packet as "done".
### Override Console Serial Port
If set to true, this will allow Serial Module to control (set baud rate) and use the primary USB serial bus for output. This is only useful for NMEA and CalTopo modes and may behave strangely or not work at all in other modes. Setting TX/RX pins in the Serial Module config will cause this setting to be ignored.
:::tip :::tip
Once module settings are changed, a **reset** is required for them to take effect. Once module settings are changed, a **reset** is required for them to take effect.
::: :::
@ -102,11 +107,13 @@ All serial module config options are available in the python CLI. Example comman
| :------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------: | | :------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------: |
| serial.enabled | `true`, `false` | `false` | | serial.enabled | `true`, `false` | `false` |
| serial.echo | `true`, `false` | `false` | | serial.echo | `true`, `false` | `false` |
| serial.mode | `DEFAULT` `SIMPLE` `PROTO` `TEXTMSG`, `NMEA` | `DEFAULT` | | serial.mode | `DEFAULT` `SIMPLE` `PROTO` `TEXTMSG`, `NMEA`, `CALTOPO` | `DEFAULT` |
| serial.rxd | GPIO Pin Number 1-39 | Default of `0` is Unset | | serial.rxd | GPIO Pin Number 1-39 | Default of `0` is Unset |
| serial.txd | GPIO Pin Number 1-33 | Default of `0` is Unset | | serial.txd | GPIO Pin Number 1-33 | Default of `0` is Unset |
| serial.baud | `BAUD_DEFAULT` `BAUD_110` `BAUD_300` `BAUD_600` `BAUD_1200` `BAUD_2400` `BAUD_4800` `BAUD_9600` `BAUD_19200` `BAUD_38400` `BAUD_57600` `BAUD_115200` `BAUD_230400` `BAUD_460800` `BAUD_576000` `BAUD_921600` | `BAUD_DEFAULT` | | serial.baud | `BAUD_DEFAULT` `BAUD_110` `BAUD_300` `BAUD_600` `BAUD_1200` `BAUD_2400` `BAUD_4800` `BAUD_9600` `BAUD_19200` `BAUD_38400` `BAUD_57600` `BAUD_115200` `BAUD_230400` `BAUD_460800` `BAUD_576000` `BAUD_921600` | `BAUD_DEFAULT` |
| serial.timeout | `integer` (milli seconds) | Default of `0` corresponds to 250 ms | | serial.timeout | `integer` (milli seconds) | Default of `0` corresponds to 250 ms |
| serial.override_console_serial_port | `true`, `false` | `false` |
:::tip :::tip

2
docs/configuration/module-config/telemetry.mdx
View file

@ -177,7 +177,7 @@ meshtastic --set telemetry.environment_measurement_enabled true --set telemetry.
:::tip :::tip
You can change the values above to suit your needs but it is recommended that commands be chained together as one as shown. While the above values serve as an example and can be modified to fit your specific needs, it is advisable to chain multiple commands together, as demonstrated in the example. This approach will minimize the number of necessary reboots.
::: :::