From da6f1b8281e19188cf7515487436039bbb142c64 Mon Sep 17 00:00:00 2001
From: Jono Targett <jono.targett@gmail.com>
Date: Tue, 17 Mar 2026 22:46:13 +1030
Subject: [PATCH] Added form defaults

---
 console/src/components/dashboard/CommandsWidget.vue | 6 ++++++
 handler.py                                          | 2 +-
 ubxhandler.py                                       | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/console/src/components/dashboard/CommandsWidget.vue b/console/src/components/dashboard/CommandsWidget.vue
index 336bd4a..f33f855 100644
--- a/console/src/components/dashboard/CommandsWidget.vue
+++ b/console/src/components/dashboard/CommandsWidget.vue
@@ -9,6 +9,7 @@ import AccordionContent from 'primevue/accordioncontent';
 import Dialog from 'primevue/dialog'
 
 import { JsonForms } from "@jsonforms/vue";
+import { createAjv } from '@jsonforms/core'
 import { primeVueRenderers } from 'jsonforms-primevue'
 
 import { useToast } from 'primevue/usetoast'
@@ -31,6 +32,10 @@ const commands = ref([])
 const commandMap = reactive({})
 const commandByResponseId = reactive({})
 
+const defaultsAjv = createAjv({ useDefaults: true })
+// Suppress Ajv unknown format warning by registering a no-op validator for "textarea"
+defaultsAjv.addFormat('textarea', true)
+
 function rebuildList() {
   commands.value = Object.values(commandMap)
 }
@@ -184,6 +189,7 @@ const jsonFormsConfig = {
                     :renderers="renderers"
                     :config="jsonFormsConfig"
                     :onChange="({ data, errors }) => cmd.input = data"
+                    :ajv="defaultsAjv"
                 />
 
                 <!-- Right: Buttons -->
diff --git a/handler.py b/handler.py
index 2eb0bd0..5712c75 100644
--- a/handler.py
+++ b/handler.py
@@ -34,9 +34,9 @@ class MQTTHandler:
         self.mqtt_config = mqtt_config
 
         self.topic_base = f"device/{handler_id}"
-        self.status_topic = f"{self.topic_base}/status"
         self.command_topic = f"{self.topic_base}/command"
         self.property_topic = f"{self.topic_base}/property"
+        self.status_topic = f"{self.property_topic}/status"
 
         self._shutdown_event = asyncio.Event()
         will = aiomqtt.Will(
diff --git a/ubxhandler.py b/ubxhandler.py
index 32b17cc..a83a030 100644
--- a/ubxhandler.py
+++ b/ubxhandler.py
@@ -106,6 +106,7 @@ class UBXHandler(MQTTHandler):
                         460800,
                         921600,
                     ],
+                    "default": 9600
                 },
             },
             "required": ["portID", "baudRate"],
@@ -133,12 +134,14 @@ class UBXHandler(MQTTHandler):
                     "minimum": 50,
                     "maximum": 60000,
                     "description": "Measurement period in milliseconds",
+                    "default": 1000,
                 },
                 "navRate": {
                     "type": "integer",
                     "minimum": 1,
                     "maximum": 127,
                     "description": "Number of measurement cycles per navigation solution",
+                    "default": 1
                 },
                 "timeRef": {
                     "type": "integer",