Cleanup

Author: pschatzmann

examples/examples-stream/streams-audiokit-csv/streams-audiokit-csv.ino

@@ -14,16 +14,17 @@
 using namespace audio_tools;  
 
 AudioKitStream kit; // Access I2S as stream
-CsvStream<int32_t> csvStream(Serial);
+CsvStream<int16_t> csvStream(Serial);
 StreamCopy copier(csvStream, kit); // copy kit to csvStream
 
 // Arduino Setup
 void setup(void) {
     Serial.begin(115200);
-    AudioLogger::instance().begin(Serial, AudioLogger::Info);
+    AudioLogger::instance().begin(Serial, AudioLogger::Debug);
 
     auto cfg = kit.defaultConfig(RX_MODE);
-    cfg.input_device = ADC_INPUT_MIC2;
+    cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2;
+    cfg.use_apll = true;
     kit.begin(cfg);
 
     // make sure that we have the correct channels set up
@@ -34,4 +35,4 @@ void setup(void) {
 // Arduino loop - copy data
 void loop() {
     copier.copy();
-}
+}

examples/examples-stream/streams-pins-audiokit/streams-pins-audiokit.ino

@@ -37,10 +37,10 @@ void setup() {
   kit.addAction(PIN_KEY4, button4);
 
   // example with actions using lambda expression
-  auto up = []() { AudioKitStream::actionVolumeDown(); flite.say("Volume down"); };
-  kit.addAction(PIN_KEY5, up);
-  auto down = []() { AudioKitStream::actionVolumeUp(); flite.say("Volume up");   };
-  kit.addAction(PIN_KEY6, down);
+  auto down = []() { AudioKitStream::actionVolumeDown(); flite.say("Volume down"); };
+  kit.addAction(PIN_KEY5, down);
+  auto up = []() { AudioKitStream::actionVolumeUp(); flite.say("Volume up");   };
+  kit.addAction(PIN_KEY6, up);
 
   flite.say("Please push a button");
 }

src/AudioHttp/Str.h

@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "AudioTools/AudioLogger.h"
+#include "AudioHttp/Str.h"
 
 namespace audio_tools {
 
@@ -580,6 +581,23 @@ class Str {
              }
         }
 
+        /// provides a binary string represntation
+        static const char* toBinary(void const * const ptr, size_t const size ){
+            static char result[160];
+            unsigned char *b = (unsigned char*) ptr;
+            unsigned char byte;
+            int i, j, idx=0;
+            
+            for (i = size-1; i >= 0; i--) {
+                for (j = 7; j >= 0; j--) {
+                    byte = (b[i] >> j) & 1;
+                    result[idx++] = byte ? '1' : '0';
+                }
+            }
+            result[idx]=0;
+            return result;
+        }
+
     protected:
         char* chars = nullptr;
         bool is_const=false;

src/AudioTools/AudioActions.h

@@ -1,7 +1,14 @@
 #pragma once
 #include "Arduino.h"
+
+#ifndef ACTIONS_MAX
 #define ACTIONS_MAX 20
+#endif
+
+#ifndef DEBOUNCE_DELAY
 #define DEBOUNCE_DELAY 500
+#endif
+
 /**
  * @brief A simple class to assign Functions to Pins e.g. to implement a simple
  * navigation control or volume control with buttons