From a26a2878f4f991a943f180a2248311447941ec92 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <w.hottgenroth@krohne.com>
Date: Fri, 27 Nov 2020 16:33:03 +0100
Subject: [PATCH] configuration
---
cube/User/Src/config.c | 38 ++++++++++++++++++++++++++------------
1 file changed, 26 insertions(+), 12 deletions(-)
diff --git a/cube/User/Src/config.c b/cube/User/Src/config.c
index d9a71b8..0480964 100644
--- a/cube/User/Src/config.c
+++ b/cube/User/Src/config.c
@@ -30,18 +30,32 @@ t_configBlock* getConfig() {
void configInit() {
- bool configIsInvalid = false;
- do {
- coloredMsg(LOG_BLUE, false, "cfg ci Reading configuration block from eeprom");
+ coloredMsg(LOG_BLUE, false, "cfg ci Reading configuration block from eeprom");
+ eepromReadConfigBlock(0, &mainConfigBlock);
+
+ if (mainConfigBlock.configMagic != CONFIG_MAGIC) {
+ coloredMsg(LOG_BLUE, false, "cfg ci Invalid configuration block read from eeprom");
+
+ eepromWriteConfigBlock(0, &defaultConfigBlock);
+ coloredMsg(LOG_BLUE, false, "cfg ci Default configuration block written to eeprom");
+
+ coloredMsg(LOG_BLUE, false, "cfg ci Reading configuration block from eeprom again");
eepromReadConfigBlock(0, &mainConfigBlock);
+ }
- if (mainConfigBlock.configMagic != CONFIG_MAGIC) {
- configIsInvalid = true;
-
- coloredMsg(LOG_BLUE, false, "cfg ci Invalid configuration block read from eeprom");
-
- eepromWriteConfigBlock(0, &defaultConfigBlock);
- coloredMsg(LOG_BLUE, false, "cfg ci Default configuration block written to eeprom");
- }
- } while (configIsInvalid);
+ coloredMsg(LOG_BLUE, false, "cfg ci configMagic: %lx", mainConfigBlock.configMagic);
+ coloredMsg(LOG_BLUE, false, "cfg ci deviceName: %s", mainConfigBlock.deviceName);
+ coloredMsg(LOG_BLUE, false, "cfg ci MAC address: %02x:%02x:%02x:%02x:%02x:%02x", mainConfigBlock.macAddress[0],
+ mainConfigBlock.macAddress[1],
+ mainConfigBlock.macAddress[2],
+ mainConfigBlock.macAddress[3],
+ mainConfigBlock.macAddress[4],
+ mainConfigBlock.macAddress[5]);
+ coloredMsg(LOG_BLUE, false, "cfg ci frontend threshold: %ld", mainConfigBlock.frontendThreshold);
+ coloredMsg(LOG_BLUE, false, "cfg ci broker: %s", mainConfigBlock.brokerName);
+ coloredMsg(LOG_BLUE, false, "cfg ci watchdogTopic: %s", mainConfigBlock.watchdogTopic);
+ coloredMsg(LOG_BLUE, false, "cfg ci startupTopic: %s", mainConfigBlock.startupTopic);
+ coloredMsg(LOG_BLUE, false, "cfg ci statusTopic: %s", mainConfigBlock.statusTopic);
+ coloredMsg(LOG_BLUE, false, "cfg ci mbusDataTopic: %s", mainConfigBlock.mbusDataTopic);
+ coloredMsg(LOG_BLUE, false, "cfg ci syslog server: %s", mainConfigBlock.syslogServerName);
}
\ No newline at end of file