From b73ad68abd767c8196234f0bb4ffd436005fad46 Mon Sep 17 00:00:00 2001 From: James <13262021+james-coder@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:46:11 -0700 Subject: [PATCH 01/18] Heltec LoRa 32 v3.1 added Heltec LoRa 32 v3.1 has two schematic changes from v3.0 Two people have mentioned it on Discord and one person has mentioned it on Facebook. OLED screen appears to show a booted Meshtastic. (That shouldn't be an issue as the changes are PSU + ESP32-S3 RF, but at least the 3.3V rail is maybe not impacted?) https://discord.com/channels/867578229534359593/871553168369148024/1202361664608149555 https://discord.com/channels/867578229534359593/919642584480112750/1171093224060883065 https://www.facebook.com/groups/730536684339042/posts/1486317198760983/ V3.1 schematic: https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf v3.0 schematic (deleted from Heltec's website!) https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf --- docs/hardware/devices/heltec/index.mdx | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index 813a7179..9f26368b 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -96,6 +96,27 @@ Image Source: [Heltec]( + + +## HELTEC v3.1 + +On the top right side of the board where it normally says "V3" next to the U.FL/IPEX antenna connector, there is a "V3.1" instead of "V3". These started appearing around November 2023. + +[V3.0 schematic](https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf) + +[V3.1 schematic](https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf) + +The schematic between V3.0 and V3.1 is virtually identical, with only two differences: + +- V3.0 has a [FDG6322C](https://www.mouser.com/datasheet/2/308/1/FDG6322C_D-2312203.pdf) in the power supply circuitry. (FDG6322C is a dual N & P channel digital FET on the output of the LDO regulator. Seems like a cost cutting measure, but it might impact the maximum current or stability of the 3.3V rail.) + +- V3.0 had different ESP32-S3 antenna filters: + - V3.0: L11 = 1.6nH, C15 = 6.9pF, C24 = 2.4pF + - V3.1: L11 = 1.8pF(?), C15 = 2.7nH (?), C24 = 1.8pF +Question marks above on V3.1 because pF are typically capacitors and nH are typically inductors. Did they mess something up, or did this require an odd swap like this? TODO: someone please confirm the V3.1 ESP-S3 Bluetooth and Wifi are functional with Meshtastic. + + + ## HELTEC Wireless Stick Lite V3 From 2eeec1677c151a3d84581273c35ddff3cdf196bb Mon Sep 17 00:00:00 2001 From: James <13262021+james-coder@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:16:11 -0700 Subject: [PATCH 02/18] Heltec LoRa 32 v3.1 update - Added v3.1 as default to header at the top. - ESP32-S3 Wifi and Bluetooth confirmed tested. --- docs/hardware/devices/heltec/index.mdx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index 9f26368b..6d0ac641 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -11,10 +11,11 @@ import TabItem from "@theme/TabItem"; From 738340b0ffbd8038afee0c9b0add658f08e6c535 Mon Sep 17 00:00:00 2001 From: James <13262021+james-coder@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:33:18 -0700 Subject: [PATCH 03/18] Heltec LoRa 32 v3.1 include in v3.0 tab Merged them into the same tab as they use the same v3 firmware. --- docs/hardware/devices/heltec/index.mdx | 33 +++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index 6d0ac641..6bddfe42 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -15,7 +15,6 @@ defaultValue="v3.1" values={[ {label: 'LoRa32 V2.1', value: 'v2.1'}, {label: 'LoRa32 V3', value:'v3'}, -{label: 'LoRa32 V3.1', value:'v3.1'}, {label: 'Wireless Stick Lite V3', value:'Wireless Stick Lite V3'}, {label: 'Wireless Tracker', value: 'tracker'}, {label: 'Wireless Paper', value: 'paper'} @@ -55,6 +54,23 @@ Not recommended because of design issues! Support is being phased out. Use V3 in +## HELTEC v3.1 + +Use the same V3 firmware files as V3.1 as the hardware is nearly identical. On the top right side of the board where it normally says "V3" next to the U.FL/IPEX antenna connector, there is a "V3.1" instead of "V3". These started appearing around November 2023. + +[V3.0 schematic](https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf) + +[V3.1 schematic](https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf) + +The schematic between V3.0 and V3.1 is virtually identical, with only two differences: + +- V3.0 has a [FDG6322C](https://www.mouser.com/datasheet/2/308/1/FDG6322C_D-2312203.pdf) in the power supply circuitry. (FDG6322C is a dual N & P channel digital FET on the output of the LDO regulator. Seems like a cost cutting measure, but it might impact the maximum current or stability of the 3.3V rail.) + +- V3.0 had different ESP32-S3 antenna filters: + - V3.0: L11 = 1.6nH, C15 = 6.9pF, C24 = 2.4pF + - V3.1: L11 = 1.8pF(?), C15 = 2.7nH (?), C24 = 1.8pF +Question marks above on V3.1 because pF are typically capacitors and nH are typically inductors. + ## HELTEC v3 :::info @@ -99,22 +115,7 @@ Image Source: [Heltec]( -## HELTEC v3.1 -On the top right side of the board where it normally says "V3" next to the U.FL/IPEX antenna connector, there is a "V3.1" instead of "V3". These started appearing around November 2023. - -[V3.0 schematic](https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf) - -[V3.1 schematic](https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf) - -The schematic between V3.0 and V3.1 is virtually identical, with only two differences: - -- V3.0 has a [FDG6322C](https://www.mouser.com/datasheet/2/308/1/FDG6322C_D-2312203.pdf) in the power supply circuitry. (FDG6322C is a dual N & P channel digital FET on the output of the LDO regulator. Seems like a cost cutting measure, but it might impact the maximum current or stability of the 3.3V rail.) - -- V3.0 had different ESP32-S3 antenna filters: - - V3.0: L11 = 1.6nH, C15 = 6.9pF, C24 = 2.4pF - - V3.1: L11 = 1.8pF(?), C15 = 2.7nH (?), C24 = 1.8pF -Question marks above on V3.1 because pF are typically capacitors and nH are typically inductors. From 3336b90efa88365afb5149a47743605f970963d9 Mon Sep 17 00:00:00 2001 From: James <13262021+james-coder@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:50:52 -0700 Subject: [PATCH 04/18] Heltec LoRa 32 v3.1 minor revert Revert changing default. --- docs/hardware/devices/heltec/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index 6bddfe42..97a7946d 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -11,7 +11,7 @@ import TabItem from "@theme/TabItem"; Date: Fri, 9 Feb 2024 17:01:21 -0700 Subject: [PATCH 05/18] Heltec LoRa 32 v3.1 fix Improved the wording a bit. Previewed it locally. --- docs/hardware/devices/heltec/index.mdx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index 97a7946d..df4aea85 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -56,11 +56,7 @@ Not recommended because of design issues! Support is being phased out. Use V3 in ## HELTEC v3.1 -Use the same V3 firmware files as V3.1 as the hardware is nearly identical. On the top right side of the board where it normally says "V3" next to the U.FL/IPEX antenna connector, there is a "V3.1" instead of "V3". These started appearing around November 2023. - -[V3.0 schematic](https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf) - -[V3.1 schematic](https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf) +Use the same V3 firmware file. Right side of board says V3.1. [V3.0 schematic](https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf) | [V3.1 schematic](https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf) The schematic between V3.0 and V3.1 is virtually identical, with only two differences: @@ -68,8 +64,7 @@ The schematic between V3.0 and V3.1 is virtually identical, with only two differ - V3.0 had different ESP32-S3 antenna filters: - V3.0: L11 = 1.6nH, C15 = 6.9pF, C24 = 2.4pF - - V3.1: L11 = 1.8pF(?), C15 = 2.7nH (?), C24 = 1.8pF -Question marks above on V3.1 because pF are typically capacitors and nH are typically inductors. + - V3.1: L11 = 1.8pF(?), C15 = 2.7nH (?), C24 = 1.8pF, Question marks because pF are typically capacitors and nH are typically inductors and they have swapped these. ## HELTEC v3 From b1f15c8344c4f52f908dd34abb5d34a704f162bd Mon Sep 17 00:00:00 2001 From: James <13262021+james-coder@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:03:33 -0700 Subject: [PATCH 06/18] Cleanup previously added tags Removed previously added tags --- docs/hardware/devices/heltec/index.mdx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index df4aea85..6c70fb7c 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -106,12 +106,6 @@ Image Source: [Heltec]( - - - - - From 8e99029b6fe0374528fcbce1e4fe8d130205b4a9 Mon Sep 17 00:00:00 2001 From: James <13262021+james-coder@users.noreply.github.com> Date: Tue, 13 Feb 2024 01:30:58 -0700 Subject: [PATCH 07/18] Heltec LoRa 32 v3.1 - pi type reference circuit Reference in https://github.com/meshtastic/meshtastic/pull/990#issuecomment-1936766058 --- docs/hardware/devices/heltec/index.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index 6c70fb7c..84b317ef 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -62,9 +62,9 @@ The schematic between V3.0 and V3.1 is virtually identical, with only two differ - V3.0 has a [FDG6322C](https://www.mouser.com/datasheet/2/308/1/FDG6322C_D-2312203.pdf) in the power supply circuitry. (FDG6322C is a dual N & P channel digital FET on the output of the LDO regulator. Seems like a cost cutting measure, but it might impact the maximum current or stability of the 3.3V rail.) -- V3.0 had different ESP32-S3 antenna filters: +- V3.0 had different ESP32-S3 antenna filters than v3.1: - V3.0: L11 = 1.6nH, C15 = 6.9pF, C24 = 2.4pF - - V3.1: L11 = 1.8pF(?), C15 = 2.7nH (?), C24 = 1.8pF, Question marks because pF are typically capacitors and nH are typically inductors and they have swapped these. + - V3.1: L11 = 1.8pF, C15 = 2.7nH, C24 = 1.8pF, more closely matches π-type matching circuit of reference design in esp32-s3-pico-1. ## HELTEC v3 From 7af24a85211bfde1685b3093ac48cb0c6dfc11a2 Mon Sep 17 00:00:00 2001 From: James <13262021+james-coder@users.noreply.github.com> Date: Tue, 13 Feb 2024 01:55:09 -0700 Subject: [PATCH 08/18] Heltec LoRa 32 v3.1 - refactor Putting most of the same words into a more concise formatting to take less vertical space. --- docs/hardware/devices/heltec/index.mdx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index 84b317ef..c1093a4a 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -56,15 +56,10 @@ Not recommended because of design issues! Support is being phased out. Use V3 in ## HELTEC v3.1 -Use the same V3 firmware file. Right side of board says V3.1. [V3.0 schematic](https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf) | [V3.1 schematic](https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf) +Firmware remains the same as V3 below. Compare schematics: [V3.0](https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf) and [V3.1](https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf). Key differences: -The schematic between V3.0 and V3.1 is virtually identical, with only two differences: - -- V3.0 has a [FDG6322C](https://www.mouser.com/datasheet/2/308/1/FDG6322C_D-2312203.pdf) in the power supply circuitry. (FDG6322C is a dual N & P channel digital FET on the output of the LDO regulator. Seems like a cost cutting measure, but it might impact the maximum current or stability of the 3.3V rail.) - -- V3.0 had different ESP32-S3 antenna filters than v3.1: - - V3.0: L11 = 1.6nH, C15 = 6.9pF, C24 = 2.4pF - - V3.1: L11 = 1.8pF, C15 = 2.7nH, C24 = 1.8pF, more closely matches π-type matching circuit of reference design in esp32-s3-pico-1. +- Removal of [FDG6322C](https://www.mouser.com/datasheet/2/308/1/FDG6322C_D-2312203.pdf) (a dual N & P channel FET) from the V3.1 power supply. +- Antenna filter values in V3.1 (L11 = 1.8pF, C15 = 2.7nH, C24 = 1.8pF) align more closely with ESP32-S3 reference design than V3.0 (L11 = 1.6nH, C15 = 6.9pF, C24 = 2.4pF). ## HELTEC v3 From 0ce562fb3ab3f04971feff689457279076264414 Mon Sep 17 00:00:00 2001 From: Chris <42919372+Darachnid@users.noreply.github.com> Date: Sat, 24 Feb 2024 05:08:56 -0500 Subject: [PATCH 09/18] Update local-groups.mdx added a local we are starting in Boston --- docs/community/local-groups.mdx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/community/local-groups.mdx b/docs/community/local-groups.mdx index d763f2c3..e9e81c5a 100644 --- a/docs/community/local-groups.mdx +++ b/docs/community/local-groups.mdx @@ -38,5 +38,8 @@ us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group. ### Hawaii - [Hawaii Meshnet](https://www.hawaiimesh.net/) +### Massachusetts +- [Boston Meshnet](https://github.com/Darachnid/Boston-Meshnet) + ### Texas - [Austin Mesh](https://austinmesh.org/) From ac3064d2ca2a52c7a29433b460777740ae39d5fa Mon Sep 17 00:00:00 2001 From: James <13262021+james-coder@users.noreply.github.com> Date: Sat, 24 Feb 2024 17:09:38 -0700 Subject: [PATCH 10/18] Update LoRa 32 V3.1 Updated the tab and main header to V3/3.1 and added ### V3.1 differences section. --- docs/hardware/devices/heltec/index.mdx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index c1093a4a..80505986 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -14,7 +14,7 @@ queryString="heltec" defaultValue="v3" values={[ {label: 'LoRa32 V2.1', value: 'v2.1'}, -{label: 'LoRa32 V3', value:'v3'}, +{label: 'LoRa32 V3/V3.1', value:'v3'}, {label: 'Wireless Stick Lite V3', value:'Wireless Stick Lite V3'}, {label: 'Wireless Tracker', value: 'tracker'}, {label: 'Wireless Paper', value: 'paper'} @@ -54,14 +54,7 @@ Not recommended because of design issues! Support is being phased out. Use V3 in -## HELTEC v3.1 - -Firmware remains the same as V3 below. Compare schematics: [V3.0](https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf) and [V3.1](https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf). Key differences: - -- Removal of [FDG6322C](https://www.mouser.com/datasheet/2/308/1/FDG6322C_D-2312203.pdf) (a dual N & P channel FET) from the V3.1 power supply. -- Antenna filter values in V3.1 (L11 = 1.8pF, C15 = 2.7nH, C24 = 1.8pF) align more closely with ESP32-S3 reference design than V3.0 (L11 = 1.6nH, C15 = 6.9pF, C24 = 2.4pF). - -## HELTEC v3 +## HELTEC v3/v3.1 :::info This device may have issues charging a connected battery if utilizing a USB-C to USB-C cable. It's recommended to use a USB-A to USB-C cable. @@ -82,6 +75,13 @@ This device may have issues charging a connected battery if utilizing a USB-C to - Dedicated 2.4 GHz metal spring antenna for WiFi/Bluetooth - U.FL/IPEX antenna connector for LoRa +### V3.1 differences + +Firmware remains the same as V3 below. Compare schematics: [V3.0](https://web.archive.org/web/20221127054612/https://resource.heltec.cn/download/WiFi_LoRa32_V3/HTIT-WB32LA(F)_V3_Schematic_Diagram.pdf) and [V3.1](https://resource.heltec.cn/download/WiFi_LoRa_32_V3/HTIT-WB32LA(F)_V3.1_Schematic_Diagram.pdf). Key differences: + +- Removal of [FDG6322C](https://www.mouser.com/datasheet/2/308/1/FDG6322C_D-2312203.pdf) (a dual N & P channel FET) from the V3.1 power supply. +- Antenna filter values in V3.1 (L11 = 1.8pF, C15 = 2.7nH, C24 = 1.8pF) align more closely with ESP32-S3 reference design than V3.0 (L11 = 1.6nH, C15 = 6.9pF, C24 = 2.4pF). + ### Features - Built in 0.96 inch OLED display From e749cb353248e10a171bac2f6764982ad230ddf3 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Sat, 24 Feb 2024 20:08:25 -0800 Subject: [PATCH 11/18] 3/3.1 --- docs/hardware/devices/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hardware/devices/index.mdx b/docs/hardware/devices/index.mdx index feb64e21..f1131a97 100644 --- a/docs/hardware/devices/index.mdx +++ b/docs/hardware/devices/index.mdx @@ -106,7 +106,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](./heltec/?heltec=v23) | ESP32 | SX1262 | 2.4GHz b/g/n | 4.2 | NO | +| [LoRa32 V3/3.1](./heltec/?heltec=v23) | ESP32 | SX1262 | 2.4GHz b/g/n | 4.2 | 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 | From e323b4ff4f87024ac1421f17f893538e5af01731 Mon Sep 17 00:00:00 2001 From: Manuel <71137295+mverch67@users.noreply.github.com> Date: Sun, 25 Feb 2024 11:06:02 +0100 Subject: [PATCH 12/18] Update paxcounter.mdx fix 90 <-> 900 seconds --- docs/configuration/module/paxcounter.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/module/paxcounter.mdx b/docs/configuration/module/paxcounter.mdx index 1878dc41..6e24847e 100644 --- a/docs/configuration/module/paxcounter.mdx +++ b/docs/configuration/module/paxcounter.mdx @@ -67,7 +67,7 @@ meshtastic --set paxcounter.enabled true meshtastic --set paxcounter.enabled false ``` -```shell title="Set the Minimum Broadcast Interval to 90 seconds" +```shell title="Set the Minimum Broadcast Interval to 900 seconds" meshtastic --set paxcounter.paxcounter_update_interval 900 ``` From 583afe2a97f4a346e02b1311a03a121c6f9c499f Mon Sep 17 00:00:00 2001 From: GUVWAF Date: Sun, 25 Feb 2024 14:13:58 +0100 Subject: [PATCH 13/18] Add notes that JSON is not supported on the nRF52 platform --- docs/configuration/module/mqtt.mdx | 4 ++++ docs/configuration/radio/network.mdx | 2 +- docs/software/integrations/mqtt/index.mdx | 6 +++++- docs/software/integrations/mqtt/nodered.mdx | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/configuration/module/mqtt.mdx b/docs/configuration/module/mqtt.mdx index 69b3dab3..7645e0e7 100644 --- a/docs/configuration/module/mqtt.mdx +++ b/docs/configuration/module/mqtt.mdx @@ -38,6 +38,10 @@ Whether to send encrypted or unencrypted packets to MQTT. This parameter is only ### JSON Enabled +:::note +JSON is not supported on the nRF52 platform. +::: + Enable the sending / consumption of JSON packets on MQTT. These packets are not encrypted, but offer an easy way to integrate with systems that can read JSON. ### TLS Enabled diff --git a/docs/configuration/radio/network.mdx b/docs/configuration/radio/network.mdx index da0f99bb..25672dd9 100644 --- a/docs/configuration/radio/network.mdx +++ b/docs/configuration/radio/network.mdx @@ -167,7 +167,7 @@ All Network config options are available in the Web UI. ### WiFi Client -With `network.wifi_ssid` & `network.wifi_psk` populated, the device will know to connect to your network. Make sure you are in range of your WiFi. If you have a single Meshtastic device on your local network it's easy to connect to your device with DNS `http://meshtastic.local`. If you have multiple Meshtastic devices you will need to connect using their respective IP addresses. +With `network.wifi_ssid` & `network.wifi_psk` populated, the device will know to connect to your network. Make sure you are in range of your WiFi and it is a 2.4GHz-only network. If you have a single Meshtastic device on your local network it's easy to connect to your device with DNS `http://meshtastic.local`. If you have multiple Meshtastic devices you will need to connect using their respective IP addresses. ### Disable WiFi diff --git a/docs/software/integrations/mqtt/index.mdx b/docs/software/integrations/mqtt/index.mdx index f885e3f4..90ae23e9 100644 --- a/docs/software/integrations/mqtt/index.mdx +++ b/docs/software/integrations/mqtt/index.mdx @@ -54,6 +54,10 @@ The payload is a raw protobuf, whose definitions for Meshtastic can be found [he If [encryption_enabled](/docs/configuration/module/mqtt#encryption-enabled) is set to true, the payload of the MeshPacket will remain encrypted with the key for the specified channel. #### JSON topic +:::note +JSON is not supported on the nRF52 platform. +::: + If [JSON is enabled](/docs/configuration/module/mqtt#json-enabled), packets from the following [port numbers](/docs/development/firmware/portnum) are serialized to JSON: `TEXT_MESSAGE_APP`, `TELEMETRY_APP`, `NODEINFO_APP`, `POSITION_APP`, `WAYPOINT_APP`, `NEIGHBORINFO_APP`, `TRACEROUTE_APP`, `DETECTION_SENSOR_APP`, `PAXCOUNTER_APP` and `REMOTE_HARDWARE_APP`. These are then forwarded to the topic: `msh/2/json/CHANNELNAME/USERID`. @@ -123,7 +127,7 @@ For the type `sendtext`, the `payload` should be a string containing the text to Check out [MQTT Settings](/docs/configuration/module/mqtt) for full information. For quick start instructions, read on. - Connect your gateway node to wifi, by setting the `network.wifi_ssid`, `network.wifi_psk` and `network.wifi_enabled` preferences. -- Alternatively use the RAK4631 with Ethernet Module RAK13800, by setting `network.eth_mode` and `network.eth_enabled`. +- Alternatively use the RAK4631 with Ethernet Module RAK13800, by setting `network.eth_mode` and `network.eth_enabled` (note that JSON is not supported on the nRF52 platform). - Configure your broker settings: `mqtt.address`, `mqtt.username`, and `mqtt.password`. If all are left blank, the device will connect to the Meshtastic broker. - Set `uplink_enabled` and `downlink_enabled` as appropriate for each channel. Most users will just have a single channel (at channel index 0). `meshtastic --ch-index 0 --ch-set uplink_enabled true` diff --git a/docs/software/integrations/mqtt/nodered.mdx b/docs/software/integrations/mqtt/nodered.mdx index 4c465cd3..85456688 100644 --- a/docs/software/integrations/mqtt/nodered.mdx +++ b/docs/software/integrations/mqtt/nodered.mdx @@ -54,6 +54,10 @@ The JSON output only publishes the following subset of the messages on a Meshtas > Protobufs are mesh native. #### 1. Using JSON-encoded messages +:::note +JSON is not supported on the nRF52 platform. +::: + Make sure that option *JSON Output Enabled* is set in MQTT module options and you have a channel called "mqtt". Below is a valid JSON envelope for information sent by MQTT to a device for broadcast onto the mesh. The `to` field is optional and can be omitted for broadcast. The `channel` field is also optional and can be omitted to send to the primary channel. From 674681aa89866b078e5473d7ce2dbf1641f790a1 Mon Sep 17 00:00:00 2001 From: Sean Kilgore Date: Sun, 25 Feb 2024 14:29:43 -0800 Subject: [PATCH 14/18] docs: make atak plugin install more explicit --- docs/software/integrations/atak-plugin.mdx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/software/integrations/atak-plugin.mdx b/docs/software/integrations/atak-plugin.mdx index d2732ecc..858f8abb 100644 --- a/docs/software/integrations/atak-plugin.mdx +++ b/docs/software/integrations/atak-plugin.mdx @@ -23,11 +23,13 @@ The ATAK plugin does not permit any Meshtastic configuration. The plugin does th 2. Set the device's role to `TAK` in the [device configuration settings](/docs/configuration/radio/device/). -3. With the Meshtastic Android App running in the background (to ensure the IMeshService is alive), launch ATAK (with the Meshtastic ATAK-Plugin installed or install it once ATAK is running) and you should observe a green Meshtastic icon in the bottom right. If the icon is red, then the plugin was not able to bind to the IMeshService provided by the Meshtastic Android App. If this is the case, check to ensure the Meshtastic Android App is functioning. The plugin will reconnect after a failed bind without restarting ATAK. +3. Install the release of the Meshtastic ATAK-Plugin that matches your version of ATAK on all parties' devices from the [project's GitHub Releases](https://github.com/meshtastic/ATAK-Plugin/releases). + +4. With the Meshtastic Android App running in the background (to ensure the IMeshService is alive), launch ATAK (with the Meshtastic ATAK-Plugin installed or install it once ATAK is running) and you should observe a green Meshtastic icon in the bottom right. If the icon is red, then the plugin was not able to bind to the IMeshService provided by the Meshtastic Android App. If this is the case, check to ensure the Meshtastic Android App is functioning. The plugin will reconnect after a failed bind without restarting ATAK. If you do not see a Meshtastic icon, make sure that you have installed the Meshtastic ATAK-Plugin correctly. ## Standalone TAK Tracker usage -For devices with GPS available, configuring the device's role to `TAK_TRACKER` will allow the Meshtastic to transmit TAK PLI (Position Location Information) independently of ATAK. This data can be received and displayed within ATAK EUDs connected to a Meshtastic device and configured with the Meshtastic ATAK plugin (provided they are configured on the same Meshtastic channels). +For devices with GPS available, configuring the device's role to `TAK_TRACKER` will allow the Meshtastic to transmit TAK PLI (Position Location Information) independently of ATAK. This data can be received and displayed within ATAK EUDs connected to a Meshtastic device and configured with the Meshtastic ATAK plugin (provided they are configured on the same Meshtastic channels). A couple of important notes regarding this setup: From 67946af5d7faef443da7be6d7548db8a61c55997 Mon Sep 17 00:00:00 2001 From: Sean Kilgore Date: Sun, 25 Feb 2024 14:40:26 -0800 Subject: [PATCH 15/18] docs: atak; remove 'your' reference --- docs/software/integrations/atak-plugin.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/software/integrations/atak-plugin.mdx b/docs/software/integrations/atak-plugin.mdx index 858f8abb..609e836b 100644 --- a/docs/software/integrations/atak-plugin.mdx +++ b/docs/software/integrations/atak-plugin.mdx @@ -23,7 +23,7 @@ The ATAK plugin does not permit any Meshtastic configuration. The plugin does th 2. Set the device's role to `TAK` in the [device configuration settings](/docs/configuration/radio/device/). -3. Install the release of the Meshtastic ATAK-Plugin that matches your version of ATAK on all parties' devices from the [project's GitHub Releases](https://github.com/meshtastic/ATAK-Plugin/releases). +3. Install the version of the Meshtastic ATAK-Plugin that matches the ATAK version on all participants' devices from the [project's GitHub Releases](https://github.com/meshtastic/ATAK-Plugin/releases). 4. With the Meshtastic Android App running in the background (to ensure the IMeshService is alive), launch ATAK (with the Meshtastic ATAK-Plugin installed or install it once ATAK is running) and you should observe a green Meshtastic icon in the bottom right. If the icon is red, then the plugin was not able to bind to the IMeshService provided by the Meshtastic Android App. If this is the case, check to ensure the Meshtastic Android App is functioning. The plugin will reconnect after a failed bind without restarting ATAK. If you do not see a Meshtastic icon, make sure that you have installed the Meshtastic ATAK-Plugin correctly. From 7c72de00e03b02263eea1be470a3d9f05c9d9207 Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Mon, 26 Feb 2024 10:27:07 -0700 Subject: [PATCH 16/18] remove title and add donate button --- docusaurus.config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docusaurus.config.js b/docusaurus.config.js index 2214253a..d7e177d5 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -23,7 +23,6 @@ const config = { }, }, navbar: { - title: "Meshtastic", hideOnScroll: true, logo: { alt: "Meshtastic Logo", @@ -39,6 +38,10 @@ const config = { label: "Downloads", to: "downloads", }, + { + label: "Donate", + to: "docs/contributing/#supporting-and-contributing-to-meshtastic", + }, { label: "About", position: "right", From 9f39e7ea2f641a3cfec5a5f92087ca4956213737 Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Mon, 26 Feb 2024 14:12:51 -0700 Subject: [PATCH 17/18] Update peripherals.mdx Spelling. --- docs/hardware/devices/heltec/peripherals.mdx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/hardware/devices/heltec/peripherals.mdx b/docs/hardware/devices/heltec/peripherals.mdx index 0b55dd6e..a19186cf 100644 --- a/docs/hardware/devices/heltec/peripherals.mdx +++ b/docs/hardware/devices/heltec/peripherals.mdx @@ -77,14 +77,15 @@ By following this guide, you can enhance your Heltec ESP32 V3 board with valuabl ## Keyboard -Comming Soon +Coming Soon ## Buzzer -Commming Soon +Coming Soon + From 7dbe07eb39f4c8a177126fdb531b722022c42e93 Mon Sep 17 00:00:00 2001 From: GUVWAF Date: Wed, 28 Feb 2024 20:29:40 +0100 Subject: [PATCH 18/18] Clarify broadcast interval for Device Metrics and NodeInfo --- docs/configuration/module/telemetry.mdx | 4 +++- docs/configuration/radio/device.mdx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/configuration/module/telemetry.mdx b/docs/configuration/module/telemetry.mdx index d6b4bd5a..bb3ada3f 100644 --- a/docs/configuration/module/telemetry.mdx +++ b/docs/configuration/module/telemetry.mdx @@ -44,7 +44,9 @@ Default is `900` seconds (15 minutes). How often we should send Device Metrics over the mesh. -Default is `900` seconds (15 minutes). +Default is `900` seconds (15 minutes). + +Device Metrics to a connected client app will always be sent once per minute, regardless of this setting. ### Environment Screen Enabled diff --git a/docs/configuration/radio/device.mdx b/docs/configuration/radio/device.mdx index a2794b6a..5ba782b0 100644 --- a/docs/configuration/radio/device.mdx +++ b/docs/configuration/radio/device.mdx @@ -78,7 +78,7 @@ This is the GPIO pin number that will be used for the PWM buzzer, if your device ### Node Info Broadcast Seconds -This is the number of seconds between NodeInfo message broadcasts from the device. The device will still respond ad-hoc to NodeInfo messages when a response is wanted. +This is the number of seconds between NodeInfo message (containing i.a. long and short name) broadcasts from the device. The device will still respond ad-hoc to NodeInfo messages when a response is wanted. When the device hears any packet from a node it doesn't know yet, it will send its NodeInfo and ask for a response automatically. ### Double Tap as Button Press