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

logging

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-11-17 12:40:24 +01:00
parent dc91b5317a
commit 5d3a2bbff3
2 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,30 +127,30 @@ static void parseAndPrintFrame(t_mbusCommHandle *localMbusCommHandle) {
int r = mbus_frame_data_parse(&reply, &frame_data);
if (r == 0) {
mbus_data_variable *data_var = &(frame_data.data_var);
coloredMsg(LOG_YELLOW, false, "papf [%d] sts: %02x", localMbusCommHandle->requestId, data_var->header.status);
coloredMsg(LOG_YELLOW, false, "mbc papf [%d] sts: %02x", localMbusCommHandle->requestId, data_var->header.status);
if ((data_var->header.status & 0x01)) {
coloredMsg(LOG_RED, true, "papf [%d] sts: Application Busy", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Application Busy", localMbusCommHandle->requestId);
}
if ((data_var->header.status & 0x02)) {
coloredMsg(LOG_RED, true, "papf [%d] sts: Any Application Error", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Any Application Error", localMbusCommHandle->requestId);
}
if ((data_var->header.status & 0x04)) {
coloredMsg(LOG_RED, true, "papf [%d] sts: Power Low", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Power Low", localMbusCommHandle->requestId);
}
if ((data_var->header.status & 0x08)) {
coloredMsg(LOG_RED, true, "papf [%d] sts: Permanent Error", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Permanent Error", localMbusCommHandle->requestId);
}
if ((data_var->header.status & 0x10)) {
coloredMsg(LOG_RED, true, "papf [%d] sts: Temporary Error", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Temporary Error", localMbusCommHandle->requestId);
}
if ((data_var->header.status & 0x20)) {
coloredMsg(LOG_RED, true, "papf [%d] sts: Specific to manufacturer Error 1", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Specific to manufacturer Error 1", localMbusCommHandle->requestId);
}
if ((data_var->header.status & 0x40)) {
coloredMsg(LOG_RED, true, "papf [%d] sts: Specific to manufacturer Error 2", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Specific to manufacturer Error 2", localMbusCommHandle->requestId);
}
if ((data_var->header.status & 0x80)) {
coloredMsg(LOG_RED, true, "papf [%d] sts: Specific to manufacturer Error 3", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc papf [%d] sts: Specific to manufacturer Error 3", localMbusCommHandle->requestId);
}
mbus_data_record *record;
int i;
@ -160,7 +160,7 @@ static void parseAndPrintFrame(t_mbusCommHandle *localMbusCommHandle) {
for (uint8_t j = 0; j < MBUSDEVICE_NUM_OF_CONSIDEREDFIELDS; j++) {
if ((localMbusCommHandle->device->consideredField[j].index == i) &&
(strlen(localMbusCommHandle->device->consideredField[j].label) > 0)) {
coloredMsg(LOG_YELLOW, true, "papf [%d] txt: I:%d, L:%s, U:%s V:%s",
coloredMsg(LOG_YELLOW, true, "mbc papf [%d] txt: I:%d, L:%s, U:%s V:%s",
localMbusCommHandle->requestId,
i,
localMbusCommHandle->device->consideredField[j].label,
@ -171,7 +171,7 @@ static void parseAndPrintFrame(t_mbusCommHandle *localMbusCommHandle) {
}
mbus_data_record_free(data_var->record);
} else {
coloredMsg(LOG_RED, true, "papf [%d] err: unable to parse frame", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc papf [%d] err: unable to parse frame", localMbusCommHandle->requestId);
}
}
@ -179,7 +179,7 @@ static void parseAndPrintFrame(t_mbusCommHandle *localMbusCommHandle) {
static void handleRequestEngine(void *handle);
static void timeoutHandler(void *handle) {
t_mbusCommHandle *localMbusCommHandle = (t_mbusCommHandle*) handle;
coloredMsg(LOG_RED, true, "mbcth [%d] timeout", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc th [%d] timeout", localMbusCommHandle->requestId);
localMbusCommHandle->state = MBCS_TIMEOUT;
localMbusCommHandle->receiving = false;
handleRequestEngine(handle);
@ -198,11 +198,11 @@ static void handleRequestEngine(void *handle) {
switch (localMbusCommHandle->state) {
case MBCS_IDLE:
coloredMsg(LOG_YELLOW, false, "hre [%d] state IDLE", localMbusCommHandle->requestId);
coloredMsg(LOG_YELLOW, false, "mbc hre [%d] state IDLE", localMbusCommHandle->requestId);
break;
case MBCS_SEND:
coloredMsg(LOG_YELLOW, false, "hre [%d] state SEND", localMbusCommHandle->requestId);
coloredMsg(LOG_YELLOW, false, "mbc hre [%d] state SEND", localMbusCommHandle->requestId);
localMbusCommHandle->sendBuf[0] = 0x10;
localMbusCommHandle->sendBuf[1] = localMbusCommHandle->cmd;
localMbusCommHandle->sendBuf[2] = localMbusCommHandle->addr;
@ -212,10 +212,10 @@ static void handleRequestEngine(void *handle) {
// no break !!
case MBCS_SEND_CONTINUED:
coloredMsg(LOG_YELLOW, false, "hre [%d] state SEND_CONTINUED", localMbusCommHandle->requestId);
coloredMsg(LOG_YELLOW, false, "mbc hre [%d] state SEND_CONTINUED", localMbusCommHandle->requestId);
show(LED_RED, OFF);
if (! loopActive) {
coloredMsg(LOG_YELLOW, true, "hre [%d] enabling loop, try %d", localMbusCommHandle->requestId, localMbusCommHandle->retryCnt);
coloredMsg(LOG_YELLOW, true, "mbc hre [%d] enabling loop, try %d", localMbusCommHandle->requestId, localMbusCommHandle->retryCnt);
localMbusCommHandle->retryCnt++;
loopEnable();
schAdd(handleRequestEngine, handle, 100, 0); // give 100ms to settled the loop
@ -229,13 +229,13 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_SENDING_DONE:
coloredMsg(LOG_YELLOW, false, "hre [%d] state SENDING_DONE", localMbusCommHandle->requestId);
coloredMsg(LOG_YELLOW, false, "mbc hre [%d] state SENDING_DONE", localMbusCommHandle->requestId);
localMbusCommHandle->state = MBCS_ENABLE_FRONTEND;
schAdd(handleRequestEngine, handle, 3, 0);
break;
case MBCS_ENABLE_FRONTEND:
coloredMsg(LOG_YELLOW, false, "hre [%d] state ENABLE_FRONTEND", localMbusCommHandle->requestId);
coloredMsg(LOG_YELLOW, false, "mbc hre [%d] state ENABLE_FRONTEND", localMbusCommHandle->requestId);
frontendEnable();
schAdd(timeoutHandler, handle, 2500, 0);
calculatedChksum = 0;
@ -249,7 +249,7 @@ static void handleRequestEngine(void *handle) {
localMbusCommHandle->frame.start1 = localMbusCommHandle->receivedOctet;
localMbusCommHandle->state = MBCS_LENGTH1;
} else {
coloredMsg(LOG_RED, true, "hre [%d] err: invalid start1 symbol %02x", localMbusCommHandle->requestId, localMbusCommHandle->receivedOctet);
coloredMsg(LOG_RED, true, "mbc hre [%d] err: invalid start1 symbol %02x", localMbusCommHandle->requestId, localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__START1;
localMbusCommHandle->state = MBCS_ERROR;
}
@ -258,14 +258,14 @@ static void handleRequestEngine(void *handle) {
case MBCS_LENGTH1:
if (localMbusCommHandle->receivedOctet <= 3) {
coloredMsg(LOG_RED, true, "hre [%d] err: length to small %02x", localMbusCommHandle->requestId, localMbusCommHandle->receivedOctet);
coloredMsg(LOG_RED, true, "mbc hre [%d] err: length to small %02x", localMbusCommHandle->requestId, localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__LENGTH1;
localMbusCommHandle->state = MBCS_ERROR;
} else {
localMbusCommHandle->frame.length1 = localMbusCommHandle->receivedOctet;
localMbusCommHandle->frame.userdata = (uint8_t*) malloc(localMbusCommHandle->frame.length1 - 3);
if (! localMbusCommHandle->frame.userdata) {
coloredMsg(LOG_RED, true, "hre [%d] err: unable to allocate memory for userdata", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc hre [%d] err: unable to allocate memory for userdata", localMbusCommHandle->requestId);
localMbusCommHandle->result = MBCR_ERROR_OUT_OF_MEMORY__USERDATA;
localMbusCommHandle->state = MBCS_ERROR;
} else {
@ -277,7 +277,7 @@ static void handleRequestEngine(void *handle) {
case MBCS_LENGTH2:
if (localMbusCommHandle->frame.length1 != localMbusCommHandle->receivedOctet) {
coloredMsg(LOG_RED, true, "hre [%d] err: invalid length2 %02x vs. %02x",
coloredMsg(LOG_RED, true, "mbc hre [%d] err: invalid length2 %02x vs. %02x",
localMbusCommHandle->requestId, localMbusCommHandle->frame.length1, localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__LENGTH2;
localMbusCommHandle->state = MBCS_ERROR;
@ -293,7 +293,7 @@ static void handleRequestEngine(void *handle) {
localMbusCommHandle->frame.start2 = localMbusCommHandle->receivedOctet;
localMbusCommHandle->state = MBCS_C_FIELD;
} else {
coloredMsg(LOG_RED, true, "hre [%d] err: invalid start2 symbol %02x",
coloredMsg(LOG_RED, true, "mbc hre [%d] err: invalid start2 symbol %02x",
localMbusCommHandle->requestId, localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__START2;
localMbusCommHandle->state = MBCS_ERROR;
@ -334,7 +334,7 @@ static void handleRequestEngine(void *handle) {
case MBCS_CHKSUM:
if (localMbusCommHandle->receivedOctet != calculatedChksum) {
coloredMsg(LOG_RED, true, "hre [%d] err: invalid checksum %02x vs %02x",
coloredMsg(LOG_RED, true, "mbc hre [%d] err: invalid checksum %02x vs %02x",
localMbusCommHandle->requestId, calculatedChksum, localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__INVALID_CHKSUM;
localMbusCommHandle->state = MBCS_ERROR;
@ -351,7 +351,7 @@ static void handleRequestEngine(void *handle) {
localMbusCommHandle->state = MBCS_DONE;
schAdd(handleRequestEngine, handle, 0, 0);
} else {
coloredMsg(LOG_RED, true, "hre [%d] err: invalid stop symbol %02x",
coloredMsg(LOG_RED, true, "mbc hre [%d] err: invalid stop symbol %02x",
localMbusCommHandle->requestId, localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__STOP;
localMbusCommHandle->state = MBCS_ERROR;
@ -360,7 +360,7 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_DONE:
coloredMsg(LOG_YELLOW, false, "hre [%d] state DONE", localMbusCommHandle->requestId);
coloredMsg(LOG_YELLOW, false, "mbc hre [%d] state DONE", localMbusCommHandle->requestId);
parseAndPrintFrame(localMbusCommHandle);
if (localMbusCommHandle->frame.userdata != NULL) {
free(localMbusCommHandle->frame.userdata);
@ -373,15 +373,15 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_ERROR:
coloredMsg(LOG_RED, true, "hre [%d] state ERROR", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc hre [%d] state ERROR", localMbusCommHandle->requestId);
show(LED_RED, ON);
coloredMsg(LOG_RED, true, "hre [%d] err: already error, read the rest (now: %02x) until timeout",
coloredMsg(LOG_RED, true, "mbc hre [%d] err: already error, read the rest (now: %02x) until timeout",
localMbusCommHandle->requestId, localMbusCommHandle->receivedOctet);
receiveNext(localMbusCommHandle);
break;
case MBCS_TIMEOUT:
coloredMsg(LOG_RED, true, "hre [%d] state TIMEOUT", localMbusCommHandle->requestId);
coloredMsg(LOG_RED, true, "mbc hre [%d] state TIMEOUT", localMbusCommHandle->requestId);
mbusCommStats.errorCnt += 1;
localMbusCommHandle->device->failures += 1;
localMbusCommHandle->receiving = false;
@ -393,11 +393,11 @@ static void handleRequestEngine(void *handle) {
uint8_t kitchenSink[16];
memset(kitchenSink, 0, 16);
HAL_StatusTypeDef r = HAL_UART_Receive(&mbusUart, kitchenSink, 16, 100);
coloredMsg(LOG_RED, true, "hre [%d] abort, last receive result: %02x", localMbusCommHandle->requestId, r);
coloredMsg(LOG_RED, true, "mbc hre [%d] abort, last receive result: %02x", localMbusCommHandle->requestId, r);
// no break
case MBCS_DISABLE_FRONTEND:
coloredMsg(LOG_YELLOW, false, "hre [%d] state DISABLE_FRONTEND", localMbusCommHandle->requestId);
coloredMsg(LOG_YELLOW, false, "mbc hre [%d] state DISABLE_FRONTEND", localMbusCommHandle->requestId);
frontendDisable();
localMbusCommHandle->state = MBCS_IDLE;
break;
@ -417,9 +417,6 @@ void mbusCommRxCpltCallback(UART_HandleTypeDef *huart) {
if (mbusCommHandle.receiving) {
schAdd(handleRequestEngine, (void*) &mbusCommHandle, 0, 0);
mbusCommHandle.receiving = false;
} else {
coloredMsg(LOG_RED, true, "mcrx [%d] received 0x%02x but not expected",
mbusCommHandle.requestId, mbusCommHandle.receivedOctet);
}
}
@ -440,7 +437,7 @@ e_mbusCommRequestResult mbusCommRequest(t_mbusDevice *mbusDevice) {
mbusCommHandle.device = mbusDevice;
mbusDevice->requests += 1;
coloredMsg(LOG_YELLOW, true, "mcr [%d] new request %s R:%d F:%d GRC:%d GEC:%d",
coloredMsg(LOG_YELLOW, true, "mbc mcr [%d] new request %s R:%d F:%d GRC:%d GEC:%d",
mbusCommHandle.requestId,
mbusDevice->deviceName,
mbusDevice->requests,