From 89444476b80ed82b1d4ecc54946f3b60f9ddefba Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <w.hottgenroth@krohne.com>
Date: Wed, 10 Feb 2021 16:20:32 +0100
Subject: [PATCH] drop location

---
 cube/User/Inc/config.h     |  3 +--
 cube/User/Inc/sinkStruct.h |  1 -
 cube/User/Src/config.c     |  2 --
 cube/User/Src/configCmds.c | 11 -----------
 cube/User/Src/counter.c    |  2 --
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/cube/User/Inc/config.h b/cube/User/Inc/config.h
index ce013b7..f2ec75a 100644
--- a/cube/User/Inc/config.h
+++ b/cube/User/Inc/config.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <sha256.h>
 
-#define CONFIG_MAGIC 0xdead0006
+#define CONFIG_MAGIC 0xdead0007
 
 typedef struct __attribute__((__packed__)) s_configBlock {
     uint32_t configMagic;
@@ -13,7 +13,6 @@ typedef struct __attribute__((__packed__)) s_configBlock {
     char ntpServer[48];
     char deviceId[16];
     char sharedSecret[SHA256_BLOCK_SIZE];
-    char location[48];
     char sinkServer[48];
     uint8_t filler[6];
 } t_configBlock;
diff --git a/cube/User/Inc/sinkStruct.h b/cube/User/Inc/sinkStruct.h
index 881ba6f..afe10df 100644
--- a/cube/User/Inc/sinkStruct.h
+++ b/cube/User/Inc/sinkStruct.h
@@ -13,7 +13,6 @@ typedef struct __attribute__((__packed__)) {
 #define SECONDS_PER_MINUTE 60
 typedef struct __attribute__((__packed__)) {
     char deviceId[sizeof(((t_configBlock*)0)->deviceId)];
-    char location[sizeof(((t_configBlock*)0)->location)];
     uint8_t hash[SHA256_BLOCK_SIZE];
     uint8_t done;
     t_event events[SECONDS_PER_MINUTE];
diff --git a/cube/User/Src/config.c b/cube/User/Src/config.c
index a8ea51d..4395dff 100644
--- a/cube/User/Src/config.c
+++ b/cube/User/Src/config.c
@@ -14,7 +14,6 @@ t_configBlock defaultConfigBlock = {
     .ntpServer = "0.de.pool.ntp.org",
     .deviceId = "MainsCnt01",
     .sharedSecret = "sharedSecretGanzGeheim",
-    .location = "Essen, DE",
     .sinkServer = "laborpc",
     .filler = { 0 }
 };
@@ -54,6 +53,5 @@ void configInit() {
     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);
-    coloredMsg(LOG_BLUE, "cfg ci location:            %s", mainConfigBlock.location);
     coloredMsg(LOG_BLUE, "cfg ci sink server:         %s", mainConfigBlock.sinkServer);
 }
diff --git a/cube/User/Src/configCmds.c b/cube/User/Src/configCmds.c
index 325683f..bf2c0c2 100644
--- a/cube/User/Src/configCmds.c
+++ b/cube/User/Src/configCmds.c
@@ -27,7 +27,6 @@ static bool showConfigCmd(uint8_t argc, char **args) {
     sendFormatString("NTP Server:          %s\n\r", configBlock.ntpServer);
     sendFormatString("deviceId:            %s\n\r", configBlock.deviceId);
     sendFormatString("sharedSecret:        (will not be displayed)\n\r");
-    sendFormatString("Location:            %s\n\r", configBlock.location);
 
     return retCode;
 }
@@ -102,12 +101,6 @@ static bool setSharedSecretCmd(uint8_t argc, char **args) {
                                  sizeof(((t_configBlock*)0)->sharedSecret));
 }
 
-static bool setLocationCmd(uint8_t argc, char **args) {
-    return setStringParameterCmd(argc, args, 
-                                 offsetof(t_configBlock, location), 
-                                 sizeof(((t_configBlock*)0)->location));
-}
-
 static bool setSinkServerCmd(uint8_t argc, char **args) {
     return setStringParameterCmd(argc, args, 
                                  offsetof(t_configBlock, sinkServer), 
@@ -132,10 +125,6 @@ const static cmd_t SET_COMMANDS[] = {
       .help = \
         "sharedsecret ......................... Shared secret\n\r"
     },
-    { .name = "location", .cmdFunc = setLocationCmd,
-      .help = \
-        "location ............................. Location of this device\n\r"
-    },
     { .name = "sinkserver", .cmdFunc = setSinkServerCmd,
       .help = \
         "sinkserver ........................... Name of the sink server\n\r"
diff --git a/cube/User/Src/counter.c b/cube/User/Src/counter.c
index 66ba3b5..8ef14d5 100644
--- a/cube/User/Src/counter.c
+++ b/cube/User/Src/counter.c
@@ -70,8 +70,6 @@ void counterMinuteTick(void *handle) {
             coloredMsg(LOG_BLUE, "cmt, buffer %d is done, handle it", minuteBufferIdx);
             memset(minuteBuffer->s.deviceId, 0, sizeof(minuteBuffer->s.deviceId));
             strcpy(minuteBuffer->s.deviceId, config->deviceId);
-            memset(minuteBuffer->s.location, 0, sizeof(minuteBuffer->s.location));
-            strcpy(minuteBuffer->s.location, config->location);
 
             memcpy(minuteBuffer->s.hash, config->sharedSecret, SHA256_BLOCK_SIZE);
             SHA256_CTX ctx;