mainscnt/mains-frequency-counter-stm32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forgotten resolves

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2021-02-16 13:09:50 +01:00
parent b6439e7df3
commit a09024c6a2
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cube/User/Inc/config.h
View File

@ -13,10 +13,6 @@ typedef struct __attribute__((__packed__)) s_configBlock {
char deviceId[16]; char deviceId[16];
char sharedSecret[SHA256_BLOCK_SIZE]; char sharedSecret[SHA256_BLOCK_SIZE];
char sinkServer[48]; char sinkServer[48];
<<<<<<< HEAD
uint8_t macAddress[6];
uint8_t filler[22];
=======
union { union {
struct { struct {
uint8_t macAddress[6]; uint8_t macAddress[6];
@ -27,7 +23,6 @@ typedef struct __attribute__((__packed__)) s_configBlock {
} wifi; } wifi;
} networkspecific; } networkspecific;
uint8_t filler[11]; uint8_t filler[11];
>>>>>>> network_abstraction_layer
} t_configBlock; } t_configBlock;

3
cube/User/Src/config.c
View File

@ -10,10 +10,7 @@
t_configBlock defaultConfigBlock = { t_configBlock defaultConfigBlock = {
.configMagic = CONFIG_MAGIC, .configMagic = CONFIG_MAGIC,
.deviceName = "MainsCnt", .deviceName = "MainsCnt",
<<<<<<< HEAD
=======
.networkspecific.lan.macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0F }, .networkspecific.lan.macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0F },
>>>>>>> network_abstraction_layer
.ntpServer = "0.de.pool.ntp.org", .ntpServer = "0.de.pool.ntp.org",
.deviceId = "MainsCnt01", .deviceId = "MainsCnt01",
.sharedSecret = "sharedSecretGanzGeheim", .sharedSecret = "sharedSecretGanzGeheim",