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

changeDevice

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-12-17 16:11:11 +01:00
parent 232db9cb36
commit 6f9f6d51d2
Signed by: wn
GPG Key ID: E49AF3B9EF6DD469
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,11 @@ void configInit() {
tmpDeviceBlock.consideredField[1], tmpDeviceBlock.consideredField[1],
tmpDeviceBlock.consideredField[2], tmpDeviceBlock.consideredField[2],
tmpDeviceBlock.consideredField[3]); tmpDeviceBlock.consideredField[3]);
mbusCommAddDevice(&tmpDeviceBlock); if (tmpDeviceBlock.period == 0) {
coloredMsg(LOG_BLUE, false, " device is marked as inactive");
} else {
mbusCommAddDevice(&tmpDeviceBlock);
}
} else { } else {
coloredMsg(LOG_BLUE, false, "magic of device %d does not match, ignored", i); coloredMsg(LOG_BLUE, false, "magic of device %d does not match, ignored", i);
} }

6
cube/User/Src/configCmds.c
View File

@ -245,13 +245,17 @@ static bool changeDeviceCmd(uint8_t argc, char **args) {
bool retCode = makeDevice(1, argc, args, &deviceBlock); bool retCode = makeDevice(1, argc, args, &deviceBlock);
if (retCode) { if (retCode) {
sendString("Changed device would be:\n\r"); sendString("Changed device will be:\n\r");
sendFormatString(" Index: %d\n\r", index); sendFormatString(" Index: %d\n\r", index);
sendFormatString(" Name: %s, Address: %d, Period: %d\n\r", sendFormatString(" Name: %s, Address: %d, Period: %d\n\r",
deviceBlock.deviceName, deviceBlock.address, deviceBlock.period); deviceBlock.deviceName, deviceBlock.address, deviceBlock.period);
for (uint8_t i = 0; i < MBUSDEVICE_NUM_OF_CONSIDEREDFIELDS; i++) { for (uint8_t i = 0; i < MBUSDEVICE_NUM_OF_CONSIDEREDFIELDS; i++) {
sendFormatString(" Considered field: %d\n\r", deviceBlock.consideredField[i]); sendFormatString(" Considered field: %d\n\r", deviceBlock.consideredField[i]);
} }
if (deviceBlock.period == 0) {
sendString(" Device is marked as inactive\n\r");
}
eepromWriteDeviceBlock(index, &deviceBlock);
} }
return retCode; return retCode;