mbuscomm changes
This commit is contained in:
parent
e476930526
commit
6ccf85abdb
@ -66,10 +66,12 @@ int logMsg(const char *format, ...) {
|
|||||||
|
|
||||||
va_list vl;
|
va_list vl;
|
||||||
va_start(vl, format);
|
va_start(vl, format);
|
||||||
int vcnt = vsnprintf(msgBuffer, MSGBUFFER_SIZE, format, vl);
|
int vcnt = vsnprintf(msgBuffer-2, MSGBUFFER_SIZE, format, vl);
|
||||||
va_end(vl);
|
va_end(vl);
|
||||||
|
|
||||||
if (vcnt < MSGBUFFER_SIZE) {
|
if (vcnt < MSGBUFFER_SIZE) {
|
||||||
|
strcat(msgBuffer, "\n\r");
|
||||||
|
|
||||||
if (-1 == (res = ringbufferPut(&logBuffer, (uint8_t*) msgBuffer, strlen(msgBuffer)))) {
|
if (-1 == (res = ringbufferPut(&logBuffer, (uint8_t*) msgBuffer, strlen(msgBuffer)))) {
|
||||||
#ifndef TEST
|
#ifndef TEST
|
||||||
// blink the green light or so
|
// blink the green light or so
|
||||||
|
@ -23,12 +23,6 @@ void my_errorHandler() {
|
|||||||
led(RED, ON);
|
led(RED, ON);
|
||||||
}
|
}
|
||||||
|
|
||||||
void helloWorld(void *handle) {
|
|
||||||
static uint32_t cnt = 0;
|
|
||||||
logMsg("Hello World, %ld\n\r", cnt);
|
|
||||||
cnt++;
|
|
||||||
}
|
|
||||||
|
|
||||||
void helloMeterbus(void *handle) {
|
void helloMeterbus(void *handle) {
|
||||||
mbusCommRequest(0x5b, 80);
|
mbusCommRequest(0x5b, 80);
|
||||||
}
|
}
|
||||||
@ -38,9 +32,7 @@ void my_setup_2() {
|
|||||||
led(RED, OFF);
|
led(RED, OFF);
|
||||||
led(GREEN, ON);
|
led(GREEN, ON);
|
||||||
|
|
||||||
schAdd(helloWorld, NULL, 0, 1000);
|
|
||||||
schAdd(helloMeterbus, NULL, 0, 10000);
|
schAdd(helloMeterbus, NULL, 0, 10000);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void my_loop() {
|
void my_loop() {
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include <mbusComm.h>
|
#include <mbusComm.h>
|
||||||
#include <loopCtrl.h>
|
#include <loopCtrl.h>
|
||||||
#include <led.h>
|
#include <led.h>
|
||||||
|
#include <logger.h>
|
||||||
|
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
@ -30,9 +30,11 @@ static void handleRequestEngine(void *handle) {
|
|||||||
|
|
||||||
switch (localMbusCommHandle->state) {
|
switch (localMbusCommHandle->state) {
|
||||||
case IDLE:
|
case IDLE:
|
||||||
|
logMsg("mc state IDLE\n");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SEND:
|
case SEND:
|
||||||
|
logMsg("mc state SEND\n");
|
||||||
localMbusCommHandle->sendBuf[0] = 0x10;
|
localMbusCommHandle->sendBuf[0] = 0x10;
|
||||||
localMbusCommHandle->sendBuf[1] = localMbusCommHandle->cmd;
|
localMbusCommHandle->sendBuf[1] = localMbusCommHandle->cmd;
|
||||||
localMbusCommHandle->sendBuf[2] = localMbusCommHandle->addr;
|
localMbusCommHandle->sendBuf[2] = localMbusCommHandle->addr;
|
||||||
@ -42,6 +44,7 @@ static void handleRequestEngine(void *handle) {
|
|||||||
// no break !!
|
// no break !!
|
||||||
|
|
||||||
case SEND_CONT:
|
case SEND_CONT:
|
||||||
|
logMsg("mc state SEND_CONT\n");
|
||||||
led(RED, OFF);
|
led(RED, OFF);
|
||||||
if (! loopActive) {
|
if (! loopActive) {
|
||||||
localMbusCommHandle->retryCnt++;
|
localMbusCommHandle->retryCnt++;
|
||||||
@ -56,6 +59,7 @@ static void handleRequestEngine(void *handle) {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case SENDING:
|
case SENDING:
|
||||||
|
logMsg("mc state SENDING\n");
|
||||||
if (HAL_UART_GetState(&mbusUart) == HAL_UART_STATE_READY) { // ... whether I'm done
|
if (HAL_UART_GetState(&mbusUart) == HAL_UART_STATE_READY) { // ... whether I'm done
|
||||||
localMbusCommHandle->state = IDLE;
|
localMbusCommHandle->state = IDLE;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user