Merge branch 'meshtastic:master' into master

website/README.md

@@ -24,10 +24,4 @@ yarn build
 
 This command generates static content into the `build` directory and can be served using any static contents hosting service.
 
-## Deployment
-
-```console
-GIT_USER=<Your GitHub username> USE_SSH=true yarn deploy
-```
-
-If you are using GitHub pages for hosting, this command is a convenient way to build the website and push to the `gh-pages` branch.
+[![Powered by Vercel](https://raw.githubusercontent.com/abumalick/powered-by-vercel/master/powered-by-vercel.svg)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)

website/docs/developers/device/radio-settings.md

@@ -60,8 +60,8 @@ We have four predefined channels. These are the most common settings and have be
 
 | Channel setting            | Alt Channel Name | Data-rate            | SF / Symbols | Coding Rate | Bandwidth | Link Budget |
 | :------------------------- | :--------------- | :------------------- | :----------- | :---------- | :-------- | :---------- |
-| Short range (but fast)     | Short Fast       | 21.875 kbps          | 7 / 128      | 4/5         | 125       | 134dB       |
-| Medium range (but fast)    | Medium           | 5.469 kbps           | 7 / 128      | 4/5         | 500       | 140dB       |
+| Short range (but fast)     | Short Fast       | 21.875 kbps          | 7 / 128      | 4/5         | 500       | 134dB       |
+| Medium range (but fast)    | Medium           | 5.469 kbps           | 7 / 128      | 4/5         | 125       | 140dB       |
 | Long range (but slower)    | Long Alt         | 0.275 kbps           | 9 / 512      | 4/8         | 31        | 153dB       |
 | Very long range (but slow) | Long Slow        | 0.183 kbps (default) | 12 / 4096    | 4/8         | 125       | 154dB       |
 

website/docs/hardware/techo.md

@@ -6,6 +6,14 @@ sidebar_label: LILYGO® T-Echo
 
 The T-Echo has been in development by LILYGO® over the past few months and has now been released.
 
+### See [Getting Started](../getting-started/flashing-nrf52)
+
+* firmware file: `firmware-t-echo-1.x.x.uf2`
+* [Purchase link](https://www.aliexpress.com/item/1005002842456390.html)
+* TTGO's [GitHub page](https://github.com/Xinyuan-LilyGO/LilyGO-T-Echo) for the T-Echo
+
+### Features
+
 * nRF52840 - Bluetooth BLE 5.0, NFC and very low power consumption
 * SX1262 - LoRa transceiver
 * 1.54" eInk display
@@ -16,8 +24,4 @@ The T-Echo has been in development by LILYGO® over the past few months and has
 * Optional case and battery
 
 
-* firmware file: `firmware-t-echo-1.x.x.uf2`
-* [Purchase link](https://www.aliexpress.com/item/1005003026107533.html)
-* TTGO's [GitHub page](https://github.com/Xinyuan-LilyGO/LilyGO-T-Echo) for the T-Echo
-
 <img alt="LILYGO T-Echo" src="/img/hardware/t-echo.png" style={{zoom: '15%'}} />

website/docusaurus.config.js

@@ -15,6 +15,14 @@ const config = {
     colorMode: {
       respectPrefersColorScheme: true,
     },
+    announcementBar: {
+      id: "play_store_workaround",
+      content:
+        'Android app unavailable in the Google Play Store store. Install by <a href="/docs/software/android/android-installation">side-loading</a> from <a href="https://github.com/meshtastic/Meshtastic-Android/releases">GitHub</a> or <a href="https://www.amazon.com/Geeksville-Industries-Meshtastic/dp/B08CY9394Q">Amazon</a>.',
+      backgroundColor: "#ff9999",
+      textColor: "#091E42",
+      isCloseable: true,
+    },
     navbar: {
       title: "Meshtastic",
       logo: {
@@ -111,7 +119,7 @@ const config = {
           ],
         },
       ],
-      copyright: `Meshtastic® trademark is a registered trademark belonging to Geeksville Industries LLC`,
+      copyright: `<a href="https://vercel.com/?utm_source=meshtastic&utm_campaign=oss" style="color: white">Powered by ▲ Vercel</a> | Meshtastic® trademark is a registered trademark belonging to Geeksville Industries LLC`,
     },
     algolia: {
       apiKey: "01ad7e13d3fe392d2ad26da3c69dbc21",
@@ -127,7 +135,6 @@ const config = {
       {
         docs: {
           sidebarPath: require.resolve("./sidebars.js"),
-          // Please change this to your repo.
           editUrl:
             "https://github.com/meshtastic/meshtastic/edit/master/website/",
         },

website/package.json

@@ -33,6 +33,7 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "^2.0.0-beta.8",
     "@tsconfig/docusaurus": "^1.0.4",
+    "@types/node": "^16.11.7",
     "typescript": "^4.4.4"
   }
 }