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

fix logger (lost first two chars) and setting meterbus uart (8bit data plus parity, so 9bit incl. parity)

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-10-29 23:16:03 +01:00
parent 6ccf85abdb
commit 877dd0fca3
8 changed files with 81 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cube/User/Src/logger.c
View File

@ -66,11 +66,11 @@ int logMsg(const char *format, ...) {
va_list vl;
va_start(vl, format);
int vcnt = vsnprintf(msgBuffer-2, MSGBUFFER_SIZE, format, vl);
int vcnt = vsnprintf(msgBuffer, MSGBUFFER_SIZE-2, format, vl);
va_end(vl);
if (vcnt < MSGBUFFER_SIZE) {
strcat(msgBuffer, "\n\r");
strcat(msgBuffer, "\r\n");
if (-1 == (res = ringbufferPut(&logBuffer, (uint8_t*) msgBuffer, strlen(msgBuffer)))) {
#ifndef TEST

5
cube/User/Src/main2.c
View File

@ -25,6 +25,9 @@ void my_errorHandler() {
void helloMeterbus(void *handle) {
mbusCommRequest(0x5b, 80);
// static char msg[] = "Hello";
// HAL_UART_Transmit_IT(&mbusUart, &msg, strlen(msg));
}
@ -32,7 +35,7 @@ void my_setup_2() {
led(RED, OFF);
led(GREEN, ON);
schAdd(helloMeterbus, NULL, 0, 10000);
schAdd(helloMeterbus, NULL, 0, 2000);
}
void my_loop() {

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

@ -30,11 +30,11 @@ static void handleRequestEngine(void *handle) {
switch (localMbusCommHandle->state) {
case IDLE:
logMsg("mc state IDLE\n");
logMsg("hre state IDLE");
break;
case SEND:
logMsg("mc state SEND\n");
logMsg("hre state SEND");
localMbusCommHandle->sendBuf[0] = 0x10;
localMbusCommHandle->sendBuf[1] = localMbusCommHandle->cmd;
localMbusCommHandle->sendBuf[2] = localMbusCommHandle->addr;
@ -44,26 +44,28 @@ static void handleRequestEngine(void *handle) {
// no break !!
case SEND_CONT:
logMsg("mc state SEND_CONT\n");
logMsg("hre state SEND_CONT");
led(RED, OFF);
if (! loopActive) {
logMsg("hre enabling loop, try %d", localMbusCommHandle->retryCnt);
localMbusCommHandle->retryCnt++;
loopEnable();
schAdd(handleRequestEngine, handle, 10, 0); // give 10ms to settled the loop
} else {
// write(fd, sendBuf, 5);
localMbusCommHandle->retryCnt = 0;
HAL_UART_Transmit_IT(&mbusUart, localMbusCommHandle->sendBuf, 5);
localMbusCommHandle->state = SENDING;
schAdd(handleRequestEngine, handle, 1, 0); // ask me again in 1ms in the next state ...
schAdd(handleRequestEngine, handle, 5, 0); // ask me again in 1ms in the next state ...
}
break;
case SENDING:
logMsg("mc state SENDING\n");
logMsg("hre state SENDING");
if (HAL_UART_GetState(&mbusUart) == HAL_UART_STATE_READY) { // ... whether I'm done
localMbusCommHandle->state = IDLE;
} else {
schAdd(handleRequestEngine, handle, 1, 0); // not yet done, ask me again in 1ms
schAdd(handleRequestEngine, handle, 5, 0); // not yet done, ask me again in 1ms
}
break;