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

network specific configuration

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

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

@ -14,7 +14,9 @@ typedef struct __attribute__((__packed__)) s_configBlock {
char sharedSecret[SHA256_BLOCK_SIZE];
char sinkServer[48];
union {
uint8_t macAddress[6];
struct {
uint8_t macAddress[6];
} lan;
} networkspecific;
uint8_t filler[22];
} t_configBlock;

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

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

2
cube/User/Src/wizHelper.c
View File

@ -211,7 +211,7 @@ static void wizPhyLinkHandler(void *handle) {
int wizInit() {
config = getConfig();
netInfo.dhcp = NETINFO_DHCP;
memcpy(netInfo.mac, config->networkspecific.macAddress, 6);
memcpy(netInfo.mac, config->networkspecific.lan.macAddress, 6);
coloredMsg(LOG_BLUE, "wizI, resetting Ethernet module");
wizReset(true);