Merge pull request #366 from FujiNetWIFI/sam

cat 40-char print buffers for SAM

Author: jeffpiep

include/version.h

@@ -10,8 +10,8 @@
 #define FN_VERSION_MAJOR 0
 #define FN_VERSION_MINOR 1
 
-#define FN_VERSION_BUILD "f201abd2"
+#define FN_VERSION_BUILD "50c31a74"
 
-#define FN_VERSION_DATE "2020-09-20 20:18:37"
+#define FN_VERSION_DATE "2020-09-24 02:16:34"
 
-#define FN_VERSION_FULL "0.1.f201abd2"
+#define FN_VERSION_FULL "0.1.50c31a74"

lib/sam/sam.c

@@ -98,7 +98,7 @@ void Init()
 #ifdef BOARD_HAS_PSRAM
     //buffer = (char*)ps_malloc(22050 * 5);
     // switch to ESP-IDF equivalent
-    buffer = (char *)heap_caps_malloc(22050 * 5, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
+    buffer = (char *)heap_caps_malloc(22050 * 10, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
 #else
     buffer = malloc(22050 * 5); // careful not to malloc too much!
 #endif

lib/sio/voice.cpp

@@ -8,7 +8,7 @@ using namespace std;
 
 void sioVoice::sio_sam_parameters()
 {
-    string s = string((char *)sioBuffer);
+    string s = string((char *)lineBuffer); // change to lineBuffer
     vector<string> tokens = util_tokenize(s, ' ');
 
     for (vector<string>::iterator it = tokens.begin(); it != tokens.end(); ++it)
@@ -56,17 +56,10 @@ void sioVoice::sio_sam()
 {
     int n = 0;
     char *a[16];
-    int i = 0;
+    // int i = 0;
 
-    memset(samBuffer,0,sizeof(samBuffer));
-    memset(a,0,sizeof(a));
-
-    while (sioBuffer[i] != EOL && i < 39)
-    {
-        i++;
-    }
-
-    sioBuffer[i] = '\0';
+    memset(samBuffer, 0, sizeof(samBuffer));
+    memset(a, 0, sizeof(a));
 
     // Construct parameter buffer.
     a[n++] = (char *)("sam");
@@ -126,7 +119,27 @@ void sioVoice::sio_write()
 
     if (ck == sio_checksum(sioBuffer, n))
     {
-        sio_sam();
+        // append sioBuffer onto lineBuffer until EOL is reached
+        // move this logic to append \0 into sio_write
+        uint8_t i = 0;
+        while (i < 40)
+        {
+            if (sioBuffer[i] != EOL && buffer_idx < 121)
+            {
+                lineBuffer[buffer_idx] = sioBuffer[i];
+                buffer_idx++;
+            }
+            else
+            {
+                lineBuffer[buffer_idx] = '\0';
+                buffer_idx = 0;
+                sio_sam();
+                // clear lineBuffer
+                memset(lineBuffer, 0, sizeof(lineBuffer));
+                break;
+            }
+            i++;
+        }
         sio_complete();
     }
     else
@@ -143,7 +156,7 @@ void sioVoice::sio_status()
 
     status[0] = 0;
     status[1] = lastAux1;
-    status[2] = 5;
+    status[2] = 15; // set timeout > 10 seconds (SAM audio buffer)
     status[3] = 0;
 
     sio_to_computer(status, sizeof(status), false);

lib/sio/voice.h

@@ -10,9 +10,10 @@ class sioVoice : public sioDevice
 protected:
     // act like a printer for POC
     uint8_t lastAux1 = 0;
-
+    uint8_t buffer_idx = 0;
     uint8_t sioBuffer[41];
-    uint8_t samBuffer[41];
+    uint8_t lineBuffer[121];
+    uint8_t samBuffer[121];
     void sio_write();
 
     void sio_process(uint32_t commanddata, uint8_t checksum) override;