From 6a2646b93caae30bae06e87541f492be6a6594a2 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <w.hottgenroth@krohne.com>
Date: Mon, 30 Nov 2020 18:57:19 +0100
Subject: [PATCH] device configuration prepared

---
 cube/User/Src/config.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/cube/User/Src/config.c b/cube/User/Src/config.c
index ab556cd..f718dec 100644
--- a/cube/User/Src/config.c
+++ b/cube/User/Src/config.c
@@ -7,20 +7,6 @@
 #include <mbusComm.h>
 
 
-t_configBlock defaultConfigBlock = {
-    .configMagic = CONFIG_MAGIC,
-    .deviceName = "MBGW3",
-    .macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0D },
-    .frontendThreshold = 240,
-    .brokerName = "mqttbroker",
-    .watchdogTopic = "IoT/Watchdog",
-    .startupTopic = "IoT/MBGW3/Startup",
-    .statusTopic = "IoT/MBGW3/Status",
-    .mbusDataTopic = "IoT/MBGW3/Measurement",
-    .syslogServerName = "syslogserver",
-    .numOfDeviceBlocks = 2,
-    .filler = { 0 }
-};
 
 t_deviceBlock defaultDeviceBlock[] = {
     {
@@ -89,6 +75,24 @@ t_deviceBlock defaultDeviceBlock[] = {
     }
 };
 
+
+t_configBlock defaultConfigBlock = {
+    .configMagic = CONFIG_MAGIC,
+    .deviceName = "MBGW3",
+    .macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0D },
+    .frontendThreshold = 240,
+    .brokerName = "mqttbroker",
+    .watchdogTopic = "IoT/Watchdog",
+    .startupTopic = "IoT/MBGW3/Startup",
+    .statusTopic = "IoT/MBGW3/Status",
+    .mbusDataTopic = "IoT/MBGW3/Measurement",
+    .syslogServerName = "syslogserver",
+    .numOfDeviceBlocks = sizeof(defaultConfigBlock) / sizeof(t_deviceBlock),
+    .filler = { 0 }
+};
+
+
+
 t_configBlock mainConfigBlock;