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

syslog

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-11-17 12:01:15 +01:00
parent ccf6982b62
commit 23568db1b5
8 changed files with 137 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,30 +126,30 @@ static void parseAndPrintFrame(t_mbusCommHandle *mbusCommHandle) {
int r = mbus_frame_data_parse(&reply, &frame_data);
if (r == 0) {
mbus_data_variable *data_var = &(frame_data.data_var);
logMsg("papf sts: %02x", data_var->header.status);
coloredMsg(LOG_YELLOW, false, "papf sts: %02x", data_var->header.status);
if ((data_var->header.status & 0x01)) {
errMsg("papf sts: Application Busy");
coloredMsg(LOG_RED, true, "papf sts: Application Busy");
}
if ((data_var->header.status & 0x02)) {
errMsg("papf sts: Any Application Error");
coloredMsg(LOG_RED, true, "papf sts: Any Application Error");
}
if ((data_var->header.status & 0x04)) {
errMsg("papf sts: Power Low");
coloredMsg(LOG_RED, true, "papf sts: Power Low");
}
if ((data_var->header.status & 0x08)) {
errMsg("papf sts: Permanent Error");
coloredMsg(LOG_RED, true, "papf sts: Permanent Error");
}
if ((data_var->header.status & 0x10)) {
errMsg("papf sts: Temporary Error");
coloredMsg(LOG_RED, true, "papf sts: Temporary Error");
}
if ((data_var->header.status & 0x20)) {
errMsg("papf sts: Specific to manufacturer Error 1");
coloredMsg(LOG_RED, true, "papf sts: Specific to manufacturer Error 1");
}
if ((data_var->header.status & 0x40)) {
errMsg("papf sts: Specific to manufacturer Error 2");
coloredMsg(LOG_RED, true, "papf sts: Specific to manufacturer Error 2");
}
if ((data_var->header.status & 0x80)) {
errMsg("papf sts: Specific to manufacturer Error 3");
coloredMsg(LOG_RED, true, "papf sts: Specific to manufacturer Error 3");
}
mbus_data_record *record;
int i;
@ -159,7 +159,7 @@ static void parseAndPrintFrame(t_mbusCommHandle *mbusCommHandle) {
for (uint8_t j = 0; j < MBUSDEVICE_NUM_OF_CONSIDEREDFIELDS; j++) {
if ((mbusCommHandle->device->consideredField[j].index == i) &&
(strlen(mbusCommHandle->device->consideredField[j].label) > 0)) {
coloredMsg(LOG_YELLOW, "papf txt: I:%d, L:%s, U:%s V:%s",
coloredMsg(LOG_YELLOW, true, "papf txt: I:%d, L:%s, U:%s V:%s",
i,
mbusCommHandle->device->consideredField[j].label,
mbus_data_record_unit(record),
@ -169,14 +169,14 @@ static void parseAndPrintFrame(t_mbusCommHandle *mbusCommHandle) {
}
mbus_data_record_free(data_var->record);
} else {
errMsg("papf err: unable to parse frame");
coloredMsg(LOG_RED, true, "papf err: unable to parse frame");
}
}
static void handleRequestEngine(void *handle);
static void timeoutHandler(void *handle) {
errMsg("mbc timeout");
coloredMsg(LOG_RED, true, "mbc timeout");
t_mbusCommHandle *localMbusCommHandle = (t_mbusCommHandle*) handle;
localMbusCommHandle->state = MBCS_TIMEOUT;
localMbusCommHandle->receiving = false;
@ -196,11 +196,11 @@ static void handleRequestEngine(void *handle) {
switch (localMbusCommHandle->state) {
case MBCS_IDLE:
logMsg("hre state IDLE");
coloredMsg(LOG_YELLOW, false, "hre state IDLE");
break;
case MBCS_SEND:
logMsg("hre state SEND");
coloredMsg(LOG_YELLOW, false, "hre state SEND");
localMbusCommHandle->sendBuf[0] = 0x10;
localMbusCommHandle->sendBuf[1] = localMbusCommHandle->cmd;
localMbusCommHandle->sendBuf[2] = localMbusCommHandle->addr;
@ -210,13 +210,13 @@ static void handleRequestEngine(void *handle) {
// no break !!
case MBCS_SEND_CONTINUED:
logMsg("hre state SEND_CONTINUED");
coloredMsg(LOG_YELLOW, false, "hre state SEND_CONTINUED");
show(LED_RED, OFF);
if (! loopActive) {
logMsg("hre enabling loop, try %d", localMbusCommHandle->retryCnt);
coloredMsg(LOG_YELLOW, true, "hre enabling loop, try %d", localMbusCommHandle->retryCnt);
localMbusCommHandle->retryCnt++;
loopEnable();
schAdd(handleRequestEngine, handle, 10, 0); // give 10ms to settled the loop
schAdd(handleRequestEngine, handle, 100, 0); // give 100ms to settled the loop
} else {
localMbusCommHandle->retryCnt = 0;
HAL_UART_Transmit_IT(&mbusUart, localMbusCommHandle->sendBuf, 5);
@ -227,13 +227,13 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_SENDING_DONE:
logMsg("hre state SENDING_DONE");
coloredMsg(LOG_YELLOW, false, "hre state SENDING_DONE");
localMbusCommHandle->state = MBCS_ENABLE_FRONTEND;
schAdd(handleRequestEngine, handle, 3, 0);
break;
case MBCS_ENABLE_FRONTEND:
logMsg("hre state ENABLE_FRONTEND");
coloredMsg(LOG_YELLOW, false, "hre state ENABLE_FRONTEND");
frontendEnable();
schAdd(timeoutHandler, handle, 2500, 0);
calculatedChksum = 0;
@ -243,12 +243,11 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_START1:
//logMsg("hre state START1");
if (localMbusCommHandle->receivedOctet == 0x68) {
localMbusCommHandle->frame.start1 = localMbusCommHandle->receivedOctet;
localMbusCommHandle->state = MBCS_LENGTH1;
} else {
errMsg("hre err: invalid start1 symbol %02x", localMbusCommHandle->receivedOctet);
coloredMsg(LOG_RED, true, "hre err: invalid start1 symbol %02x", localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__START1;
localMbusCommHandle->state = MBCS_ERROR;
}
@ -256,16 +255,15 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_LENGTH1:
//logMsg("hre state LENGTH1");
if (localMbusCommHandle->receivedOctet <= 3) {
errMsg("hre err: length to small %02x", localMbusCommHandle->receivedOctet);
coloredMsg(LOG_RED, true, "hre err: length to small %02x", 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) {
errMsg("hre err: unable to allocate memory for userdata");
coloredMsg(LOG_RED, true, "hre err: unable to allocate memory for userdata");
localMbusCommHandle->result = MBCR_ERROR_OUT_OF_MEMORY__USERDATA;
localMbusCommHandle->state = MBCS_ERROR;
} else {
@ -276,9 +274,8 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_LENGTH2:
//logMsg("hre state LENGTH2");
if (localMbusCommHandle->frame.length1 != localMbusCommHandle->receivedOctet) {
errMsg("hre err: invalid length2 %02x vs. %02x", localMbusCommHandle->frame.length1, localMbusCommHandle->receivedOctet);
coloredMsg(LOG_RED, true, "hre err: invalid length2 %02x vs. %02x", localMbusCommHandle->frame.length1, localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__LENGTH2;
localMbusCommHandle->state = MBCS_ERROR;
} else {
@ -289,12 +286,11 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_START2:
//logMsg("hre state START2");
if (localMbusCommHandle->receivedOctet == 0x68) {
localMbusCommHandle->frame.start2 = localMbusCommHandle->receivedOctet;
localMbusCommHandle->state = MBCS_C_FIELD;
} else {
errMsg("hre err: invalid start2 symbol %02x", localMbusCommHandle->receivedOctet);
coloredMsg(LOG_RED, true, "hre err: invalid start2 symbol %02x", localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__START2;
localMbusCommHandle->state = MBCS_ERROR;
}
@ -302,7 +298,6 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_C_FIELD:
//logMsg("hre state C_FIELD");
localMbusCommHandle->frame.c = localMbusCommHandle->receivedOctet;
calculatedChksum += localMbusCommHandle->receivedOctet;
localMbusCommHandle->state = MBCS_A_FIELD;
@ -310,7 +305,6 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_A_FIELD:
//logMsg("hre state A_FIELD");
localMbusCommHandle->frame.a = localMbusCommHandle->receivedOctet;
calculatedChksum += localMbusCommHandle->receivedOctet;
localMbusCommHandle->state = MBCS_CI_FIELD;
@ -318,7 +312,6 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_CI_FIELD:
//logMsg("hre state CI_FIELD");
localMbusCommHandle->frame.ci = localMbusCommHandle->receivedOctet;
calculatedChksum += localMbusCommHandle->receivedOctet;
localMbusCommHandle->state = MBCS_USERDATA;
@ -326,7 +319,6 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_USERDATA:
//logMsg("hre state USERDATA");
localMbusCommHandle->frame.userdata[userdataIdx] = localMbusCommHandle->receivedOctet;
calculatedChksum += localMbusCommHandle->receivedOctet;
userdataIdx++;
@ -337,9 +329,8 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_CHKSUM:
//logMsg("hre state CHKSUM");
if (localMbusCommHandle->receivedOctet != calculatedChksum) {
errMsg("hre err: invalid checksum %02x vs %02x", calculatedChksum, localMbusCommHandle->receivedOctet);
coloredMsg(LOG_RED, true, "hre err: invalid checksum %02x vs %02x", calculatedChksum, localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__INVALID_CHKSUM;
localMbusCommHandle->state = MBCS_ERROR;
} else {
@ -350,13 +341,12 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_STOP:
//logMsg("hre state STOP");
if (localMbusCommHandle->receivedOctet == 0x16) {
localMbusCommHandle->frame.stop = localMbusCommHandle->receivedOctet;
localMbusCommHandle->state = MBCS_DONE;
schAdd(handleRequestEngine, handle, 0, 0);
} else {
errMsg("hre err: invalid stop symbol %02x", localMbusCommHandle->receivedOctet);
coloredMsg(LOG_RED, true, "hre err: invalid stop symbol %02x", localMbusCommHandle->receivedOctet);
localMbusCommHandle->result = MBCR_ERROR_STATE_ENGINE__STOP;
localMbusCommHandle->state = MBCS_ERROR;
receiveNext(localMbusCommHandle);
@ -364,7 +354,7 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_DONE:
logMsg("hre state DONE");
coloredMsg(LOG_YELLOW, false, "hre state DONE");
parseAndPrintFrame(localMbusCommHandle);
if (localMbusCommHandle->frame.userdata != NULL) {
free(localMbusCommHandle->frame.userdata);
@ -377,14 +367,14 @@ static void handleRequestEngine(void *handle) {
break;
case MBCS_ERROR:
errMsg("hre state ERROR");
coloredMsg(LOG_RED, true, "hre state ERROR");
show(LED_RED, ON);
errMsg("hre err: already error, read the rest (now: %02x) until timeout", localMbusCommHandle->receivedOctet);
coloredMsg(LOG_RED, true, "hre err: already error, read the rest (now: %02x) until timeout", localMbusCommHandle->receivedOctet);
receiveNext(localMbusCommHandle);
break;
case MBCS_TIMEOUT:
errMsg("hre state TIMEOUT");
coloredMsg(LOG_RED, true, "hre state TIMEOUT");
mbusCommStats.errorCnt += 1;
localMbusCommHandle->device->failures += 1;
localMbusCommHandle->receiving = false;
@ -396,11 +386,11 @@ static void handleRequestEngine(void *handle) {
uint8_t kitchenSink[16];
memset(kitchenSink, 0, 16);
HAL_StatusTypeDef r = HAL_UART_Receive(&mbusUart, kitchenSink, 16, 100);
errMsg("hre abort, last receive result: %02x", r);
coloredMsg(LOG_RED, true, "hre abort, last receive result: %02x", r);
// no break
case MBCS_DISABLE_FRONTEND:
logMsg("hre state DISABLE_FRONTEND");
coloredMsg(LOG_YELLOW, false, "hre state DISABLE_FRONTEND");
frontendDisable();
localMbusCommHandle->state = MBCS_IDLE;
break;
@ -421,7 +411,7 @@ void mbusCommRxCpltCallback(UART_HandleTypeDef *huart) {
schAdd(handleRequestEngine, (void*) &mbusCommHandle, 0, 0);
mbusCommHandle.receiving = false;
} else {
errMsg("mcrx: received 0x%02x but not expected", mbusCommHandle.receivedOctet);
coloredMsg(LOG_RED, true, "mcrx: received 0x%02x but not expected", mbusCommHandle.receivedOctet);
}
}
@ -434,7 +424,7 @@ e_mbusCommRequestResult mbusCommRequest(t_mbusDevice *mbusDevice) {
if (mbusCommEnabled) {
if (mbusCommHandle.state == MBCS_IDLE) {
coloredMsg(LOG_BLUE, "*** NEW REQUEST %s R:%d F:%d GRC:%d GEC:%d ***",
coloredMsg(LOG_YELLOW, true, "*** NEW REQUEST %s R:%d F:%d GRC:%d GEC:%d ***",
mbusDevice->deviceName,
mbusDevice->requests,
mbusDevice->failures,
@ -455,7 +445,7 @@ e_mbusCommRequestResult mbusCommRequest(t_mbusDevice *mbusDevice) {
} else {
res = MBCRR_DISABLED;
}
return res;
}