From 77141319ea826cfc2803bdc5f017d10240d107df Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <w.hottgenroth@krohne.com>
Date: Mon, 30 Nov 2020 19:01:53 +0100
Subject: [PATCH] device configuration prepared
---
cube/User/Inc/config.h | 2 +-
cube/User/Src/config.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cube/User/Inc/config.h b/cube/User/Inc/config.h
index 3671119..a59ffda 100644
--- a/cube/User/Inc/config.h
+++ b/cube/User/Inc/config.h
@@ -5,7 +5,7 @@
#include <spi.h>
#include <assert.h>
-#define CONFIG_MAGIC 0xdead0007
+#define CONFIG_MAGIC 0xdead0008
#define DEVICE_MAGIC 0xaffe0000
typedef struct __attribute__((__packed__)) s_configBlock {
diff --git a/cube/User/Src/config.c b/cube/User/Src/config.c
index f718dec..33abccf 100644
--- a/cube/User/Src/config.c
+++ b/cube/User/Src/config.c
@@ -8,6 +8,7 @@
+#define NUM_OF_DEFAULT_DEVICES 8
t_deviceBlock defaultDeviceBlock[] = {
{
.deviceMagic = DEVICE_MAGIC,
@@ -87,7 +88,7 @@ t_configBlock defaultConfigBlock = {
.statusTopic = "IoT/MBGW3/Status",
.mbusDataTopic = "IoT/MBGW3/Measurement",
.syslogServerName = "syslogserver",
- .numOfDeviceBlocks = sizeof(defaultConfigBlock) / sizeof(t_deviceBlock),
+ .numOfDeviceBlocks = NUM_OF_DEFAULT_DEVICES,
.filler = { 0 }
};
@@ -112,7 +113,7 @@ void configInit() {
eepromWriteConfigBlock(&defaultConfigBlock);
coloredMsg(LOG_BLUE, false, "cfg ci Default configuration block written to eeprom");
- for (uint8_t i = 0; i < sizeof(defaultConfigBlock) / sizeof(t_deviceBlock); i++) {
+ for (uint8_t i = 0; i < NUM_OF_DEFAULT_DEVICES; i++) {
eepromWriteDeviceBlock(i, &defaultDeviceBlock[i]);
}
coloredMsg(LOG_BLUE, false, "cfg ci Default device blocks written to eeprom");