Merge pull request #244 from Hunter275/issues-242-243-dropdown-and-wa…

…rning update MQTT precision dropdown and encryption warning
meshtastic · Jun 18, 2024 · 69f67e3 · 69f67e3
2 parents 6d6149e + 4143249
commit 69f67e3
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/components/PageComponents/ModuleConfig/MQTT.tsx b/src/components/PageComponents/ModuleConfig/MQTT.tsx
@@ -4,7 +4,7 @@ import { DynamicForm } from "@components/Form/DynamicForm.js";
 import { Protobuf } from "@meshtastic/js";
 
 export const MQTT = (): JSX.Element => {
-  const { moduleConfig, setWorkingModuleConfig } = useDevice();
+  const { config, moduleConfig, setWorkingModuleConfig } = useDevice();
 
   const onSubmit = (data: MqttValidation) => {
     setWorkingModuleConfig(
@@ -70,7 +70,7 @@ export const MQTT = (): JSX.Element => {
               type: "toggle",
               name: "encryptionEnabled",
               label: "Encryption Enabled",
-              description: "Enable or disable MQTT encryption",
+              description: "Enable or disable MQTT encryption. Note: All messages are sent to the MQTT broker unencrypted if this option is not enabled, even when your uplink channels have encryption keys set. This includes position data.",
               disabledBy: [
                 {
                   fieldName: "enabled",
@@ -151,10 +151,16 @@ export const MQTT = (): JSX.Element => {
               ],
             },
             {
-              type: "number",
+              type: "select",
               name: "mapReportSettings.positionPrecision",
-              label: "Position Precision",
-              description: "Precision of the position",
+              label: "Approximate Location",
+              description:
+                "Position shared will be accurate within this distance",
+              properties: {
+                enumValue: config.display?.units == 0 ?
+                { "Within 23 km":10, "Within 12 km":11, "Within 5.8 km":12, "Within 2.9 km":13, "Within 1.5 km":14, "Within 700 m":15, "Within 350 m":16, "Within 200 m":17, "Within 90 m":18, "Within 50 m":19 } :
+                { "Within 15 miles":10, "Within 7.3 miles":11, "Within 3.6 miles":12, "Within 1.8 miles":13, "Within 0.9 miles":14, "Within 0.5 miles":15, "Within 0.2 miles":16, "Within 600 feet":17, "Within 300 feet":18, "Within 150 feet":19 }
+              },
               disabledBy: [
                 {
                   fieldName: "enabled",