From a2a484fcc5fc57672dcf80a774f5040ca044f79b Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <w.hottgenroth@krohne.com>
Date: Tue, 16 Feb 2021 12:27:12 +0100
Subject: [PATCH] network specific configuration

---
 cube/User/Inc/config.h    |  4 +++-
 cube/User/Src/config.c    | 12 ++++++------
 cube/User/Src/wizHelper.c |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cube/User/Inc/config.h b/cube/User/Inc/config.h
index 33a9a83..51f1682 100644
--- a/cube/User/Inc/config.h
+++ b/cube/User/Inc/config.h
@@ -13,7 +13,9 @@ typedef struct __attribute__((__packed__)) s_configBlock {
     char deviceId[16];
     char sharedSecret[SHA256_BLOCK_SIZE];
     char sinkServer[48];
-    uint8_t macAddress[6];
+    union networkspecific {
+        uint8_t macAddress[6];
+    };
     uint8_t filler[22];
 } t_configBlock;
 
diff --git a/cube/User/Src/config.c b/cube/User/Src/config.c
index 4395dff..e3fa426 100644
--- a/cube/User/Src/config.c
+++ b/cube/User/Src/config.c
@@ -44,12 +44,12 @@ void configInit() {
     }
     coloredMsg(LOG_BLUE, "cfg ci configMagic:         %lx", mainConfigBlock.configMagic);
     coloredMsg(LOG_BLUE, "cfg ci deviceName:          %s", mainConfigBlock.deviceName);
-    coloredMsg(LOG_BLUE, "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, "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, "cfg ci ntp server:          %s", mainConfigBlock.ntpServer);
     coloredMsg(LOG_BLUE, "cfg ci deviceId:            %s", mainConfigBlock.deviceId);
     coloredMsg(LOG_BLUE, "cfg ci sharedSecret:        %s", mainConfigBlock.sharedSecret);
diff --git a/cube/User/Src/wizHelper.c b/cube/User/Src/wizHelper.c
index d671d91..2707344 100644
--- a/cube/User/Src/wizHelper.c
+++ b/cube/User/Src/wizHelper.c
@@ -211,7 +211,7 @@ static void wizPhyLinkHandler(void *handle) {
 int wizInit() {
     config = getConfig();
     netInfo.dhcp = NETINFO_DHCP;
-    memcpy(netInfo.mac, config->macAddress, 6);
+    memcpy(netInfo.mac, config->networkspecific.macAddress, 6);
 
     coloredMsg(LOG_BLUE, "wizI, resetting Ethernet module");
     wizReset(true);