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

device configuration prepared

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-30 18:48:48 +01:00
parent f22c821ca3
commit 98c0a9d7a2
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cube/User/Inc/mbusComm.h
View File

@ -44,5 +44,7 @@ void mbusCommRxCpltCallback(UART_HandleTypeDef *huart);
void mbusCommErrorCallback(UART_HandleTypeDef *huart); void mbusCommErrorCallback(UART_HandleTypeDef *huart);
void mbusCommSetStats(t_mbusCommStats stats); void mbusCommSetStats(t_mbusCommStats stats);
t_mbusCommStats *mbusCommGetStats(); t_mbusCommStats *mbusCommGetStats();
void mbusCommAddDevice(t_deviceBlock *deviceBlock);
#endif // _MBUSCOMM_H_ #endif // _MBUSCOMM_H_

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

@ -4,6 +4,8 @@
#include <config.h> #include <config.h>
#include <eeprom.h> #include <eeprom.h>
#include <logger.h> #include <logger.h>
#include <mbusComm.h>
t_configBlock defaultConfigBlock = { t_configBlock defaultConfigBlock = {
.configMagic = CONFIG_MAGIC, .configMagic = CONFIG_MAGIC,
@ -85,13 +87,18 @@ void configInit() {
for (uint8_t i = 0; i < mainConfigBlock.numOfDeviceBlocks; i++) { for (uint8_t i = 0; i < mainConfigBlock.numOfDeviceBlocks; i++) {
t_deviceBlock tmpDeviceBlock; t_deviceBlock tmpDeviceBlock;
eepromReadDeviceBlock(i, &tmpDeviceBlock); eepromReadDeviceBlock(i, &tmpDeviceBlock);
coloredMsg(LOG_BLUE, false, "cfg ci device %d: ", i); if (tmpDeviceBlock.deviceMagic == DEVICE_MAGIC) {
coloredMsg(LOG_BLUE, false, " Name: %s, Address: %d, Period: %d", coloredMsg(LOG_BLUE, false, "cfg ci device %d: ", i);
tmpDeviceBlock.deviceName, tmpDeviceBlock.address, tmpDeviceBlock.period); coloredMsg(LOG_BLUE, false, " Name: %s, Address: %d, Period: %d",
coloredMsg(LOG_BLUE, false, " Considered Fields: %d %d %d %d", tmpDeviceBlock.deviceName, tmpDeviceBlock.address, tmpDeviceBlock.period);
tmpDeviceBlock.consideredField[0], coloredMsg(LOG_BLUE, false, " Considered Fields: %d %d %d %d",
tmpDeviceBlock.consideredField[1], tmpDeviceBlock.consideredField[0],
tmpDeviceBlock.consideredField[2], tmpDeviceBlock.consideredField[1],
tmpDeviceBlock.consideredField[3]); tmpDeviceBlock.consideredField[2],
tmpDeviceBlock.consideredField[3]);
mbusCommAddDevice(&tmpDeviceBlock);
} else {
coloredMsg(LOG_BLUE, false, " magic does not match, ignored");
}
} }
} }

23
cube/User/Src/mbusComm.c
View File

@ -607,7 +607,25 @@ static e_mbusCommRequestResult mbusCommRequest(t_mbusDevice *mbusDevice) {
#define PERIOD 10 #define PERIOD 10
static uint8_t numOfDevices = 8; static uint8_t numOfDevices = 0;
static t_mbusDevice *devices = NULL;
void mbusCommAddDevice(t_deviceBlock *deviceBlock) {
devices = (t_mbusDevice*) realloc((void*) devices, (numOfDevices + 1) * sizeof(t_mbusDevice));
strcpy(devices[numOfDevices].deviceName, deviceBlock->deviceName);
devices[numOfDevices].address = deviceBlock->address;
memcpy(devices[numOfDevices].consideredField, deviceBlock->consideredField, sizeof(deviceBlock->consideredField));
devices[numOfDevices].period = deviceBlock->period;
devices[numOfDevices].requests = 0;
devices[numOfDevices].failures = 0;
devices[numOfDevices].delay = 0;
devices[numOfDevices].waiting = false;
devices[numOfDevices].active = true;
coloredMsg(LOG_YELLOW, true, "mbc mbcad device added %d %s %d", numOfDevices, devices[numOfDevices].deviceName, devices[numOfDevices].address);
numOfDevices += 1;
}
/*
static t_mbusDevice devices[] = { static t_mbusDevice devices[] = {
{ {
.deviceName = "Total", .deviceName = "Total",
@ -698,6 +716,9 @@ static t_mbusDevice devices[] = {
.active = true .active = true
} }
}; };
*/
static void triggerMBusRequest(void *handle) { static void triggerMBusRequest(void *handle) {