From f4cc98922a1a012da06ec80a2cc0b800f74330a4 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Wed, 24 Jan 2024 21:30:50 -0800 Subject: [PATCH 1/2] move mqtt to integrations --- docs/software/integrations/index.mdx | 4 +++- docs/software/{ => integrations}/mqtt/adafruit-io.mdx | 0 .../{ => integrations}/mqtt/home-assistant.mdx | 0 docs/software/{ => integrations}/mqtt/index.mdx | 10 +++++----- docs/software/{ => integrations}/mqtt/mosquitto.mdx | 0 docs/software/{ => integrations}/mqtt/nodered.mdx | 0 docs/software/{ => integrations}/mqtt/python.mdx | 0 docs/software/linux-native.mdx | 2 +- vercel.json | 8 ++++++++ 9 files changed, 17 insertions(+), 7 deletions(-) rename docs/software/{ => integrations}/mqtt/adafruit-io.mdx (100%) rename docs/software/{ => integrations}/mqtt/home-assistant.mdx (100%) rename docs/software/{ => integrations}/mqtt/index.mdx (95%) rename docs/software/{ => integrations}/mqtt/mosquitto.mdx (100%) rename docs/software/{ => integrations}/mqtt/nodered.mdx (100%) rename docs/software/{ => integrations}/mqtt/python.mdx (100%) diff --git a/docs/software/integrations/index.mdx b/docs/software/integrations/index.mdx index 58bd9a65..3b01a150 100644 --- a/docs/software/integrations/index.mdx +++ b/docs/software/integrations/index.mdx @@ -2,7 +2,7 @@ title: Meshtastic Integrations slug: /software/integrations sidebar_label: Integrations -sidebar_position: 11 +sidebar_position: 6 --- The Meshtastic ecosystem is highly extensible and allows easy integration with a number of existing software products and projects. @@ -13,4 +13,6 @@ Current Meshtastic integrations: - [ATAK Plugin](/docs/software/integrations/integrations-atak-plugin) - Official Meshtastic ATAK Plugin for sending CoT to IMeshService in the Meshtastic Android app. +- [MQTT](/docs/software/integrations/mqtt) - Bridging mesh networks over the internet and integrating Meshtastic protocols with popular technologies such as Mome Assistant, Node Red, and Adafruit IO. + Support for the integrated products should be sought from their respective authors or vendors. diff --git a/docs/software/mqtt/adafruit-io.mdx b/docs/software/integrations/mqtt/adafruit-io.mdx similarity index 100% rename from docs/software/mqtt/adafruit-io.mdx rename to docs/software/integrations/mqtt/adafruit-io.mdx diff --git a/docs/software/mqtt/home-assistant.mdx b/docs/software/integrations/mqtt/home-assistant.mdx similarity index 100% rename from docs/software/mqtt/home-assistant.mdx rename to docs/software/integrations/mqtt/home-assistant.mdx diff --git a/docs/software/mqtt/index.mdx b/docs/software/integrations/mqtt/index.mdx similarity index 95% rename from docs/software/mqtt/index.mdx rename to docs/software/integrations/mqtt/index.mdx index 99a5cf35..8176e872 100644 --- a/docs/software/mqtt/index.mdx +++ b/docs/software/integrations/mqtt/index.mdx @@ -139,12 +139,12 @@ An existing public [MQTT broker](https://mosquitto.org) will be the default for ## Examples -- [Using mosquitto on a mac](/docs/software/mqtt/mosquitto.mdx) +- [Using mosquitto on a mac](/docs/software/integrations/mqtt/mosquitto.mdx) -- [Sending/receiving messages on mosquitto server using python](/docs/software/mqtt/python.mdx) +- [Sending/receiving messages on mosquitto server using python](/docs/software/integrations/mqtt/python.mdx) -- [Using MQTT with Node-RED](/docs/software/mqtt/nodered.mdx) +- [Using MQTT with Node-RED](/docs/software/integrations/mqtt/nodered.mdx) -- [Using MQTT with Home Assistant](/docs/software/mqtt/home-assistant.mdx) +- [Using MQTT with Home Assistant](/docs/software/integrations/mqtt/home-assistant.mdx) -- [Using MQTT with Adafruit IO](/docs/software/mqtt/adafruit-io.mdx) \ No newline at end of file +- [Using MQTT with Adafruit IO](/docs/software/integrations/mqtt/adafruit-io.mdx) \ No newline at end of file diff --git a/docs/software/mqtt/mosquitto.mdx b/docs/software/integrations/mqtt/mosquitto.mdx similarity index 100% rename from docs/software/mqtt/mosquitto.mdx rename to docs/software/integrations/mqtt/mosquitto.mdx diff --git a/docs/software/mqtt/nodered.mdx b/docs/software/integrations/mqtt/nodered.mdx similarity index 100% rename from docs/software/mqtt/nodered.mdx rename to docs/software/integrations/mqtt/nodered.mdx diff --git a/docs/software/mqtt/python.mdx b/docs/software/integrations/mqtt/python.mdx similarity index 100% rename from docs/software/mqtt/python.mdx rename to docs/software/integrations/mqtt/python.mdx diff --git a/docs/software/linux-native.mdx b/docs/software/linux-native.mdx index d26ae683..d0e7a86c 100644 --- a/docs/software/linux-native.mdx +++ b/docs/software/linux-native.mdx @@ -2,7 +2,7 @@ id: linux-native title: Linux Native Application sidebar_label: Linux Native -sidebar_position: 9 +sidebar_position: 5 --- The device software can also run on a native Linux machine thanks to the [Portduino framework](https://github.com/geeksville/framework-portduino). diff --git a/vercel.json b/vercel.json index 46eb51ab..b6b95c2d 100644 --- a/vercel.json +++ b/vercel.json @@ -71,6 +71,14 @@ { "source": "/docs/legal/licensing/", "destination": "/docs/legal/licensing-and-trademark" + }, + { + "source": "/docs/software/mqtt", + "destination": "/docs/software/integrations/mqtt" + }, + { + "source": "/docs/software/mqtt/", + "destination": "/docs/software/integrations/mqtt" } ] } \ No newline at end of file From 8f3df7e44250a0e9d7068e554adabdb4e8a2d403 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Thu, 1 Feb 2024 08:16:41 -0800 Subject: [PATCH 2/2] conflict resolution --- docs/software/integrations/index.mdx | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/software/integrations/index.mdx b/docs/software/integrations/index.mdx index 3b01a150..567221d0 100644 --- a/docs/software/integrations/index.mdx +++ b/docs/software/integrations/index.mdx @@ -13,6 +13,4 @@ Current Meshtastic integrations: - [ATAK Plugin](/docs/software/integrations/integrations-atak-plugin) - Official Meshtastic ATAK Plugin for sending CoT to IMeshService in the Meshtastic Android app. -- [MQTT](/docs/software/integrations/mqtt) - Bridging mesh networks over the internet and integrating Meshtastic protocols with popular technologies such as Mome Assistant, Node Red, and Adafruit IO. - Support for the integrated products should be sought from their respective authors or vendors.