mirror of
https://github.com/meshtastic/meshtastic.git
synced 2024-09-19 23:57:31 -07:00
Merge branch 'master' into patch-5
This commit is contained in:
pdxlocations
GitHub
commit
2d4dba9cce
|
|
@ -12,7 +12,12 @@ import Tropho from "/img/enclosures/3dp-tropho-heltec32.webp";
|
|||
|
||||
### Heltec LoRa32 v2.1+ Case
|
||||
|
||||
Download from [Printables](https://www.printables.com/model/118750-heltec-lora-32-case-for-meshtastic) or purchase from the creator's [Etsy Store](https://www.etsy.com/listing/1170868625/meshtastic-heltec-lora-32-case).
|
||||
Download from [Printables](https://www.printables.com/model/118750-heltec-lora-32-case-for-meshtastic) or purchase an already printed case below.
|
||||
|
||||
- US
|
||||
- [QuantumShadow3D](https://www.etsy.com/listing/1170868625/meshtastic-heltec-lora-32-case).
|
||||
- UK/EU
|
||||
- [3DChicken](https://3dchicken.co.uk/)
|
||||
|
||||
#### Required Hardware
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,13 @@ sidebar_position: 2
|
|||
|
||||
### T-Beam V5 Case
|
||||
|
||||
Download from [Printables](https://www.printables.com/model/127253-t-beam-case-for-meshtastic-v5) or purchase from the creator's [Etsy Store](https://www.etsy.com/listing/1173559418/meshtastic-t-beam-case-for-neo-m8n).
|
||||
Download from [Printables](https://www.printables.com/model/127253-t-beam-case-for-meshtastic-v5) or purchase an already printed case below.
|
||||
|
||||
Purchase Links:
|
||||
- US
|
||||
- [QuantumShadow3D](https://www.etsy.com/listing/1173559418/meshtastic-t-beam-case-for-neo-m8n)
|
||||
- UK/EU
|
||||
- [3DChicken](https://3dchicken.co.uk/)
|
||||
|
||||
#### Required Hardware
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
|
|||
- [SoCal Mesh](https://socalmesh.org)
|
||||
- [Laguna Mesh](https://lagunamesh.com)
|
||||
- [Mission Viejo Mesh](https://missionviejomesh.org/)
|
||||
- [Bay Area Mesh](https://canvis.app/z2k8a8)
|
||||
- [Meshtastic Bay Area Group](https://discord.gg/u2gxYu7RYQ)
|
||||
- [San Diego Mesh](https://discord.gg/k8RputgWgD)
|
||||
- [Antelope Valley Mesh](https://www.avmesh.org/)
|
||||
- [AltaMesh](https://altamesh.net/)
|
||||
|
|
@ -82,9 +82,15 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
|
|||
### Oklahoma
|
||||
- [Oklahoma Meshtastic Group](https://www.facebook.com/groups/942404880478488)
|
||||
|
||||
### Tennessee
|
||||
- [Nashville Meshville](https://meshville.org/)
|
||||
|
||||
### Texas
|
||||
- [Austin Mesh](https://austinmesh.org/)
|
||||
|
||||
## Germany
|
||||
- [Meshtastic Users D-A-CH](https://t.me/meshtasticgermany) for technical chat
|
||||
|
||||
## Italy
|
||||
- [Meshtastic Italia](https://t.me/meshtastic_italia)
|
||||
|
||||
|
|
|
|||
|
|
@ -11,5 +11,7 @@ Current community projects:
|
|||
|
||||
- [Meshtasticator (Simulator)](/docs/community/software/community-meshtasticator) - Meshtasticator is a discrete-event and interactive simulator that mimics the radio section of the device software.
|
||||
- [Meshtastic Web API](/docs/community/software/meshtastic-web-api) - Meshtastic Web API provides a RESTful interface to interact with a Meshtastic node via a serial connection.
|
||||
- [Mesh-metrics](/docs/community/software/community-mesh-metrics) - Meshtastic repeater metrics scraper using meshtastic-cli to be ingested by node_exporter for use in Prometheus or Victoria Metrics Time series DB with a Grafana dashboard and sample alerting rules.
|
||||
|
||||
Support for these projects should be sought from their respective authors.
|
||||
|
||||
|
|
|
|||
16
docs/community/software/mesh-metrics.mdx
Normal file
16
docs/community/software/mesh-metrics.mdx
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
---
|
||||
id: community-mesh-metrics
|
||||
title: Mesh-metrics
|
||||
sidebar_label: Mesh-metrics
|
||||
sidebar_position: 3
|
||||
---
|
||||
|
||||
:::note
|
||||
|
||||
This is a community project maintained by @cordelster.
|
||||
Development can be followed on [GitHub](https://github.com/cordelster/mesh-metrics).
|
||||
Support should be sought from the respective authors.
|
||||
|
||||
:::
|
||||
|
||||
Mesh-metrics is a script that uses the meshtastic-cli and a device connected by usb to send metrics-requests from a list of devices and output the results in a format to be ingested by node_exporter to populate a Prometheus/Victoria Metrics Time series DB. Along with the script, a Grafana dashboard and some alert examples are included. Mesh-metrics was created and is maintained by cordel and more information on its use and setup can be found on the [Mesh-metrics Github page](https://github.com/cordelster/mesh-metrics)
|
||||
|
|
@ -96,21 +96,29 @@ The result of reading a GPIO or notifications of GPIO changes will also be sent
|
|||
|
||||
You can get the latest python tool/library with `pip3 install --upgrade meshtastic` on Windows/Linux/OS-X. See the [python section](/docs/software/python/cli/installation) for more details.
|
||||
|
||||
To prevent access from untrusted users, you must first make a `gpio` channel that is used for authenticated access to this feature. You'll need to install this channel on both the local and remote node.
|
||||
To prevent access from untrusted users, you must first make a `gpio` channel that is used for authenticated access to this feature. You'll need to install this channel on both the local and remote node. Furthermore, you need to enable the module on both units.
|
||||
|
||||
The procedure using the python command line tool is:
|
||||
|
||||
1. Connect local device via USB
|
||||
2. Create a GPIO channel:
|
||||
2. Enable the Remote Hardware module:
|
||||
```shell
|
||||
meshtastic --set remote_hardware.enabled true
|
||||
```
|
||||
3. Create a GPIO channel:
|
||||
```shell
|
||||
meshtastic --ch-add gpio
|
||||
```
|
||||
3. Check the channel has been created and copy the long "Complete URL" that contains all the channels on that device:
|
||||
4. Check the channel has been created and copy the long "Complete URL" that contains all the channels on that device:
|
||||
```shell
|
||||
meshtastic --info
|
||||
```
|
||||
4. Connect the remote device via USB (or use the [remote admin](/docs/configuration/remote-admin) feature to reach it through the mesh)
|
||||
5. Set it to join the gpio channel you created:
|
||||
5. Connect the remote device via USB (or use the [remote admin](/docs/configuration/remote-admin) feature to reach it through the mesh)
|
||||
6. Enable the Remote Hardware module:
|
||||
```shell
|
||||
meshtastic --set remote_hardware.enabled true
|
||||
```
|
||||
7. Set it to join the gpio channel you created:
|
||||
```shell
|
||||
meshtastic --seturl theurlyoucopiedinstep3
|
||||
```
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ The device config options are: Role, Serial Output, and Debug Log. Device config
|
|||
| TRACKER | Broadcasts GPS position packets as priority. | Tracking the location of individuals or assets, especially in scenarios where timely and efficient location updates are critical. |
|
||||
| LOST_AND_FOUND | Broadcasts location as message to default channel regularly for to assist with device recovery. | Used for recovery efforts of a lost device. |
|
||||
| SENSOR | Broadcasts telemetry packets as priority. | Deploying in scenarios where gathering environmental or other sensor data is crucial, with efficient power usage and frequent updates. |
|
||||
| TAK | Optimized for ATAK system communication, reduces routine broadcasts. | Integration with ATAK systems (via the Mesthastic ATAK Plugin) for communication in tactical or coordinated operations. |
|
||||
| TAK | Optimized for ATAK system communication, reduces routine broadcasts. | Integration with ATAK systems (via the Meshtastic ATAK Plugin) for communication in tactical or coordinated operations. |
|
||||
| TAK_TRACKER | Enables automatic TAK PLI broadcasts and reduces routine broadcasts. | Standalone PLI integration with ATAK systems for communication in tactical or coordinated operations. |
|
||||
| REPEATER | Infrastructure node for extending network coverage by relaying messages with minimal overhead. Not visible in Nodes list. | Best positioned in strategic locations to maximize the network's overall coverage. Device is not shown in topology. |
|
||||
| ROUTER | Infrastructure node for extending network coverage by relaying messages. Visible in Nodes list. | Best positioned in strategic locations to maximize the network's overall coverage. Device is shown in topology. |
|
||||
|
|
|
|||
|
|
@ -30,6 +30,9 @@ When activated, this feature disables Bluetooth, Serial, WiFi, and the device's
|
|||
|
||||
Automatically shut down a device after a defined time period if power is lost.
|
||||
|
||||
Before setting this, ensure your board correctly detects when it is connected to external power (the "🔌" icon in the app). Otherwise, your device could shut down even when power is present.
|
||||
Many devices detect power status correctly, however for some devices, you will need to modify the ADC Multiplier (below).
|
||||
|
||||
### ADC Multiplier Override
|
||||
|
||||
Ratio of voltage divider for battery pin e.g. 3.20 (R1=100k, R2=220k)
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ values={[
|
|||
|
||||
- [Android App](/docs/category/android-app)
|
||||
- [Web Client](https://client.meshtastic.org)
|
||||
- [iOS/iPadOS/macOS App](/docs/category/apple-apps)
|
||||
|
||||
</TabItem>
|
||||
<TabItem value="network">
|
||||
|
|
|
|||
41
docs/hardware/devices/canary/index.mdx
Normal file
41
docs/hardware/devices/canary/index.mdx
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
---
|
||||
id: canaryone
|
||||
title: CanaryOne
|
||||
sidebar_label: Canary
|
||||
sidebar_position: 12
|
||||
---
|
||||
|
||||
|
||||
The CanaryOne was built by Canary Radio Company from the ground up to run Meshtastic in austere environments as an affordable tactical networking solution.
|
||||
|
||||
CanaryOne custom PCB and case were designed and are assembled and manufactured in the United States.
|
||||
|
||||
The custom PCB board supports jlink debugging, with intelligent electrical components sourced from the United States and Western Europe.
|
||||
|
||||
|
||||
|
||||
## Specifications
|
||||
|
||||
- **MCU**
|
||||
- NRF52840 (Bluetooth)
|
||||
- Bluetooth 5.0
|
||||
- **LoRa Transceiver**
|
||||
- Semtech SX1262
|
||||
- **Frequency options**
|
||||
- All Meshtastic options.
|
||||
- **Navigation Module**
|
||||
- ATGM336H-5N-71 (Supports GPS, BDS and GLONASS)
|
||||
- **Antenna**
|
||||
- SMA Socket
|
||||
- **Connectors**
|
||||
- USB-C
|
||||
|
||||
## Resources
|
||||
|
||||
- Firmware file: `canary-one-X.X.X.xxxxxxx.bin`
|
||||
- Purchase Link: [canaryradio.io](https://canaryradio.io/products/canaryone)
|
||||
|
||||
## Perspective Photos
|
||||
|
||||
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ Modular hardware system with Base, Core and Peripheral modules including the low
|
|||
[RAK18001](./rak/peripherals?rakmodules=Buzzer) Buzzer<br/>
|
||||
[RAK13002](./rak/peripherals?rakmodules=IO) IO<br/>
|
||||
RAK14001 RGB LED<br/>
|
||||
RAK12002 RTC<br/>
|
||||
[RAK12002](./rak/peripherals?rakmodules=RTC) RTC<br/>
|
||||
[RAK1901](./rak/peripherals?rakmodules=Sensors&sensors=RAK1901) Temperature and Humidity Sensor<br/>
|
||||
[RAK1902](./rak/peripherals?rakmodules=Sensors&sensors=RAK1902) Barometric Pressure Sensor<br/>
|
||||
[RAK1906](./rak/peripherals?rakmodules=Sensors&sensors=RAK1906) Environment Sensor<br/>
|
||||
|
|
@ -107,7 +107,7 @@ Inexpensive basic ESP32-based boards.
|
|||
| Name | MCU | Radio | WiFi | BT | GPS |
|
||||
|:------------------------------------------------------------------|:------------|:-------|:------------:|:---:|:---:|
|
||||
| [LoRa32 V2.1](./heltec/?heltec=v2.1) | ESP32 | SX127x | 2.4GHz b/g/n | 4.2 | NO |
|
||||
| [LoRa32 V3/3.1](./heltec/?heltec=v23) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
|
||||
| [LoRa32 V3/3.1](./heltec/?heltec=v23) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
|
||||
| [Wireless Stick Lite V3](./heltec/?heltec=Wireless+Stick+Lite+V3) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
|
||||
| [Wireless Tracker](./heltec/?heltec=tracker) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | YES |
|
||||
| [Wireless Paper](./heltec/?heltec=paper) | ESP32-S3FN8 | SX1262 | 2.4GHz b/g/n | 5.0 | NO |
|
||||
|
|
@ -139,3 +139,10 @@ Fast versatile boards using the RP2040.
|
|||
SSD1306 OLED Display<br/>
|
||||
SH1106 OLED Display<br/>
|
||||
CardKB Keyboard<br/>
|
||||
|
||||
### [CanaryOne](./canary)
|
||||
Complete solution with battery, screen, case, and antenna. Ships pre-flashed with latest Meshtastic firmware.
|
||||
|
||||
| Name | MCU | Radio | WiFi | BT | GPS |
|
||||
|:----------------------|:---------|:-------|:----:|:---:|:---:|
|
||||
| [CanaryOne](./canary) | nRF52840 | SX1262 | NO | 5.0 | YES |
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ The RAK12500 is supported on the following base boards & slots:
|
|||
|
||||
- RAK19007 on slot A
|
||||
- RAK19003 on slot C
|
||||
- RAK19001 on slot F
|
||||
|
||||
### RAK1910
|
||||
|
||||
|
|
@ -47,6 +48,7 @@ The RAK1910 is supported on the following base boards & slots:
|
|||
- RAK5005-0 on slot A
|
||||
- RAK19007 on slot A
|
||||
- RAK19003 on slot C
|
||||
- RAK19001 on slot F
|
||||
|
||||
### Resources
|
||||
- RAK Documentation Center
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
id: privacy
|
||||
title: Meshtastic privacy policy
|
||||
sidebar_label: Privacy
|
||||
custom_edit_url: null
|
||||
sidebar_position: 2
|
||||
---
|
||||
|
||||
|
|
@ -9,8 +10,6 @@ We don't collect any personal identifying information. We never capture username
|
|||
|
||||
If you opt-in to analytics on the Android app (thank you - that helps us know what things we need to improve), we will receive anonymized information about user behavior. This includes crash reports, screens used in the app, etc... Analytics is provided by [Firebase Crashlytics](https://firebase.google.com/products/crashlytics).
|
||||
|
||||
Maps provided by Mapbox require analytics to work. For more information about what they collect, please see the [Mapbox privacy policy](https://www.mapbox.com/legal/privacy).
|
||||
|
||||
The search engine for this website is provided by Algolia, please see their [privacy policy](https://www.algolia.com/policies/privacy) for details of what information they collect.
|
||||
|
||||
This is an open-source project run by hobbyists, and we try to be completely transparent. If you have questions on this policy, please post on the forum, and we'll reply/clarify/correct.
|
||||
|
|
|
|||
|
|
@ -31,7 +31,12 @@ export default function NotFoundContent({ className }) {
|
|||
original URL and let them know their link is broken.
|
||||
</Translate>
|
||||
</p>
|
||||
<img src="/design/chirpy.png" alt="Chirpy" />
|
||||
<img
|
||||
src="/design/chirpy/chirpy.png"
|
||||
alt="Chirpy"
|
||||
className={clsx("col col--6 col--offset-3")}
|
||||
style={{ maxWidth: "300px" }}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 2865a55d39dea5f6d9f2c09ac1ec485666a833da
|
||||
Subproject commit eeddd10c108f1516e6e0c878fbaa8ed40a4d279d
|
||||
BIN
static/img/hardware/canary-one/dos.webp
Normal file
BIN
static/img/hardware/canary-one/dos.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 481 KiB |
BIN
static/img/hardware/canary-one/front.webp
Normal file
BIN
static/img/hardware/canary-one/front.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 139 KiB |
BIN
static/img/hardware/canary-one/perspective.webp
Normal file
BIN
static/img/hardware/canary-one/perspective.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 80 KiB |
Loading…
Reference in a new issue