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:27:12 +01:00
parent 734343c477
commit a2a484fcc5
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,9 @@ 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];
uint8_t macAddress[6]; union networkspecific {
uint8_t macAddress[6];
};
uint8_t filler[22]; uint8_t filler[22];
} t_configBlock; } t_configBlock;

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

@ -44,12 +44,12 @@ void configInit() {
} }
coloredMsg(LOG_BLUE, "cfg ci configMagic: %lx", mainConfigBlock.configMagic); coloredMsg(LOG_BLUE, "cfg ci configMagic: %lx", mainConfigBlock.configMagic);
coloredMsg(LOG_BLUE, "cfg ci deviceName: %s", mainConfigBlock.deviceName); coloredMsg(LOG_BLUE, "cfg ci deviceName: %s", mainConfigBlock.deviceName);
coloredMsg(LOG_BLUE, "cfg ci MAC address: %02x:%02x:%02x:%02x:%02x:%02x", mainConfigBlock.macAddress[0], // coloredMsg(LOG_BLUE, "cfg ci MAC address: %02x:%02x:%02x:%02x:%02x:%02x", mainConfigBlock.macAddress[0],
mainConfigBlock.macAddress[1], // mainConfigBlock.macAddress[1],
mainConfigBlock.macAddress[2], // mainConfigBlock.macAddress[2],
mainConfigBlock.macAddress[3], // mainConfigBlock.macAddress[3],
mainConfigBlock.macAddress[4], // mainConfigBlock.macAddress[4],
mainConfigBlock.macAddress[5]); // mainConfigBlock.macAddress[5]);
coloredMsg(LOG_BLUE, "cfg ci ntp server: %s", mainConfigBlock.ntpServer); coloredMsg(LOG_BLUE, "cfg ci ntp server: %s", mainConfigBlock.ntpServer);
coloredMsg(LOG_BLUE, "cfg ci deviceId: %s", mainConfigBlock.deviceId); coloredMsg(LOG_BLUE, "cfg ci deviceId: %s", mainConfigBlock.deviceId);
coloredMsg(LOG_BLUE, "cfg ci sharedSecret: %s", mainConfigBlock.sharedSecret); coloredMsg(LOG_BLUE, "cfg ci sharedSecret: %s", mainConfigBlock.sharedSecret);

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

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