merged

cube/User/Inc/config.h

@@ -13,8 +13,21 @@ typedef struct __attribute__((__packed__)) s_configBlock {
     char deviceId[16];
     char sharedSecret[SHA256_BLOCK_SIZE];
     char sinkServer[48];
+<<<<<<< HEAD
     uint8_t macAddress[6];
     uint8_t filler[22];
+=======
+    union {
+        struct {
+            uint8_t macAddress[6];
+        } lan;
+        struct {
+            char ssid[48];
+            char key[65];     // the actual key may have up to 64 chars and has to end with a \0
+        } wifi;
+    } networkspecific;
+    uint8_t filler[11];
+>>>>>>> network_abstraction_layer
 } t_configBlock;