diff --git a/docs/getting-started/flashing-firmware/esp32/index.mdx b/docs/getting-started/flashing-firmware/esp32/index.mdx index 4b48ea5c..f1353a13 100644 --- a/docs/getting-started/flashing-firmware/esp32/index.mdx +++ b/docs/getting-started/flashing-firmware/esp32/index.mdx @@ -12,6 +12,5 @@ The recommended method for firmware flashing is the [Web-Based Installer.](https ## Flashing Method for ESP32 Devices 1. The [Web-Based Installer](/docs/getting-started/flashing-firmware/esp32/web-flasher.mdx) requires either Chrome or Edge browsers but is an excellent choice for quickly flashing devices. **This method is highly recommended for firmware flashing, especially for new users of the project, as it is easy to use.** -2. The [Python Flasher](/docs/software/python/flasher) does a lot under the hood to prevent you from needing to use the terminal. -3. The [CLI Script](/docs/getting-started/flashing-firmware/esp32/cli-script) is considered the "manual process" for flashing firmware. -4. Flashing your device using an [external serial adapter](/docs/getting-started/flashing-firmware/esp32/external-serial-adapter) should only be attempted as a last resort if no other method has been successful. +2. The [CLI Script](/docs/getting-started/flashing-firmware/esp32/cli-script) is considered the "manual process" for flashing firmware. +3. Flashing your device using an [external serial adapter](/docs/getting-started/flashing-firmware/esp32/external-serial-adapter) should only be attempted as a last resort if no other method has been successful. diff --git a/docs/hardware/devices/heltec/buttons.mdx b/docs/hardware/devices/heltec/buttons.mdx index e98764b4..63c81562 100644 --- a/docs/hardware/devices/heltec/buttons.mdx +++ b/docs/hardware/devices/heltec/buttons.mdx @@ -2,7 +2,7 @@ id: buttons title: Hardware Buttons sidebar_label: Buttons -sidebar_position: 3 +sidebar_position: 1 --- ## Functionality diff --git a/docs/hardware/devices/heltec/enclosures.mdx b/docs/hardware/devices/heltec/enclosures.mdx index 03957997..967e748f 100644 --- a/docs/hardware/devices/heltec/enclosures.mdx +++ b/docs/hardware/devices/heltec/enclosures.mdx @@ -2,7 +2,7 @@ id: enclosures title: Enclosures sidebar_label: Enclosures -sidebar_position: 3 +sidebar_position: 2 --- import Tropho from "/img/enclosures/3dp-tropho-heltec32.png"; diff --git a/docs/hardware/devices/heltec/index.mdx b/docs/hardware/devices/heltec/index.mdx index b75a59ae..3acaecdd 100644 --- a/docs/hardware/devices/heltec/index.mdx +++ b/docs/hardware/devices/heltec/index.mdx @@ -145,9 +145,20 @@ Not recommended because of design issues! Support is being phased out. Use V3 in ## Features -- no display -- User and Reset switches -- No GPS +- No display. +- User and Reset switches. +- Additional GPIO availability. +- No GPS. + +### Meshtastic I2C Definitions +- SCL: GPIO47 +- SDA: GPIO48 + +### Pin Map + +![HTIT-WSL_V3_PIN_MAP](/img/hardware/HTIT-WSL_V3_PIN_MAP.png) + +Image Source: [Heltec](https://resource.heltec.cn/download/Wireless_Stick_Lite_V3/HTIT-WSL_V3.png) ## Resources diff --git a/docs/software/python-flasher.mdx b/docs/software/python-flasher.mdx index 980bb189..68a0ab99 100644 --- a/docs/software/python-flasher.mdx +++ b/docs/software/python-flasher.mdx @@ -10,6 +10,12 @@ import Tabs from "@theme/Tabs"; import TabItem from "@theme/TabItem"; import Link from "@docusaurus/Link"; +:::caution +This method is no longer supported. Please use a [supported method](/docs/getting-started/flashing-firmware). +::: + +*** + :::caution Make sure not to power the radio on without first attaching the antenna! You could damage the radio chip! ::: diff --git a/package.json b/package.json index 612d9788..759b3520 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "docusaurus": "docusaurus", "start": "docusaurus start", "build": "docusaurus build", + "swizzle": "docusaurus swizzle", "serve": "docusaurus serve", "clear": "docusaurus clear", "write-translations": "docusaurus write-translations", @@ -19,6 +20,7 @@ "@docusaurus/core": "2.4.0", "@docusaurus/plugin-content-docs": "2.4.0", "@docusaurus/preset-classic": "2.4.0", + "@docusaurus/theme-common": "^2.4.0", "@docusaurus/theme-mermaid": "^2.4.0", "@headlessui/react": "^1.7.14", "@heroicons/react": "^2.0.18", @@ -42,10 +44,10 @@ "@docusaurus/module-type-aliases": "2.4.0", "@tailwindcss/typography": "^0.5.9", "@tsconfig/docusaurus": "^1.0.7", - "@types/node": "^20.1.3", + "@types/node": "^20.1.4", "@types/react": "^18.2.6", "@types/react-dom": "^18.2.4", - "rome": "^12.0.0", + "rome": "^12.1.0", "typescript": "^5.0.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b48d3459..e8c40db8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,6 +16,9 @@ dependencies: '@docusaurus/preset-classic': specifier: 2.4.0 version: 2.4.0(@algolia/client-search@4.17.0)(@types/react@18.2.6)(react-dom@17.0.2)(react@17.0.2)(typescript@5.0.4) + '@docusaurus/theme-common': + specifier: ^2.4.0 + version: 2.4.0(@docusaurus/types@2.4.0)(react-dom@17.0.2)(react@17.0.2)(typescript@5.0.4) '@docusaurus/theme-mermaid': specifier: ^2.4.0 version: 2.4.0(react-dom@17.0.2)(react@17.0.2)(typescript@5.0.4) @@ -82,8 +85,8 @@ devDependencies: specifier: ^1.0.7 version: 1.0.7 '@types/node': - specifier: ^20.1.3 - version: 20.1.3 + specifier: ^20.1.4 + version: 20.1.4 '@types/react': specifier: ^18.2.6 version: 18.2.6 @@ -91,8 +94,8 @@ devDependencies: specifier: ^18.2.4 version: 18.2.4 rome: - specifier: ^12.0.0 - version: 12.0.0 + specifier: ^12.1.0 + version: 12.1.0 typescript: specifier: ^5.0.4 version: 5.0.4 @@ -2521,7 +2524,7 @@ packages: '@jest/schemas': 29.4.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.1.3 + '@types/node': 20.1.4 '@types/yargs': 17.0.24 chalk: 4.1.2 dev: false @@ -2697,48 +2700,48 @@ packages: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: false - /@rometools/cli-darwin-arm64@12.0.0: - resolution: {integrity: sha512-kEFCzU6cgy6vfY0mkMzq57ea3srqV5X2wyCAxjVfA2JF7fioq695uWhy7yOCBW+nUUFIz62N9v1nf/aYqX8XkA==} + /@rometools/cli-darwin-arm64@12.1.0: + resolution: {integrity: sha512-U9trIXqE+WVsPUQRE8vooh97jNcyC1cvhNO91Q31FfWgccfbiJbfiQzPewpQ1+UseyJIdpWFAYLs8VFykhAl3g==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /@rometools/cli-darwin-x64@12.0.0: - resolution: {integrity: sha512-YDevVPKrkRFdjjM/3zOpOWI5mEY2ivjKM2eR8Yqv9xH3SZhyD/t67f/xo7Azp6NkGUVXSnHLGdkmIg+qrYgz5A==} + /@rometools/cli-darwin-x64@12.1.0: + resolution: {integrity: sha512-ePyRJwprT+POsGue1gdqPYOHojXfDz/OJI18renU0NI2CHeeeMhnquu+MZJaiBGyBd1ezIgWZWiQ4DhLFOaCUg==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /@rometools/cli-linux-arm64@12.0.0: - resolution: {integrity: sha512-n2LJg6eAZENUcJF99wjDeqQCr/40IqGUJDbX7NwiU1RvCy+RBZNmhcmSAaKOc6rCoLUcM9W5q+H4jfn4bWfJBA==} + /@rometools/cli-linux-arm64@12.1.0: + resolution: {integrity: sha512-j/pF6pF+lKihw7CIvwQZqQG9gpaUy2FyO9+nu5dvCChblXNEaA2zMnpLnDlCue0B7xY0jZkk1EZdF49ztEZZFA==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rometools/cli-linux-x64@12.0.0: - resolution: {integrity: sha512-VuQO4eOrKmfrLrc8KzMaZypz3i1rD9FXRxwOFk6ha16DNHV+17dRQYm7jRZ1p+HrXdjAJYTScxR/E03yGLThlQ==} + /@rometools/cli-linux-x64@12.1.0: + resolution: {integrity: sha512-zh6tW0JumP/rQkFDdsg6FEDBv0ZPvPLFirfHqzJA8VDNRBHkOTq27oVCbTJIGyUCGm9VvIzG8sJFVKkYpxkl2g==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rometools/cli-win32-arm64@12.0.0: - resolution: {integrity: sha512-lvOh5/B8YuQdI2ieGJnJ6CUMZxvVwA8+1VDkEZJyl5IEF8AXzbXYx4k6SFA5a79cfXEL9tJuJy0rn+Zs/+1yJQ==} + /@rometools/cli-win32-arm64@12.1.0: + resolution: {integrity: sha512-ggug6gUWFnO2QK0KC5XsYRhuZ22jeLksebdHMnkaHzZBtxXnKMC7yXnYwU/Lg2fGAwmMsluIbaqFYgen4+c8RA==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /@rometools/cli-win32-x64@12.0.0: - resolution: {integrity: sha512-yTfz71k8+9QIDzglKnMbEMMv1JUk30qfeSomgEUG2v0qDSbSq0Gs1ff0H0dysYOHLvZZmWA3IheOY/SC8fj1nA==} + /@rometools/cli-win32-x64@12.1.0: + resolution: {integrity: sha512-TnurdnlzBwcvRSsgmNz9Gorffnjr5cS8TdHo9w+3pT4GdSsrLZqvd1IV2tj4uRKkNn6OJtSqW3tZ5SiTrf0LuA==} cpu: [x64] os: [win32] requiresBuild: true @@ -2959,26 +2962,26 @@ packages: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/bonjour@3.5.10: resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/connect-history-api-fallback@1.3.5: resolution: {integrity: sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==} dependencies: '@types/express-serve-static-core': 4.17.33 - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/eslint-scope@3.7.4: @@ -2999,7 +3002,7 @@ packages: /@types/express-serve-static-core@4.17.33: resolution: {integrity: sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 dev: false @@ -3029,7 +3032,7 @@ packages: /@types/http-proxy@1.17.10: resolution: {integrity: sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/istanbul-lib-coverage@2.0.4: @@ -3054,7 +3057,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/mdast@3.0.11: @@ -3071,8 +3074,8 @@ packages: resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} dev: false - /@types/node@20.1.3: - resolution: {integrity: sha512-NP2yfZpgmf2eDRPmgGq+fjGjSwFgYbihA8/gK+ey23qT9RkxsgNTZvGOEpXgzIGqesTYkElELLgtKoMQTys5vA==} + /@types/node@20.1.4: + resolution: {integrity: sha512-At4pvmIOki8yuwLtd7BNHl3CiWNbtclUbNtScGx4OHfBd4/oWoJC8KRCIxXwkdndzhxOsPXihrsOoydxBjlE9Q==} /@types/parse-json@4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} @@ -3129,7 +3132,7 @@ packages: /@types/responselike@1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/retry@0.12.0: @@ -3139,7 +3142,7 @@ packages: /@types/sax@1.2.4: resolution: {integrity: sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/scheduler@0.16.3: @@ -3155,13 +3158,13 @@ packages: resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==} dependencies: '@types/mime': 3.0.1 - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/sockjs@0.3.33: resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/unist@2.0.6: @@ -3171,7 +3174,7 @@ packages: /@types/ws@8.5.4: resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 dev: false /@types/yargs-parser@21.0.0: @@ -4997,7 +5000,7 @@ packages: resolution: {integrity: sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==} engines: {node: '>= 0.8'} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 require-like: 0.1.2 dev: false @@ -6069,7 +6072,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.5.0 - '@types/node': 20.1.3 + '@types/node': 20.1.4 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -6080,7 +6083,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -6088,7 +6091,7 @@ packages: resolution: {integrity: sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 20.1.3 + '@types/node': 20.1.4 jest-util: 29.5.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -7952,18 +7955,18 @@ packages: resolution: {integrity: sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g==} dev: false - /rome@12.0.0: - resolution: {integrity: sha512-w/tLvLj5PGUCx3R+Kna08BMq4zL83Xzh9spvrqoWa3Nkzk16SkD8JSpyWWP9WhI2r3qv3Xvc7FnYZ4QDnjAiYg==} + /rome@12.1.0: + resolution: {integrity: sha512-inIBYc2/Das6LDXcw8IQp7yeXth6Rhmj9y8sS/Y/0g5/29Lyzr785SjCmKyiN2No4MNsaP3YJNm2QZAs2UpR2w==} engines: {node: '>=14.*'} hasBin: true requiresBuild: true optionalDependencies: - '@rometools/cli-darwin-arm64': 12.0.0 - '@rometools/cli-darwin-x64': 12.0.0 - '@rometools/cli-linux-arm64': 12.0.0 - '@rometools/cli-linux-x64': 12.0.0 - '@rometools/cli-win32-arm64': 12.0.0 - '@rometools/cli-win32-x64': 12.0.0 + '@rometools/cli-darwin-arm64': 12.1.0 + '@rometools/cli-darwin-x64': 12.1.0 + '@rometools/cli-linux-arm64': 12.1.0 + '@rometools/cli-linux-x64': 12.1.0 + '@rometools/cli-win32-arm64': 12.1.0 + '@rometools/cli-win32-x64': 12.1.0 dev: true /rtl-detect@1.0.4: diff --git a/src/components/tools/FrequencyCalculator.tsx b/src/components/tools/FrequencyCalculator.tsx index 88f4efb8..d6cfda2e 100644 --- a/src/components/tools/FrequencyCalculator.tsx +++ b/src/components/tools/FrequencyCalculator.tsx @@ -318,7 +318,7 @@ export const FrequencyCalculator = (): JSX.Element => { > {Array.from(Array(numChannels).keys()).map((key) => ( ))} diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 2f30cb6c..807366dc 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -96,13 +96,24 @@ const SocialCards: SocialCardProps[] = [ ), }, { - color: "bg-[#ffffff]", + color: "bg-[#4A99E9]", link: "https://twitter.com/TheMeshtastic", children: ( twitter + ), + }, + { + color: "bg-[#3875EA]", + link: "https://facebook.com/themeshtastic", + children: ( + facebook ), }, diff --git a/src/theme/NotFound.d.ts b/src/theme/NotFound.d.ts new file mode 100644 index 00000000..ef9b4d9d --- /dev/null +++ b/src/theme/NotFound.d.ts @@ -0,0 +1,2 @@ +/// +export default function NotFound(): JSX.Element; diff --git a/src/theme/NotFound.js b/src/theme/NotFound.js new file mode 100644 index 00000000..830f16c4 --- /dev/null +++ b/src/theme/NotFound.js @@ -0,0 +1,33 @@ +import React from "react"; +import Translate, { translate } from "@docusaurus/Translate"; +import { PageMetadata } from "@docusaurus/theme-common"; +import Layout from "@theme/Layout"; +export default function NotFound() { + return ( + <> + + +
+
+
+

+ + 404 - Page Not Found + +

+ Chirpy +
+
+
+ + + ); +} diff --git a/static/design b/static/design index a5c2cbe9..2865a55d 160000 --- a/static/design +++ b/static/design @@ -1 +1 @@ -Subproject commit a5c2cbe93724ae32e101cae1edf9ae9dffbfe2ac +Subproject commit 2865a55d39dea5f6d9f2c09ac1ec485666a833da diff --git a/static/img/hardware/HTIT-WSL_V3_PIN_MAP.png b/static/img/hardware/HTIT-WSL_V3_PIN_MAP.png new file mode 100644 index 00000000..6d9d0997 Binary files /dev/null and b/static/img/hardware/HTIT-WSL_V3_PIN_MAP.png differ diff --git a/static/img/homepage/Twitter-Logo-White.svg b/static/img/homepage/Twitter-Logo-White.svg new file mode 100644 index 00000000..873f75d2 --- /dev/null +++ b/static/img/homepage/Twitter-Logo-White.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/img/homepage/Twitter-logo.svg b/static/img/homepage/Twitter-logo.svg deleted file mode 100644 index 2d7697b3..00000000 --- a/static/img/homepage/Twitter-logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/img/homepage/f_logo_RGB-White_1024.png b/static/img/homepage/f_logo_RGB-White_1024.png new file mode 100644 index 00000000..fb8b468a Binary files /dev/null and b/static/img/homepage/f_logo_RGB-White_1024.png differ