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

rearrange configblock

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2021-02-16 12:09:08 +01:00
parent a711fcbe2a
commit f58538ab79
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,16 +4,16 @@
#include <stdint.h> #include <stdint.h>
#include <sha256.h> #include <sha256.h>
#define CONFIG_MAGIC 0xdead0007 #define CONFIG_MAGIC 0xdead0008
typedef struct __attribute__((__packed__)) s_configBlock { typedef struct __attribute__((__packed__)) s_configBlock {
uint32_t configMagic; uint32_t configMagic;
char deviceName[16]; char deviceName[16];
uint8_t macAddress[6];
char ntpServer[48]; char ntpServer[48];
char deviceId[16]; char deviceId[16];
char sharedSecret[SHA256_BLOCK_SIZE]; char sharedSecret[SHA256_BLOCK_SIZE];
char sinkServer[48]; char sinkServer[48];
uint8_t macAddress[6];
uint8_t filler[22]; uint8_t filler[22];
} t_configBlock; } t_configBlock;

1
cube/User/Inc/eeprom.h
View File

@ -25,7 +25,6 @@ typedef struct __attribute__((__packed__)) s_deviceStats {
} t_deviceStats; } t_deviceStats;
static_assert((sizeof(t_deviceStats) <= EEPROM_WRITE_BLOCK_SIZE), "t_deviceStats has illegal size, must be less than or equal 32"); static_assert((sizeof(t_deviceStats) <= EEPROM_WRITE_BLOCK_SIZE), "t_deviceStats has illegal size, must be less than or equal 32");
static_assert((sizeof(t_configBlock) % 32 == 0), "t_configBlock has illegal size, must be dividable by 32");
#define EEPROM_BASE_ADDR 0 #define EEPROM_BASE_ADDR 0

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

@ -10,12 +10,11 @@
t_configBlock defaultConfigBlock = { t_configBlock defaultConfigBlock = {
.configMagic = CONFIG_MAGIC, .configMagic = CONFIG_MAGIC,
.deviceName = "MainsCnt", .deviceName = "MainsCnt",
.macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0F },
.ntpServer = "0.de.pool.ntp.org", .ntpServer = "0.de.pool.ntp.org",
.deviceId = "MainsCnt01", .deviceId = "MainsCnt01",
.sharedSecret = "sharedSecretGanzGeheim", .sharedSecret = "sharedSecretGanzGeheim",
.sinkServer = "laborpc", .sinkServer = "laborpc",
.filler = { 0 } .macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0F }
}; };