From 0b664b3f53211557805a4bc62f5bb06f74a685ec Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Wed, 13 Sep 2023 16:42:30 -0700 Subject: [PATCH 1/8] add iPad and mac to BLE --- docs/getting-started/initial-config.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started/initial-config.mdx b/docs/getting-started/initial-config.mdx index 140c7c0c..4ab135ad 100644 --- a/docs/getting-started/initial-config.mdx +++ b/docs/getting-started/initial-config.mdx @@ -34,7 +34,7 @@ values={[ - [Android App](/docs/category/android-app) - [Web Client](https://client.meshtastic.org) -- [iOS App](/docs/category/apple-apps) +- [iOS/iPadOS/macOS App](/docs/category/apple-apps) From 6dc70d44f82471fab4b268494630e8cc54d1b429 Mon Sep 17 00:00:00 2001 From: therealgglggl <108145879+therealgglggl@users.noreply.github.com> Date: Mon, 18 Sep 2023 11:40:13 -0700 Subject: [PATCH 2/8] Update radio-settings.mdx Added SF acronym at first use --- docs/about/overview/radio-settings.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/about/overview/radio-settings.mdx b/docs/about/overview/radio-settings.mdx index 62478b5d..04663267 100644 --- a/docs/about/overview/radio-settings.mdx +++ b/docs/about/overview/radio-settings.mdx @@ -54,7 +54,7 @@ There are 104 channels defined with the standard radio preset `LongFast`. After Various data-rate options are available when configuring a channel and are inversely proportional to the theoretical range of the devices. -- **Spreading Factor** - How much we "spread" our data over time. +- **Spreading Factor (SF)** - How much we "spread" our data over time. - Each step up in Spreading Factor doubles the airtime to transmit. - Each step up in Spreading Factor adds about 2.5db extra link budget. - **Bandwidth** - How big of a slice of the spectrum we use. @@ -113,4 +113,4 @@ These channel settings may not have been tested. Use at your own discretion. Sha ## Cryptography -The pre-shared key (PSK) used by the devices can be an AES128 or AES256 sequence. Alternatively, encryption can be turned off, which may be useful if you are operating under a Ham Radio license. \ No newline at end of file +The pre-shared key (PSK) used by the devices can be an AES128 or AES256 sequence. Alternatively, encryption can be turned off, which may be useful if you are operating under a Ham Radio license. From 98b77a31b805000ad27a8197643bc8333dc5ec19 Mon Sep 17 00:00:00 2001 From: Ben Lipsey <117498748+pdxlocations@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:33:16 -0700 Subject: [PATCH 3/8] Update drag-n-drop.mdx remove v --- docs/getting-started/flashing-firmware/nrf52/drag-n-drop.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started/flashing-firmware/nrf52/drag-n-drop.mdx b/docs/getting-started/flashing-firmware/nrf52/drag-n-drop.mdx index 9d0b47b5..ce6f4af5 100644 --- a/docs/getting-started/flashing-firmware/nrf52/drag-n-drop.mdx +++ b/docs/getting-started/flashing-firmware/nrf52/drag-n-drop.mdx @@ -17,7 +17,7 @@ Download and unzip the latest firmware from [Meshtastic Downloads](https://mesht 2. Double click the reset button on your device (this will put it into bootloader mode) 3. Notice a new drive will be mounted on your computer (Windows, Mac, or Linux) 4. Open this drive and you should see three files: `CURRENT.UF2`, `INDEX.HTM`, and `INFO_UF2.TXT` -5. Drop the appropriate firmware file (`firmware-DEVICE_NAME-vx.x.x-xxxxxxx.uf2`) from the release onto this drive. +5. Drop the appropriate firmware file (`firmware-DEVICE_NAME-x.x.x-xxxxxxx.uf2`) from the release onto this drive. Once the file has finished copying onto the drive, the device will reboot and install the Meshtastic firmware. From e9d4d697e8411b07dd7219ddc3fe9c9ebcd98f86 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Mon, 18 Sep 2023 22:05:17 -0700 Subject: [PATCH 4/8] call markdown class --- src/components/BaseCSS.tsx | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/components/BaseCSS.tsx diff --git a/src/components/BaseCSS.tsx b/src/components/BaseCSS.tsx new file mode 100644 index 00000000..7d58b8c5 --- /dev/null +++ b/src/components/BaseCSS.tsx @@ -0,0 +1,8 @@ +// class .markdown needs to be called or it is removed from the build +import React from "react"; + +const BaseCSS = () => { + return
Shid Fard
; +}; + +export default BaseCSS; \ No newline at end of file From c35dffa6635d29e47aef58b87dec67aa190f1b9d Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Mon, 18 Sep 2023 22:07:52 -0700 Subject: [PATCH 5/8] trunk --- src/components/BaseCSS.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BaseCSS.tsx b/src/components/BaseCSS.tsx index 7d58b8c5..ca0d70e5 100644 --- a/src/components/BaseCSS.tsx +++ b/src/components/BaseCSS.tsx @@ -5,4 +5,4 @@ const BaseCSS = () => { return
Shid Fard
; }; -export default BaseCSS; \ No newline at end of file +export default BaseCSS; From 72ec9f4a114b39deeb24efd39780e6b8ac21fe00 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Tue, 19 Sep 2023 21:40:54 -0700 Subject: [PATCH 6/8] move rak gpio to 4631 page --- .vscode/settings.json | 2 +- docs/configuration/gpio-peripherals.mdx | 2 +- docs/configuration/rak-gpio-mapping.mdx | 36 ---------------------- docs/configuration/remote-admin.mdx | 2 +- docs/hardware/devices/rak/core-modules.mdx | 31 +++++++++++++++++++ 5 files changed, 34 insertions(+), 39 deletions(-) delete mode 100644 docs/configuration/rak-gpio-mapping.mdx diff --git a/.vscode/settings.json b/.vscode/settings.json index ab8c7272..955fce3e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "editor.formatOnSave": true, "editor.defaultFormatter": "trunk.io", "files.associations": { - "*.mdx": "markdown" + "*.yaml": "home-assistant" }, "[typescriptreact]": { "editor.defaultFormatter": "rome.rome" diff --git a/docs/configuration/gpio-peripherals.mdx b/docs/configuration/gpio-peripherals.mdx index e66e0446..ea8c5730 100644 --- a/docs/configuration/gpio-peripherals.mdx +++ b/docs/configuration/gpio-peripherals.mdx @@ -3,7 +3,7 @@ id: gpio-peripherals title: Configuring GPIO Peripherals sidebar_label: Setup GPIO Peripherals slug: /hardware/peripheral/ -sidebar_position: 6 +sidebar_position: 4 --- ## Remote Hardware diff --git a/docs/configuration/rak-gpio-mapping.mdx b/docs/configuration/rak-gpio-mapping.mdx deleted file mode 100644 index 8cbc0337..00000000 --- a/docs/configuration/rak-gpio-mapping.mdx +++ /dev/null @@ -1,36 +0,0 @@ ---- -id: rak-gpio-mapping -title: RAK GPIO Pin Mapping -sidebar_label: RAK GPIO Mapping -sidebar_position: 5 ---- - -## RAK GPIO Pin Mapping - -The RAK4631 uses symbolic labels for its I/O Pins on the module and baseboard silk screens. The following table shows the mapping of the RAK4631 GPIO pins to the corresponding Arduino pins and the MCU Port numbers. - -| RAK Pin | nRF52840 Pin | Arduino GPIO | Remark | -| ------- | ------------ | ------------ | ------------------------------------------------------------------------ | -| IO1 | P0.17 | 17 | used for GPS PPM signal if GPS module is connected | -| IO2 | P1.02 | 34 | used to power all peripheral modules, not available for user application | -| IO3 | P0.21 | 21 | -| IO4 | P0.04 | 4 | -| IO5 | P0.09 | 9 | The 'User Button' is mapped here. | -| IO6 | P0.10 | 10 | -| IO7 | P0.28 | 28 | -| SW1 | P0.01 | 1 | -| A0 | P0.04/AIN2 | A2 | -| A1 | P0.31/AIN7 | A7 | -| SPI_CS | P0.26 | 26 | - -When configuring GPIO pins in your device settings, the Arduino GPIO numbers should be used. - -```shell title="Example" -meshtastic --set external_notification.output 10 -``` - -This will use IO6 on a RAK4631 - -:::caution Note -There is no usable GPIO pin on any RAK base board except the 'big' baseboard RAK19001 without adding a RAK13002 IO module or a third party IO sensor breakout. -::: diff --git a/docs/configuration/remote-admin.mdx b/docs/configuration/remote-admin.mdx index f498d6e0..866bb4e9 100644 --- a/docs/configuration/remote-admin.mdx +++ b/docs/configuration/remote-admin.mdx @@ -2,7 +2,7 @@ id: remote-admin title: Remote Node Administration sidebar_label: Remote Nodes -sidebar_position: 4 +sidebar_position: 3 --- :::caution Disclaimer diff --git a/docs/hardware/devices/rak/core-modules.mdx b/docs/hardware/devices/rak/core-modules.mdx index 5c720622..6294bd46 100644 --- a/docs/hardware/devices/rak/core-modules.mdx +++ b/docs/hardware/devices/rak/core-modules.mdx @@ -60,6 +60,37 @@ Please be aware of the difference between the RAK4631 (Arduino bootloader) and t style={{ zoom: "50%" }} /> + +### GPIO + +:::caution Note +There is no usable GPIO pin on any RAK base board except the 'big' baseboard RAK19001 without adding a RAK13002 IO module or a third party IO sensor breakout. +::: + +The RAK4631 uses symbolic labels for its I/O Pins on the module and baseboard silk screens. The following table shows the mapping of the RAK4631 GPIO pins to the corresponding Arduino pins and the MCU Port numbers. + +| RAK Pin | nRF52840 Pin | Arduino GPIO | Remark | +| ------- | ------------ | ------------ | ------------------------------------------------------------------------ | +| IO1 | P0.17 | 17 | used for GPS PPM signal if GPS module is connected | +| IO2 | P1.02 | 34 | used to power all peripheral modules, not available for user application | +| IO3 | P0.21 | 21 | +| IO4 | P0.04 | 4 | +| IO5 | P0.09 | 9 | The 'User Button' is mapped here. | +| IO6 | P0.10 | 10 | +| IO7 | P0.28 | 28 | +| SW1 | P0.01 | 1 | +| A0 | P0.04/AIN2 | A2 | +| A1 | P0.31/AIN7 | A7 | +| SPI_CS | P0.26 | 26 | + +When configuring GPIO pins in your device settings, the Arduino GPIO numbers should be used. + +```shell title="Example" +meshtastic --set external_notification.output 10 +``` + +This will use IO6 on a RAK4631 + From bda010daf8b526b9dc2600b54774fcaa64001e65 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Tue, 19 Sep 2023 21:46:49 -0700 Subject: [PATCH 7/8] how'd that happen? --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 955fce3e..ab8c7272 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "editor.formatOnSave": true, "editor.defaultFormatter": "trunk.io", "files.associations": { - "*.yaml": "home-assistant" + "*.mdx": "markdown" }, "[typescriptreact]": { "editor.defaultFormatter": "rome.rome" From a03b48ac8827b344f8ecc93d214a9c85446de4cb Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Tue, 19 Sep 2023 21:54:59 -0700 Subject: [PATCH 8/8] update IO1 and IO2 --- docs/hardware/devices/rak/core-modules.mdx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/hardware/devices/rak/core-modules.mdx b/docs/hardware/devices/rak/core-modules.mdx index 6294bd46..00f24dfd 100644 --- a/docs/hardware/devices/rak/core-modules.mdx +++ b/docs/hardware/devices/rak/core-modules.mdx @@ -69,13 +69,13 @@ There is no usable GPIO pin on any RAK base board except the 'big' baseboard RAK The RAK4631 uses symbolic labels for its I/O Pins on the module and baseboard silk screens. The following table shows the mapping of the RAK4631 GPIO pins to the corresponding Arduino pins and the MCU Port numbers. -| RAK Pin | nRF52840 Pin | Arduino GPIO | Remark | -| ------- | ------------ | ------------ | ------------------------------------------------------------------------ | -| IO1 | P0.17 | 17 | used for GPS PPM signal if GPS module is connected | -| IO2 | P1.02 | 34 | used to power all peripheral modules, not available for user application | +| RAK Pin | nRF52840 Pin | Arduino GPIO | Remark | +| ------- | ------------ | ------------ | ----------------------------------------------------------------------------------------------------- | +| IO1 | P0.17 | 17 | used to toggle power to peripheral modules using 3v3_S power rail, not available for user application | +| IO2 | P1.02 | 34 | used to power all peripheral modules, not available for user application | | IO3 | P0.21 | 21 | | IO4 | P0.04 | 4 | -| IO5 | P0.09 | 9 | The 'User Button' is mapped here. | +| IO5 | P0.09 | 9 | The 'User Button' is mapped here. | | IO6 | P0.10 | 10 | | IO7 | P0.28 | 28 | | SW1 | P0.01 | 1 |