mirror of
https://github.com/meshtastic/meshtastic.git
synced 2025-01-30 07:10:51 -08:00
Merge branch 'master' into master
This commit is contained in:
Foster Irwin
GitHub
commit
2e5bca3830
|
|
@ -14,16 +14,32 @@ The device config options are: Role, Serial Output, and Debug Log. Device config
|
|||
|
||||
### Role
|
||||
|
||||
Sets the role of node.
|
||||
Sets the role of the node.
|
||||
|
||||
Acceptable values:
|
||||
|
||||
| Value | Description |
|
||||
| :-------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
|
||||
| `CLIENT` | Client (default) - App connected client. |
|
||||
| :-------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
|
||||
| `CLIENT` | Client (default) - This role will follow the standard routing rules while also allowing the device to interact with client applications via BLE/Wi-Fi (Android/Apple/Web). |
|
||||
| `CLIENT_MUTE` | 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_CLIENT` | 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. |
|
||||
| `ROUTER` | Router - Mesh packets will prefer to be routed over this node. The assumption is that Router-type devices will be placed in locations with a height/range/antenna advantage, and therefore have better overall coverage. This node will not be used by client apps. The BLE/Wi-Fi radios and the OLED screen will be put to sleep. Please note: Due to the preferred routing, this role may cause higher power usage due to more frequent transmission. |
|
||||
| `ROUTER_CLIENT` | Router Client - Hybrid of the Client and Router roles. Similar to Router, except the Router Client can be used as both a Router and an app connected Client. BLE/Wi-Fi and OLED screen will not be put to sleep. |
|
||||
| `REPEATER`[^1] | Repeater - Mesh packets will prefer to be routed over this node. This role eliminates unnecessary overhead such as NodeInfo, DeviceTelemetry, and any other mesh packet, resulting in the device not appearing as part of the network. As such, direct messaging this node is not available, as it will not appear in your nodes list which results in a cleaner mesh network. Channel and modem settings of the mesh packets being repeated must be identical to the repeater's configuration. Please see Rebroadcast Mode for additional settings specific to this role.[^1] |
|
||||
| `TRACKER`[^1] | Tracker - For use with devices intended as a GPS tracker. Position packets sent from this device will be higher priority, with position broadcasting every two minutes. Smart Position Broadcast will default to off.[^1] |
|
||||
|
||||
[^1]: These roles are new as of the 2.0.15 alpha release. They are still a work in progress and as such features and functionality may not work as described and can evolve or change as development continues.
|
||||
|
||||
### Rebroadcast Mode
|
||||
|
||||
This setting defines the device's behavior for how messages are rebroadcasted. [^2]
|
||||
|
||||
[^2]: This setting is new as of the 2.0.16 alpha release. It is still a work in progress and as such features and functionality may not work as described and can evolve or change as development continues.
|
||||
|
||||
| Value | Description |
|
||||
| :-----------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
|
||||
| `ALL` | ALL (Default) - This setting will rebroadcast ALL messages from its primary mesh as well as other meshes with the same modem settings, including when encryption settings differ. |
|
||||
| `All_SKIP_DECODING` | ALL_SKIP_DECODING - Same as behavior as ALL, but skips packet decoding and simply rebroadcasts them. **Only available with Repeater role.** |
|
||||
| `LOCAL_ONLY` | LOCAL_ONLY - Ignores observed messages from foreign meshes that are open or those which it cannot decrypt. Only rebroadcasts message on the nodes local primary / secondary channels. |
|
||||
|
||||
### Serial Console
|
||||
|
||||
|
|
@ -84,9 +100,10 @@ All device config options are available in the python CLI. Example commands are
|
|||
:::
|
||||
|
||||
| Setting | Acceptable Values | Default |
|
||||
| ------------------------ | -------------------------------------------------- | -------- |
|
||||
| ------------------------ | ------------------------------------------------------------------------- | -------- |
|
||||
| device.debug_log_enabled | `true`, `false` | `false` |
|
||||
| device.role | `CLIENT`, `CLIENT_MUTE`, `ROUTER`, `ROUTER_CLIENT` | `CLIENT` |
|
||||
| device.role | `CLIENT`, `CLIENT_MUTE`, `ROUTER`, `ROUTER_CLIENT`, `REPEATER`, `TRACKER` | `CLIENT` |
|
||||
| device.rebroadcast_mode | `ALL`, `ALL_SKIP_DECODING`, `LOCAL_ONLY` | `ALL` |
|
||||
| device.serial_enabled | `true`, `false` | `true` |
|
||||
| device.button_gpio | `0` - `34` | `0` |
|
||||
| device.buzzer_gpio | `0` - `34` | `0` |
|
||||
|
|
|
|||
9
docs/legal/trademark-grants.mdx
Normal file
9
docs/legal/trademark-grants.mdx
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
---
|
||||
id: trademark-grants
|
||||
title: Trademark Grants
|
||||
sidebar_label: Trademark Grants
|
||||
---
|
||||
|
||||
* Grant: http://meshtastic.pt
|
||||
* Details: Meshtastic.pt is a fan page created before the trademark usage guidelines were authored. Agreement with Sérgio Matos that meshtastic.pt may continue use of meshtastic in domain name provided they stay non commercial and maintain that they are non-official. The grant is revokable at any time for any reason.
|
||||
|
||||
|
|
@ -98,6 +98,9 @@ In the past, community members have inquired whether it is permissible to use Me
|
|||
|
||||
Community members may request from the Trademark Supervisor designated by the Admins of Meshtastic a license to use the Meshtastic Trademarks on non-software related goods or services, by enquiring at [trademark@meshtastic.org](mailto:trademark@meshtastic.org). The Trademark Supervisor will be responsible for reviewing samples of the goods and services and managing the relationship.
|
||||
|
||||
- The adding our logo or other marks to a non-software good may be allowed, with written permission from the the Meshtastic Trademark Supervisior, provided that the non-software good is a 100% original design or the requester has evidence of a grant of use from copyright holder of the original design.
|
||||
- The adding our logo or other marks to a non-software good is not an endorsement or sponsorship of that good by the Meshtastic Project.
|
||||
|
||||
## Unapproved Use
|
||||
|
||||
The following uses of the Meshtastic Trademarks are not approved under any foreseeable circumstances.
|
||||
|
|
|
|||
Loading…
Reference in a new issue