wn/mbusgateway3variant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configuration

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-27 15:25:19 +01:00
parent cb5dd5f79a
commit 6d7119c0e2
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
5 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ typedef struct __attribute__((__packed__)) s_configBlock {
char statusTopic[64];
char mbusDataTopic[64];
char syslogServerName[64];
uint8_t filler[3];
} t_configBlock;
void configInit();

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

@ -3,6 +3,7 @@
#include <stdint.h>
#include <spi.h>
#include <config.h>
typedef struct __attribute__((__packed__)) s_deviceStats {
@ -17,5 +18,7 @@ void eepromWrite(uint16_t addr, uint8_t *buf, uint8_t len);
void eepromRead(uint16_t addr, uint8_t *buf, uint8_t len);
void eepromSpiTxCpltCallback(SPI_HandleTypeDef *hspi);
t_deviceStats* getGlobalDeviceStats();
void eepromReadConfigBlock(uint8_t blockNum, t_configBlock *destConfigBlock);
#endif /* EEPROM_H_ */

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

@ -1,5 +1,7 @@
#include <config.h>
#include <stdint.h>
#include <config.h>
#include <eeprom.h>
t_configBlock defaultConfigBlock = {
@ -12,9 +14,19 @@ t_configBlock defaultConfigBlock = {
.statusTopic = "IoT/MBGW3/Status",
.mbusDataTopic = "IoT/MBGW3/Measurement",
.syslogServerName = "syslogserver",
.filler = { 0, 0, 0 }
};
t_configBlock mainConfigBlock;
t_configBlock* getConfig() {
return &defaultConfigBlock;
}
void configInit() {
eepromReadConfigBlock(0, &mainConfigBlock);
}

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

@ -48,6 +48,8 @@ static t_deviceStatsBlock deviceStats;
static const uint8_t NUM_OF_BLOCKS = 2;
static const uint16_t BLOCK_ADDR[] = { 64, 4128 };
static const uint8_t EEPROM_WRITE_BLOCK_SIZE = 32;
typedef union {
struct __attribute__((__packed__)) s_spiMsg {
@ -58,7 +60,6 @@ typedef union {
uint8_t b[sizeof(struct s_spiMsg)];
} t_spiMsg;
t_deviceStats* getGlobalDeviceStats() {
return &(deviceStats.s);
}
@ -126,6 +127,15 @@ static void eepromHourlyUpdateDeviceStats(void *handle) {
eepromWrite(DEVICE_STATS_ADDR, deviceStats.b, sizeof(deviceStats));
}
void eepromReadConfigBlock(uint8_t blockNum, t_configBlock *destConfigBlock) {
uint8_t configBlockSizeMod = sizeof(*destConfigBlock) % EEPROM_WRITE_BLOCK_SIZE;
if (configBlockSizeMod != 0) {
coloredMsg(LOG_RED, false, "eeRCB, config block size must be dividable by 32");
coloredMsg(LOG_RED, false, "eeRCB, current size is %d", sizeof(*destConfigBlock));
coloredMsg(LOG_RED, false, "eeRCB, append %d filler octets", configBlockSizeMod);
}
}
// active waiting, use only during initialization!
static void eepromActiveDelay(uint8_t delay_ms) {
activeDelay(delay_ms);

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

@ -20,11 +20,13 @@
#include <mqttComm.h>
#include <cmdHandler.h>
#include <oled.h>
#include <config.h>
void my_setup_1() {
schInit();
logInit();
configInit();
showInit();
}