I2S cli, fixed read=write pointer

Author: SciLor

BoxAudioBuffer.cpp

@@ -2,13 +2,18 @@
 
 void BoxAudioBuffer::init(uint8_t* buffer, uint16_t size) {
     _bufferStart = buffer;
-    _bufferEnd = buffer+size;
+    _bufferEnd = buffer+size-1;
     _bufferSize = size;
 
     _readPointer = _bufferStart;
     _writePointer = _bufferStart;
 
-    Log.info("BoxAudioBuffer init bufferStart=%X, _bufferEnd=%X, _bufferSize=%X, _readPointer=%X, _writePointer=%X", _bufferStart, _bufferEnd, _bufferSize, _readPointer, _writePointer);
+    _isFull = false;
+    _isEmpty = true;
+}
+
+void BoxAudioBuffer::logState() {
+    Log.info("BoxAudioBuffer bufferStart=%X, _bufferEnd=%X, _bufferSize=%X, _readPointer=%X, _writePointer=%X", _bufferStart, _bufferEnd, _bufferSize, _readPointer, _writePointer);
     Log.info(" getBytesReadable()=%X, getBytesReadableBlock()=%X, getBytesWritable()=%X, getBytesWritableBlock()=%X", getBytesReadable(), getBytesReadableBlock(), getBytesWritable(), getBytesWritableBlock());
 }
 
@@ -17,10 +22,22 @@ bool BoxAudioBuffer::readPointerEqualsWritePointer() {
 }
 
 bool BoxAudioBuffer::isEmpty(uint16_t threshold) {
-    return (getBytesReadable() <= threshold);
+    if (getBytesReadable() <= threshold) {
+        if (threshold == 0) {
+            return _isEmpty;
+        }
+        return true;
+    }
+    return false;
 }
 bool BoxAudioBuffer::isFull(uint16_t threshold) {
-    return (getBytesWritable() <= threshold);
+    if (getBytesWritable() <= threshold) {
+        if (threshold == 0) {
+            return _isFull;
+        }
+        return true;
+    }
+    return false;
 }
 
 uint8_t* BoxAudioBuffer::getReadPointer() {
@@ -31,7 +48,11 @@ void BoxAudioBuffer::updateReadPointer(uint16_t readLength) {
     if (readLength < readableBlock) {
         _readPointer += readLength;
     } else {
-        _readPointer = _bufferStart + (readLength - readableBlock - 1);
+        _readPointer = _bufferStart + (readLength - readableBlock);
+    }
+    if (readPointerEqualsWritePointer()) {
+        _isFull = false;
+        _isEmpty = true;
     }
 }
 
@@ -53,36 +74,48 @@ void BoxAudioBuffer::write(uint8_t* buffer, uint16_t size) {
         memcpy(_bufferStart, buffer + writableBlock, size - writableBlock);
         _writePointer = _bufferStart + (size - writableBlock);
     }
+    if (readPointerEqualsWritePointer()) {
+        _isEmpty = false;
+        _isFull = true;
+    }
     isWriting = false;
 }
 
 
 uint16_t BoxAudioBuffer::getBytesReadable() {
+    if (readPointerEqualsWritePointer() && _isEmpty)
+        return 0;
     return _measureDistance(_writePointer, _readPointer);
 }
 uint16_t BoxAudioBuffer::getBytesReadableBlock() {
+    if (readPointerEqualsWritePointer() && _isEmpty)
+        return 0;
     return _measureDistanceBlock(_writePointer, _readPointer);
 }
 
 uint16_t BoxAudioBuffer::getBytesWritable() {
+    if (readPointerEqualsWritePointer() && _isFull)
+        return 0;
     return _measureDistance(_readPointer, _writePointer);
 }
 uint16_t BoxAudioBuffer::getBytesWritableBlock() {
+    if (readPointerEqualsWritePointer() && _isFull)
+        return 0;
     return _measureDistanceBlock(_readPointer, _writePointer);
 }
 
 uint16_t BoxAudioBuffer::_measureDistance(uint8_t* p1, uint8_t* p2) {
     int32_t offset = p1 - p2;
 
-    if (offset >= 0)
+    if (offset > 0)
         return offset;
 
     return (_bufferEnd - p2 + 1) + (p1 - _bufferStart);
 }
 uint16_t BoxAudioBuffer::_measureDistanceBlock(uint8_t* p1, uint8_t* p2) {
     int32_t offset = p1 - p2;
 
-    if (offset >= 0)
+    if (offset > 0)
         return offset;
 
     return _bufferEnd - p2 + 1;

BoxAudioBuffer.h

@@ -8,6 +8,7 @@ class BoxAudioBuffer  {
         bool isWriting = false;
 
         void init(uint8_t* buffer, uint16_t size);
+        void logState();
 
         bool readPointerEqualsWritePointer();
 
@@ -29,6 +30,11 @@ class BoxAudioBuffer  {
     private:
         bool _ready = false;
 
+        bool
+            _isFull,
+            _isEmpty;
+        
+
         uint8_t* _bufferStart;
         uint8_t* _bufferEnd;
         uint16_t _bufferSize;

BoxCLI.cpp

@@ -41,6 +41,9 @@ void BoxCLI::begin() {
 
     cmdHelp = cli.addSingleArgumentCommand("help");
     cmdHelp.setDescription(" Show this screen");
+
+    cmdI2S = cli.addCmd("i2s");
+    cmdI2S.setDescription(" I2S debug information");
 }
 
 void BoxCLI::loop() {
@@ -73,6 +76,8 @@ void BoxCLI::parse() {
             execRFID();
         } else if (lastCmd == cmdLoad) {
             execLoad();
+        } else if (lastCmd == cmdI2S) {
+            execI2S();
         }
     }
 
@@ -290,6 +295,11 @@ void BoxCLI::execLoad() {
     }
 }
 
+void BoxCLI::execI2S() {
+    Box.boxDAC.audioBuffer.logState();
+    Box.boxDAC.logDmaIrqChanges();
+}
+
 unsigned long BoxCLI::parseNumber(String numberString) {
     const char* num = numberString.c_str();
     return parseNumber((char*)num);

BoxCLI.h

@@ -22,6 +22,7 @@ class BoxCLI : public EnhancedThread {
         Command cmdBeep;
         Command cmdRFID;
         Command cmdLoad;
+        Command cmdI2S;
 
         void parse();
         unsigned long
@@ -34,7 +35,8 @@ class BoxCLI : public EnhancedThread {
             execSpiRFID(),
             execBeep(),
             execRFID(),
-            execLoad();
+            execLoad(),
+            execI2S();
 };
 
 #endif

BoxDAC.cpp

@@ -161,7 +161,7 @@ void BoxDAC::fillBuffer(uint16_t timeoutMs) {
     //    Log.info("Playbuffer (nearly) full (%i/%i)", bufferFilled, PLAY_BUFFER_SIZE);
     //Log.info("Playbuffer (%i/%i)", bufferFilled, PLAY_BUFFER_SIZE);
     while(timeout.isRunning()) {
-        if (!audioBuffer.readPointerEqualsWritePointer() && audioBuffer.getBytesWritable()<4) //sic! Circual Buffer must not be full!
+        if (audioBuffer.getBytesWritable()<4) //sic! Circual Buffer must not be full!
             break;
 
         if (count % halfWavelength == 0) {
@@ -180,12 +180,15 @@ void BoxDAC::fillBuffer(uint16_t timeoutMs) {
     }
     if (!ready) {
         Log.info("XXXXXXXXXXXXXXXXXXX");
-        logAudioBuffer();
+        audioBuffer.logState();
         ready = true;
     }
 }
 
 void BoxDAC::dmaPingPingComplete() {
+    if (audioBuffer.isWriting)
+        return;
+
     unsigned long intStatus = MAP_uDMAIntStatus();
     unsigned int bytesReadable = audioBuffer.getBytesReadable();
     if (bytesReadable > 0)
@@ -203,10 +206,15 @@ void BoxDAC::dmaPingPingComplete() {
         unsigned long bufferSize = audioBuffer.getBytesReadableBlock();
         unsigned long size = bufferSize > I2S_PACKET_SIZE ? I2S_PACKET_SIZE : bufferSize;
         unsigned long elements = size / 2;
+        
+        if (size == 1) {
+            audioBuffer.updateReadPointer(1); //Workaround
+        }
+        size = elements * 2;
 
         if (MAP_uDMAChannelModeGet(UDMA_CH5_I2S_TX | UDMA_PRI_SELECT) == UDMA_MODE_STOP) {
         //if((pControlTable[ulPrimaryIndexRx].ulControl & UDMA_CHCTL_XFERMODE_M) == 0) {
-            if (elements==0) {
+            if (elements<4) {
                 ulPrimaryIndexRxEmpty++;
                 MAP_uDMAChannelTransferSet(UDMA_CH5_I2S_TX, UDMA_MODE_PINGPONG, (void *)aZeroBuffer, (void *)I2S_TX_DMA_PORT, I2S_PACKET_ELEMENTS);
             } else {
@@ -217,7 +225,7 @@ void BoxDAC::dmaPingPingComplete() {
             MAP_uDMAChannelEnable(UDMA_CH5_I2S_TX);
         } else if (MAP_uDMAChannelModeGet(UDMA_CH5_I2S_TX | UDMA_ALT_SELECT) == UDMA_MODE_STOP) {
         //} else if((pControlTable[ulAltIndexRx].ulControl & UDMA_CHCTL_XFERMODE_M) == 0) {
-            if (elements==0) {
+            if (elements<0) {
                 ulAltIndexRxEmpty++;
                 MAP_uDMAChannelTransferSet(UDMA_CH5_I2S_TX|UDMA_ALT_SELECT, UDMA_MODE_PINGPONG, (void *)aZeroBuffer, (void *)I2S_TX_DMA_PORT, I2S_PACKET_ELEMENTS);
             } else {