Merge branch 'master' into patch-3

This commit is contained in:
Vladislav Osmanov 2022-09-12 20:12:21 +03:00 committed by GitHub
commit dc11616bdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View file

@ -26,7 +26,7 @@ If your pairing mode is set to fixed PIN this is the value of that fixed 6 digit
| Setting | Acceptable Values | Default | | Setting | Acceptable Values | Default |
| :-----------------------: | :-----------------: | :-----: | | :-----------------------: | :-----------------: | :-----: |
| bluetooth.enabled | `true`, `false` | `true` | | bluetooth.enabled | `true`, `false` | `true` |
| bluetooth.mode | `randomPin`, `fixedPin`, `noPin` | `randomPin` | | bluetooth.mode | `RandomPin`, `FixedPin`, `NoPin` | `RandomPin` |
| bluetooth.fixedPin | `integer` 6 Digits | `123456` | | bluetooth.fixedPin | `integer` 6 Digits | `123456` |

View file

@ -18,10 +18,10 @@ Acceptable values:
| Value | Description | | Value | Description |
| :-------: | :---------------------------------------------------------------------------------------: | | :-------: | :---------------------------------------------------------------------------------------: |
| `client` | Client (default) - App connected client. | | `Client` | Client (default) - App connected client. |
| `clientMute` | Client Mute - Same as a client except packets will not hop over this node, does not contribute to routing packets for mesh. | | `ClientMute` | Client Mute - Same as a client except packets will not hop over this node, does not contribute to routing packets for mesh. |
| `router` | Router - Mesh packets will prefer to be routed over this node. This node will not be used by client apps. The wifi/ble radios and the oled screen will be put to sleep. | | `Router` | Router - Mesh packets will prefer to be routed over this node. This node will not be used by client apps. The wifi/ble radios and the oled screen will be put to sleep. |
| `routerClient` | Router Client - Mesh packets will prefer to be routed over this node. The Router Client can be used as both a Router and an app connected Client. | | `RouterClient` | Router Client - Mesh packets will prefer to be routed over this node. The Router Client can be used as both a Router and an app connected Client. |
### Serial Console ### Serial Console
@ -75,7 +75,7 @@ All device config options other than NTP Server are available on iOS, iPadOS and
All device config options are available in the python CLI. Example commands are below: All device config options are available in the python CLI. Example commands are below:
```shell title="Set the role to client" ```shell title="Set the role to client"
meshtastic --set device.role client meshtastic --set device.role Client
``` ```
```shell title="Disable serial console" ```shell title="Disable serial console"