peek method

Author: lucasssvaz

Diff for: cores/esp32/cbuf.cpp

@@ -160,11 +160,23 @@ bool cbuf::full() const
 
 int cbuf::peek()
 {
-    return -1;
+    CBUF_MUTEX_LOCK();
+    Ringbuffer_t *pxRingbuffer = (Ringbuffer_t *)_buf;
+    size_t bytes_available = available();
+    if(!bytes_available){
+        CBUF_MUTEX_UNLOCK();
+        return 0;
+    }
+
+    int c = *(pxRingbuffer->pucRead);
+    CBUF_MUTEX_UNLOCK();
+
+    return c;
 }
 
 size_t cbuf::peek(char *dst, size_t size)
 {
+    /* TO DO */
     return 0;
 }
 

Diff for: cores/esp32/cbuf.h

@@ -28,6 +28,41 @@
 #include "freertos/ringbuf.h"
 #include "freertos/semphr.h"
 
+
+typedef struct RingbufferDefinition Ringbuffer_t;
+typedef BaseType_t (*CheckItemFitsFunction_t)(Ringbuffer_t *pxRingbuffer, size_t xItemSize);
+typedef void (*CopyItemFunction_t)(Ringbuffer_t *pxRingbuffer, const uint8_t *pcItem, size_t xItemSize);
+typedef BaseType_t (*CheckItemAvailFunction_t) (Ringbuffer_t *pxRingbuffer);
+typedef void *(*GetItemFunction_t)(Ringbuffer_t *pxRingbuffer, BaseType_t *pxIsSplit, size_t xMaxSize, size_t *pxItemSize);
+typedef void (*ReturnItemFunction_t)(Ringbuffer_t *pxRingbuffer, uint8_t *pvItem);
+typedef size_t (*GetCurMaxSizeFunction_t)(Ringbuffer_t *pxRingbuffer);
+
+typedef struct RingbufferDefinition {
+    size_t xSize;                               //Size of the data storage
+    size_t xMaxItemSize;                        //Maximum item size
+    UBaseType_t uxRingbufferFlags;              //Flags to indicate the type and status of ring buffer
+
+    CheckItemFitsFunction_t xCheckItemFits;     //Function to check if item can currently fit in ring buffer
+    CopyItemFunction_t vCopyItem;               //Function to copy item to ring buffer
+    GetItemFunction_t pvGetItem;                //Function to get item from ring buffer
+    ReturnItemFunction_t vReturnItem;           //Function to return item to ring buffer
+    GetCurMaxSizeFunction_t xGetCurMaxSize;     //Function to get current free size
+
+    uint8_t *pucAcquire;                        //Acquire Pointer. Points to where the next item should be acquired.
+    uint8_t *pucWrite;                          //Write Pointer. Points to where the next item should be written
+    uint8_t *pucRead;                           //Read Pointer. Points to where the next item should be read from
+    uint8_t *pucFree;                           //Free Pointer. Points to the last item that has yet to be returned to the ring buffer
+    uint8_t *pucHead;                           //Pointer to the start of the ring buffer storage area
+    uint8_t *pucTail;                           //Pointer to the end of the ring buffer storage area
+
+    BaseType_t xItemsWaiting;                   //Number of items/bytes(for byte buffers) currently in ring buffer that have not yet been read
+    List_t xTasksWaitingToSend;                 //List of tasks that are blocked waiting to send/acquire onto this ring buffer. Stored in priority order.
+    List_t xTasksWaitingToReceive;              //List of tasks that are blocked waiting to receive from this ring buffer. Stored in priority order.
+    QueueSetHandle_t xQueueSet;                 //Ring buffer's read queue set handle.
+
+    portMUX_TYPE mux;                           //Spinlock required for SMP
+} Ringbuffer_t;
+
 class cbuf
 {
 public: