Merge branch 'master' into update-antenna-reports

This commit is contained in:
rcarteraz 2024-03-24 16:06:07 -07:00 committed by GitHub
commit c4f37d1a21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 24 additions and 24 deletions

View file

@ -93,17 +93,19 @@ Should be set to floating point value between 2 and 6
| Device | Default ADC Multiplier | | Device | Default ADC Multiplier |
| :-------: | :--------------------: | | :-------: | :--------------------: |
| hatter2 | 5.0 | | chatter2 | 5.0 |
| diy | 1.85 | | diy | 1.85 |
| esp32-s3-pico | 3.1 | | esp32-s3-pico | 3.1 |
| heltec_v1 & heltec_v2 | 3.2 | | heltec_v1 & heltec_v2 | 3.2 |
| heltec_v3 & heltec_wsl_v3 | 4.9 | | heltec_v3 & heltec_wsl_v3 | 4.9 |
| heltec_wireless_paper | 2 | | heltec_wireless_paper | 2 |
| heltec_wireless_tracker | 4.9 | | heltec_wireless_tracker 1.0/1.1 | 4.9 |
| lora_isp4520 | 1.436 | | lora_isp4520 | 1.436 |
| m5stack_coreink | 5 | | m5stack_coreink | 5 |
| nano-g1-explorer | 2 | | nano-g1-explorer | 2 |
| nano-g2-ultra | 2 |
| picomputer-s3 | 3.1 | | picomputer-s3 | 3.1 |
| rak4631 | 1.73 |
| rpipico | 3.1 | | rpipico | 3.1 |
| rpipicow | 3.1 | | rpipicow | 3.1 |
| station-g1 | 6.45 | | station-g1 | 6.45 |
@ -112,7 +114,7 @@ Should be set to floating point value between 2 and 6
| tlora_v2_1_18 | 2.11 | | tlora_v2_1_18 | 2.11 |
| tlora_t3s3_v1 | 2.11 | | tlora_t3s3_v1 | 2.11 |
| t-deck | 2.11 | | t-deck | 2.11 |
| trackerd | 2 | | t-echo | 2 |
</div> </div>
</details> </details>

View file

@ -145,7 +145,7 @@ This board is still in production but for various reasons not recommended for ne
## Lora v2.1-1.6 ## Lora v2.1-1.6
:::caution :::caution
Early versions of some of these boards contained the wrong component in the LiPo battery charging circuit allowing the battery to be overcharged. Boards purchased after 2021 should be ok. Early versions of these boards contained the wrong component in the LiPo battery charging circuit allowing the battery to be overcharged. Boards purchased after 2021, unless the version is T3_v1.6 20180606, should not have this issue.
::: :::
- **MCU** - **MCU**

View file

@ -54,6 +54,7 @@ values={[
- You should see something like: - You should see something like:
- `ID 10c4:ea60 Silicon Labs CP210x UART Bridge` for CP210X - `ID 10c4:ea60 Silicon Labs CP210x UART Bridge` for CP210X
- `ID 1a86:55d4 QinHeng Electronics USB Single Serial` for CH9102 - `ID 1a86:55d4 QinHeng Electronics USB Single Serial` for CH9102
- If there is no seral device shown that matches the device you are using, please review our [Install Serial Drivers](/docs/getting-started/serial-drivers/) page before proceeding.
- Check that your computer has Python 3 installed. - Check that your computer has Python 3 installed.
@ -107,7 +108,7 @@ values={[
- Connect your Meshtastic device to your USB port - Connect your Meshtastic device to your USB port
- Navigate to `Apple Menu  > About This Mac > System Report... > Hardware > USB` - Navigate to `Apple Menu  > About This Mac > System Report... > Hardware > USB`
- You should see something like `CP210X USB to UART Bridge Controller` - You should see something like `CP210X USB to UART Bridge Controller`
- If not download the drivers from [Silicon Labs](https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers). - If there is no serial device shown that matches the device you are using, please review our [Install Serial Drivers](/docs/getting-started/serial-drivers/) page before proceeding.
- Check that your computer has Python 3 installed. - Check that your computer has Python 3 installed.
- Use the command - Use the command
```shell ```shell
@ -150,16 +151,18 @@ values={[
- Connect your Meshtastic device to your USB port - Connect your Meshtastic device to your USB port
- Open Device Manager - Open Device Manager
- Under `Ports (COM & LPT)` you should see something like `Silicon Labs CP210X USB to UART Bridge (COM5)` - Under `Ports (COM & LPT)` you should see something like `Silicon Labs CP210X USB to UART Bridge (COM5)`
- If not download the drivers from [Silicon Labs](https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers) or use the direct link below. - If there is no serial device shown that matches the device you are using, please review our [Install Serial Drivers](/docs/getting-started/serial-drivers/) page before proceeding.
:::warning
You must install the [CP210x Universal Windows Driver](https://www.silabs.com/documents/public/software/CP210x_Universal_Windows_Driver.zip). If you do not install this driver, your device may not work and the driver may need to be uninstalled from device manager before installing the correct driver.
:::
- Check that your computer has Python 3 installed. - Check that your computer has Python 3 installed.
- Use the command - Use the command
```powershell ```powershell
py -V py -V
``` ```
- If this does not return a version, install [python](https://www.python.org) - If this does not return a version, install [python](https://www.python.org)
:::info
When installing Python, make sure to select the option to "Add Python to PATH" or check the box that says "Add Python to environment variables". If you missed this during installation, you can add Python to your system's PATH manually after installation. Failing to do so may result in errors when trying to use Python or pip commands.
:::
- Pip is typically installed if you are using python 3 version >= 3.4 - Pip is typically installed if you are using python 3 version >= 3.4
- Check that pip is installed using this command - Check that pip is installed using this command
```powershell ```powershell
@ -180,11 +183,7 @@ values={[
#### Termux #### Termux
:::note - Install [Termux from F-Droid](https://f-droid.org/en/packages/com.termux) or [Github Releases](https://github.com/termux/termux-app/releases). The Google Play store version has been deprecated.
Wifi connection is currently under development and may not be working properly just yet. If you would like to provide feedback or test this feature, please visit our [forum](https://meshtastic.discourse.group) or join our [Discord server](https://discord.gg/ktMAKGBnBs) for more information.
:::
- Install [Termux](https://f-droid.org/en/packages/com.termux) from the F-Droid app store (Google play does not currently support the latest builds)
- Load Termux and update the package list - Load Termux and update the package list
```shell ```shell
pkg update pkg update
@ -203,15 +202,14 @@ Wifi connection is currently under development and may not be working properly j
``` ```
:::note :::note
Be aware that the Meshtastic CLI is not able to control the nodes over USB through termux, but you can control devices over Wifi using the `--host x.x.x.x` option with the device IP address. However, only ESP32 devices can use Wifi currently. Be aware that the Meshtastic CLI is not able to control the nodes over USB through termux, but you can control devices over Wifi using the `--host x.x.x.x` option with the device IP address (ESP32 or Pico W only). Wifi connection is currently under development and may not be working properly just yet. If you would like to provide feedback or test this feature, please visit our [forum](https://meshtastic.discourse.group) or join our [Discord server](https://discord.gg/ktMAKGBnBs) for more information.
::: :::
</TabItem> </TabItem>
</Tabs> </Tabs>
:::info **You may need to close and re-open the CLI. The path variables may or may not update for the current session when installing.**
You may need to close and re-open the CLI. The path variables may or may not update for the current session when installing.
:::
### Standalone Installation (Ubuntu only) ### Standalone Installation (Ubuntu only)

View file

@ -5388,8 +5388,8 @@ packages:
resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
hasBin: true hasBin: true
/follow-redirects@1.15.5: /follow-redirects@1.15.6:
resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==} resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
engines: {node: '>=4.0'} engines: {node: '>=4.0'}
peerDependencies: peerDependencies:
debug: '*' debug: '*'
@ -6040,7 +6040,7 @@ packages:
engines: {node: '>=8.0.0'} engines: {node: '>=8.0.0'}
dependencies: dependencies:
eventemitter3: 4.0.7 eventemitter3: 4.0.7
follow-redirects: 1.15.5 follow-redirects: 1.15.6
requires-port: 1.0.0 requires-port: 1.0.0
transitivePeerDependencies: transitivePeerDependencies:
- debug - debug
@ -10165,8 +10165,8 @@ packages:
- utf-8-validate - utf-8-validate
dev: false dev: false
/webpack-dev-middleware@5.3.3(webpack@5.90.2): /webpack-dev-middleware@5.3.4(webpack@5.90.2):
resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} resolution: {integrity: sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==}
engines: {node: '>= 12.13.0'} engines: {node: '>= 12.13.0'}
peerDependencies: peerDependencies:
webpack: ^4.0.0 || ^5.0.0 webpack: ^4.0.0 || ^5.0.0
@ -10221,7 +10221,7 @@ packages:
sockjs: 0.3.24 sockjs: 0.3.24
spdy: 4.0.2 spdy: 4.0.2
webpack: 5.90.2 webpack: 5.90.2
webpack-dev-middleware: 5.3.3(webpack@5.90.2) webpack-dev-middleware: 5.3.4(webpack@5.90.2)
ws: 8.16.0 ws: 8.16.0
transitivePeerDependencies: transitivePeerDependencies:
- bufferutil - bufferutil