ringbuffer and tests

cube/Makefile

@@ -1,4 +1,4 @@
-# Processed by ../tools/insertMyCode.sh
+# Processed by ../tools/insertMyCode.sh
 ##########################################################################################################################
 # File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Tue Oct 27 22:02:19 CET 2020]
 ##########################################################################################################################
@@ -36,36 +36,36 @@ BUILD_DIR = build
 # source
 ######################################
 # C sources
-C_SOURCES =  \
-User/Src/led.c User/Src/loopCtrl.c User/Src/main2.c hottislib/PontCoopScheduler.c  \
-Core/Src/main.c \
-Core/Src/gpio.c \
-Core/Src/adc.c \
-Core/Src/spi.c \
-Core/Src/usart.c \
-Core/Src/stm32f1xx_it.c \
-Core/Src/stm32f1xx_hal_msp.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
-Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \
+C_SOURCES =  \
+User/Src/mbusComm.c User/Src/led.c User/Src/loopCtrl.c User/Src/main2.c hottislib/PontCoopScheduler.c  \
+Core/Src/main.c \
+Core/Src/gpio.c \
+Core/Src/adc.c \
+Core/Src/spi.c \
+Core/Src/usart.c \
+Core/Src/stm32f1xx_it.c \
+Core/Src/stm32f1xx_hal_msp.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
+Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \
 Core/Src/system_stm32f1xx.c  
 
 # ASM sources
-ASM_SOURCES =  \
+ASM_SOURCES =  \
 startup_stm32f103xe.s
 
 
@@ -109,8 +109,8 @@ MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI)
 AS_DEFS = 
 
 # C defines
-C_DEFS =  \
--DUSE_HAL_DRIVER \
+C_DEFS =  \
+-DUSE_HAL_DRIVER \
 -DSTM32F103xE
 
 
@@ -118,14 +118,14 @@ C_DEFS =  \
 AS_INCLUDES = 
 
 # C includes
-C_INCLUDES =  \
--Ihottislib \
--IUser/Inc \
--ICore/Inc \
--IDrivers/STM32F1xx_HAL_Driver/Inc \
--IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
--IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
--IDrivers/CMSIS/Include \
+C_INCLUDES =  \
+-Ihottislib \
+-IUser/Inc \
+-ICore/Inc \
+-IDrivers/STM32F1xx_HAL_Driver/Inc \
+-IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
+-IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
+-IDrivers/CMSIS/Include \
 -IDrivers/CMSIS/Include
 
 

cube/User/Inc/logger.h

@@ -0,0 +1,6 @@
+#ifndef _LOGGER_H_
+#define _LOGGER_H_
+
+void log(char *msg);
+
+#endif // _LOGGER_H_

cube/User/Inc/mbusComm.h

@@ -0,0 +1,8 @@
+#ifndef _MBUSCOMM_H_
+#define _MBUSCOMM_H_
+
+#include <stdint.h>
+
+void mbusCommRequest(uint8_t cmd, uint8_t addr);
+
+#endif // _MBUSCOMM_H_

cube/User/Inc/ringbuffer.h

@@ -0,0 +1,23 @@
+#ifndef _RINGBUFFER_H_
+#define _RINGBUFFER_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+
+typedef struct {
+    uint32_t bufferReadIdx;
+    uint32_t bufferWriteIdx;
+    uint32_t bufferSize;
+    uint8_t* buffer;
+} ringbuffer_t;
+
+void ringbufferInit(ringbuffer_t *handle, uint32_t bufferSize);
+void ringbufferFree(ringbuffer_t *handle);
+int ringbufferPut(ringbuffer_t *handle, uint8_t *data, uint32_t dataLen);
+uint8_t *ringbufferGet(ringbuffer_t *handle, uint32_t dataLen);
+bool ringbufferEmpty(ringbuffer_t *handle);
+int ringbufferGetOne(ringbuffer_t *handle); // if positive, cast to uint8_t and be happy, if negative error
+
+
+#endif // _RINGBUFFER_H_

cube/User/Src/logger.c

@@ -0,0 +1,17 @@
+#include <main.h>
+#include <usart.h>
+#include <logger.h>
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+void log(char *msg) {
+    uint16_t len = strlen(msg);
+
+    if (HAL_UART_Transmit_IT(&debugUart, msg, len) != HAL_OK) {
+        if(RingBuffer_Write(&txBuf, msg, len) != RING_BUFFER_OK)
+        return 0;
+    }
+    return 1;
+}

cube/User/Src/main2.c

@@ -9,6 +9,8 @@
 
 #include <led.h>
 #include <loopCtrl.h>
+#include <mbusComm.h>
+
 
 void my_setup_1() {
     schInit();
@@ -18,53 +20,21 @@ void my_errorHandler() {
     ledRed(true);
 }
 
-
-
-void blinkRed(void *handle) {
-    static bool on = false;
-    ledRed(on);
-    on ^= true;
-}
-
-void blinkGreen(void *handle) {
-    static bool on = false;
-    ledGreen(on);
-    on ^= true;
-}
-
 void helloWorld(void *handle) {
     static char hello[] = "Hello World\n\r";
     HAL_UART_Transmit_IT(&debugUart, (uint8_t*) hello, strlen(hello));
 }
 
 void helloMeterbus(void *handle) {
-    static char hello[] = "Hello Meterbus\n\r";
-    if (! loopActive) {
-        loopEnable();
-        ledRed(false);
-    }
-
-    HAL_UART_Transmit_IT(&mbusUart, (uint8_t*) hello, strlen(hello));
+    mbusCommRequest(0x5b, 80);
 }
 
-void toggleLoop(void *handle) {
-    static bool state = false;
-
-    if (state) {
-        loopDisable();
-    } else {
-        ledRed(false);
-        loopEnable();
-    }
-    state ^= true;
-}
 
 void my_setup_2() {
     ledRed(false);
     ledGreen(true);
 
     schAdd(helloWorld, NULL, 0, 5000);
-    // schAdd(toggleLoop, NULL, 0, 10000);
     schAdd(helloMeterbus, NULL, 0, 10000);
 
 }

cube/User/Src/mbusComm.c

@@ -0,0 +1,74 @@
+#include <main.h>
+#include <usart.h>
+#include <PontCoopScheduler.h>
+#include <mbusComm.h>
+#include <loopCtrl.h>
+#include <led.h>
+
+
+
+typedef enum {
+    IDLE,
+    SEND,
+    SEND_CONT
+} e_mbusCommState;
+
+typedef struct {
+    e_mbusCommState state;
+    uint8_t retryCnt;
+    uint8_t cmd;
+    uint8_t addr;
+    uint8_t sendBuf[5];
+} t_mbusCommHandle;
+
+static t_mbusCommHandle mbusCommHandle = { .state = IDLE, .retryCnt = 0, .cmd = 0, .addr = 0 };
+
+
+static void handleRequestEngine(void *handle) {
+    t_mbusCommHandle *myHandle = (t_mbusCommHandle*) handle;
+
+    switch (myHandle->state) {
+        case IDLE:
+        break;
+
+        case SEND:
+        myHandle->sendBuf[0] = 0x10;
+        myHandle->sendBuf[1] = myHandle->cmd;
+        myHandle->sendBuf[2] = myHandle->addr;
+        myHandle->sendBuf[3] = myHandle->cmd + myHandle->addr; // checksum
+        myHandle->sendBuf[4] = 0x16;
+        myHandle->state = SEND_CONT;
+        // no break !!
+
+        case SEND_CONT:
+        ledRed(false);
+        if (! loopActive) {
+            myHandle->retryCnt++;
+            loopEnable();
+            schAdd(handleRequestEngine, handle, 10, 0);
+        } else {
+            // write(fd, sendBuf, 5);
+            HAL_UART_Transmit_IT(&mbusUart, myHandle->sendBuf, 5);
+            myHandle->state = IDLE;
+        }
+        break;
+
+        default:
+        myHandle->state = IDLE;
+        break;
+    }
+}
+
+
+void mbusCommRequest(uint8_t cmd, uint8_t addr) {
+    if (mbusCommHandle.state == IDLE) {
+        mbusCommHandle.state = SEND;
+        mbusCommHandle.retryCnt = 0;
+        mbusCommHandle.cmd = cmd;
+        mbusCommHandle.addr = addr;
+        schAdd(handleRequestEngine, (void*) &mbusCommHandle, 0, 0);
+    } else {
+        // busy
+    }
+}
+

cube/User/Src/ringbuffer.c

@@ -0,0 +1,105 @@
+#include <stdlib.h>
+#include <string.h>
+#include <ringbuffer.h>
+
+
+
+
+/*
+typedef struct {
+    uint32_t bufferReadIdx;
+    uint32_t bufferWriteIdx;
+    uint32_t bufferSize;
+    uint8_t* buffer;
+} ringbuffer_t;
+*/
+
+
+void ringbufferInit(ringbuffer_t *handle, uint32_t bufferSize) {
+    handle->bufferSize = bufferSize;
+    handle->buffer = (uint8_t*) malloc(handle->bufferSize);
+    memset(handle->buffer, 0, handle->bufferSize);
+    handle->bufferReadIdx = 0;
+    handle->bufferWriteIdx = 0;
+}
+
+void ringbufferFree(ringbuffer_t *handle) {
+    free(handle->buffer);
+    handle->buffer = NULL;
+    handle->bufferSize = 0;
+    handle->bufferReadIdx = 0;
+    handle->bufferWriteIdx = 0;    
+}
+
+/*
+void ringbufferPut(ringbuffer_t *handle, void *f) {
+    if (handle->bufferWriteIdx == (BUFFER_SIZE - 1)) {
+        while (handle->bufferReadIdx == BUFFER_SIZE);
+    } else {
+        while (handle->bufferReadIdx == (handle->bufferWriteIdx + 1));
+    }
+
+    handle->buffer[handle->bufferWriteIdx] = f;
+    handle->bufferWriteIdx++;
+
+    if (handle->bufferWriteIdx > BUFFER_SIZE) {
+        handle->bufferWriteIdx = 0;
+    }
+
+    pthread_mutex_lock(&(handle->eventMutex));
+    pthread_cond_signal(&(handle->eventSignal));
+    pthread_mutex_unlock(&(handle->eventMutex));
+}
+*/
+
+int ringbufferPut(ringbuffer_t *handle, uint8_t *data, uint32_t dataLen) {
+    uint32_t freeSpace = 0;
+    if (handle->bufferReadIdx == handle->bufferWriteIdx) {
+        freeSpace = handle->bufferSize;
+    } else if (handle->bufferReadIdx > handle->bufferWriteIdx) {
+        freeSpace = handle->bufferReadIdx - handle->bufferWriteIdx;
+    } else {
+        freeSpace = (handle->bufferSize - handle->bufferWriteIdx) + handle->bufferReadIdx;
+    }
+
+    if (dataLen > freeSpace) {
+        return -1;
+    }
+
+    if (dataLen <= (handle->bufferSize - handle->bufferWriteIdx)) {
+        memcpy(handle->buffer + handle->bufferWriteIdx, data, dataLen);
+        handle->bufferWriteIdx += dataLen;
+        if (handle->bufferWriteIdx == handle->bufferSize) {
+            handle->bufferWriteIdx = 0;
+        }
+    } else {
+        uint32_t remainingToTop = handle->bufferSize - handle->bufferWriteIdx;
+        memcpy(handle->buffer + handle->bufferWriteIdx, data, remainingToTop);
+        memcpy(handle->buffer, data + remainingToTop, dataLen - remainingToTop);
+        handle->bufferWriteIdx = dataLen - remainingToTop;
+    }
+
+    return 0;
+}
+
+bool ringbufferEmpty(ringbuffer_t *handle) {
+    return handle->bufferReadIdx == handle->bufferWriteIdx;
+}
+
+uint8_t *ringbufferGet(ringbuffer_t *handle, uint32_t dataLen) {
+    return NULL;
+}
+
+int ringbufferGetOne(ringbuffer_t *handle) {
+    int res = -1;
+    if (! ringbufferEmpty(handle)) {
+        uint8_t r = *(handle->buffer + handle->bufferReadIdx);
+        handle->bufferReadIdx += 1;
+        if (handle->bufferReadIdx == handle->bufferSize) {
+            handle->bufferReadIdx = 0;
+        }
+        res = (int) r;
+    }
+    return res;
+}
+