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

extend mbus handling

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-10-29 15:57:59 +01:00
parent 3ce69c0a64
commit 236bfc7c0d
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,8 @@
typedef enum { typedef enum {
IDLE, IDLE,
SEND, SEND,
SEND_CONT SEND_CONT,
SENDING
} e_mbusCommState; } e_mbusCommState;
typedef struct { typedef struct {
@ -25,36 +26,45 @@ static t_mbusCommHandle mbusCommHandle = { .state = IDLE, .retryCnt = 0, .cmd =
static void handleRequestEngine(void *handle) { static void handleRequestEngine(void *handle) {
t_mbusCommHandle *myHandle = (t_mbusCommHandle*) handle; t_mbusCommHandle *localMbusCommHandle = (t_mbusCommHandle*) handle;
switch (myHandle->state) { switch (localMbusCommHandle->state) {
case IDLE: case IDLE:
break; break;
case SEND: case SEND:
myHandle->sendBuf[0] = 0x10; localMbusCommHandle->sendBuf[0] = 0x10;
myHandle->sendBuf[1] = myHandle->cmd; localMbusCommHandle->sendBuf[1] = localMbusCommHandle->cmd;
myHandle->sendBuf[2] = myHandle->addr; localMbusCommHandle->sendBuf[2] = localMbusCommHandle->addr;
myHandle->sendBuf[3] = myHandle->cmd + myHandle->addr; // checksum localMbusCommHandle->sendBuf[3] = localMbusCommHandle->cmd + localMbusCommHandle->addr; // checksum
myHandle->sendBuf[4] = 0x16; localMbusCommHandle->sendBuf[4] = 0x16;
myHandle->state = SEND_CONT; localMbusCommHandle->state = SEND_CONT;
// no break !! // no break !!
case SEND_CONT: case SEND_CONT:
led(RED, OFF); led(RED, OFF);
if (! loopActive) { if (! loopActive) {
myHandle->retryCnt++; localMbusCommHandle->retryCnt++;
loopEnable(); loopEnable();
schAdd(handleRequestEngine, handle, 10, 0); schAdd(handleRequestEngine, handle, 10, 0);
} else { } else {
// write(fd, sendBuf, 5); // write(fd, sendBuf, 5);
HAL_UART_Transmit_IT(&mbusUart, myHandle->sendBuf, 5); HAL_UART_Transmit_IT(&mbusUart, localMbusCommHandle->sendBuf, 5);
myHandle->state = IDLE; localMbusCommHandle->state = SENDING;
schAdd(handleRequestEngine, handle, 1, 0);
}
break;
case SENDING:
if (HAL_UART_GetState(&mbusUart) == HAL_UART_STATE_READY) {
localMbusCommHandle->state = IDLE;
} else {
schAdd(handleRequestEngine, handle, 1, 0);
} }
break; break;
default: default:
myHandle->state = IDLE; localMbusCommHandle->state = IDLE;
break; break;
} }
} }