From 6ccf85abdbca9d9d4eb6bf428025c4c45826b4a9 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Thu, 29 Oct 2020 21:02:04 +0100
Subject: [PATCH] mbuscomm changes

---
 cube/User/Src/logger.c   | 4 +++-
 cube/User/Src/main2.c    | 8 --------
 cube/User/Src/mbusComm.c | 6 +++++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cube/User/Src/logger.c b/cube/User/Src/logger.c
index 5cdcffa..6873cf8 100644
--- a/cube/User/Src/logger.c
+++ b/cube/User/Src/logger.c
@@ -66,10 +66,12 @@ int logMsg(const char *format, ...) {
 
     va_list vl;
     va_start(vl, format);
-    int vcnt = vsnprintf(msgBuffer, MSGBUFFER_SIZE, format, vl);
+    int vcnt = vsnprintf(msgBuffer-2, MSGBUFFER_SIZE, format, vl);
     va_end(vl);
 
     if (vcnt < MSGBUFFER_SIZE) {
+        strcat(msgBuffer, "\n\r");
+
         if (-1 == (res = ringbufferPut(&logBuffer, (uint8_t*) msgBuffer, strlen(msgBuffer)))) {
 #ifndef TEST
             // blink the green light or so
diff --git a/cube/User/Src/main2.c b/cube/User/Src/main2.c
index c599b95..b20820e 100644
--- a/cube/User/Src/main2.c
+++ b/cube/User/Src/main2.c
@@ -23,12 +23,6 @@ void my_errorHandler() {
     led(RED, ON);
 }
 
-void helloWorld(void *handle) {
-    static uint32_t cnt = 0;
-    logMsg("Hello World, %ld\n\r", cnt);
-    cnt++;
-}
-
 void helloMeterbus(void *handle) {
     mbusCommRequest(0x5b, 80);
 }
@@ -38,9 +32,7 @@ void my_setup_2() {
     led(RED, OFF);
     led(GREEN, ON);
 
-    schAdd(helloWorld, NULL, 0, 1000);
     schAdd(helloMeterbus, NULL, 0, 10000);
-
 }
 
 void my_loop() {
diff --git a/cube/User/Src/mbusComm.c b/cube/User/Src/mbusComm.c
index edf0559..d68554d 100644
--- a/cube/User/Src/mbusComm.c
+++ b/cube/User/Src/mbusComm.c
@@ -4,7 +4,7 @@
 #include <mbusComm.h>
 #include <loopCtrl.h>
 #include <led.h>
-
+#include <logger.h>
 
 
 typedef enum {
@@ -30,9 +30,11 @@ static void handleRequestEngine(void *handle) {
 
     switch (localMbusCommHandle->state) {
         case IDLE:
+        logMsg("mc state IDLE\n");
         break;
 
         case SEND:
+        logMsg("mc state SEND\n");
         localMbusCommHandle->sendBuf[0] = 0x10;
         localMbusCommHandle->sendBuf[1] = localMbusCommHandle->cmd;
         localMbusCommHandle->sendBuf[2] = localMbusCommHandle->addr;
@@ -42,6 +44,7 @@ static void handleRequestEngine(void *handle) {
         // no break !!
 
         case SEND_CONT:
+        logMsg("mc state SEND_CONT\n");
         led(RED, OFF);
         if (! loopActive) {
             localMbusCommHandle->retryCnt++;
@@ -56,6 +59,7 @@ static void handleRequestEngine(void *handle) {
         break;
 
         case SENDING:
+        logMsg("mc state SENDING\n");
         if (HAL_UART_GetState(&mbusUart) == HAL_UART_STATE_READY) { // ... whether I'm done
             localMbusCommHandle->state = IDLE;
         } else {