Cleanup Logging

Author: pschatzmann

README.md

@@ -118,6 +118,20 @@ I am providing a simple webserver which can render the audio data as wav result.
 - [streams-generator-webserver_wav](examples/streams-generator-webserver_wav) A Webserver which renders some generated sound
 - [streams-sam-webserver_wav](examples/streams-sam-webserver_wav) A Webserver which renders the result from the SAM TTS engine
 
+#### Logging
+
+The application uses a built in logger. You can adapt the loging by changing AudioConfig.h  
+
+```
+#define USE_AUDIO_LOGGING false
+```
+
+Per default we use the log level warning and the logging output is going to Serial. You can also change this in your sketch by calling AudioLogger begin with the output stream and the log level e.g:
+
+```
+AudioLogger::instance().begin(Serial, AudioLogger::Debug);
+```
+
 
 ## Optional Libraries
 

sandbox/streams-mozzi-webserver/streams-mozzi-webserver.ino

@@ -23,7 +23,7 @@ typedef int16_t sound_t;                                  // sound will be repre
 uint8_t channels = 1;                                     // The stream will have 2 channels 
 MozziGenerator mozzi(CONTROL_RATE);                       // subclass of SoundGenerator 
 GeneratedSoundStream<sound_t> in(mozzi, channels);        // Stream generated with mozzi
-AudioWAVServer server;
+AudioWAVServer server("network", "password");
 
 /// Copied from AMsynth.ino
 #define CONTROL_RATE 64 // Hz, powers of 2 are most reliable
@@ -48,19 +48,6 @@ Q8n0 octave_start_note = 42;
 void setup(){
   Serial.begin(115200);
 
-  // connect to WIFI
-  WiFi.begin("network", "password");
-  while (WiFi.status() != WL_CONNECTED){
-    Serial.print(".");
-    delay(500); 
-  }
-  Serial.println();
-  Serial.print("Connect to http://");
-  Serial.print(WiFi.localIP());
-
-  //start stream
-  in.begin();
-
   // We send the audio via the server
   server.begin(in, mozzi.config().sample_rate, channels);
 
@@ -69,6 +56,8 @@ void setup(){
   kNoteChangeDelay.set(200); // note duration ms, within resolution of CONTROL_RATE
   aModDepth.setFreq(13.f);     // vary mod depth to highlight am effects
   randSeed(); // reseed the random generator for different results each time the sketch runs
+
+  // Start Mozzi Stream
   in.begin();
 }
 
@@ -123,5 +112,5 @@ AudioOutput_t updateAudio(){
 
 // Arduino loop  
 void loop() {
-  server.copy();
+  server.doLoop();
 }

src/AudioConfig.h

@@ -6,7 +6,6 @@
  */
 #pragma once
 #include <string.h>
-#include "AudioTools/AudioLogger.h"
 /**
  * ------------------------------------------------------------------------- 
  * @brief Optional Functionality - comment out if not wanted
@@ -81,20 +80,5 @@
 #define USE_AUDIO_LOGGING true
 #endif 
 
-// Logging Implementation
-// #if USE_AUDIO_LOGGING && VARARG_SUPPORT
-// #define LOGD(...) AudioLogger::instance().printLog(__FILE__,__LINE__, AudioLogger::Debug,  __VA_ARGS__)
-// #define LOGI(...) AudioLogger::instance().printLog(__FILE__,__LINE__, AudioLogger::Info,  __VA_ARGS__)
-// #define LOGW(...) AudioLogger::instance().printLog(__FILE__,__LINE__, AudioLogger::Warning,  __VA_ARGS__)
-// #define LOGE(...) AudioLogger::instance().printLog(__FILE__,__LINE__, AudioLogger::Error, __VA_ARGS__)
-#if USE_AUDIO_LOGGING
-#define LOGD(...) snprintf(AudioLogger::instance().prefix(__FILE__,__LINE__, AudioLogger::Debug).str(),PRINTF_BUFFER_SIZE,__VA_ARGS__); AudioLogger::instance().println();
-#define LOGI(...) snprintf(AudioLogger::instance().prefix(__FILE__,__LINE__, AudioLogger::Info).str(),PRINTF_BUFFER_SIZE,__VA_ARGS__); AudioLogger::instance().println();
-#define LOGW(...) snprintf(AudioLogger::instance().prefix(__FILE__,__LINE__, AudioLogger::Warning).str(),PRINTF_BUFFER_SIZE,__VA_ARGS__); AudioLogger::instance().println();
-#define LOGE(...) snprintf(AudioLogger::instance().prefix(__FILE__,__LINE__, AudioLogger::Error).str(),PRINTF_BUFFER_SIZE,__VA_ARGS__); AudioLogger::instance().println();
-#else
-#define LOGD(...) 
-#define LOGI(...) 
-#define LOGW(...) 
-#define LOGE(...) 
-#endif
+#define LOG_LEVEL AudioLogger::Warning
+#define LOG_STREAM Serial

src/AudioTools/AudioLogger.h

@@ -10,13 +10,27 @@
 //#define VARARG_SUPPORT false
 //#endif
 
-#define LOG_LEVEL AudioLogger::Warning
-#define LOG_STREAM Serial
-
 #ifndef PRINTF_BUFFER_SIZE
 #define PRINTF_BUFFER_SIZE 160
 #endif
 
+// Logging Implementation
+// #if USE_AUDIO_LOGGING && VARARG_SUPPORT
+// #define LOGD(...) AudioLogger::instance().printLog(__FILE__,__LINE__, AudioLogger::Debug,  __VA_ARGS__)
+// #define LOGI(...) AudioLogger::instance().printLog(__FILE__,__LINE__, AudioLogger::Info,  __VA_ARGS__)
+// #define LOGW(...) AudioLogger::instance().printLog(__FILE__,__LINE__, AudioLogger::Warning,  __VA_ARGS__)
+// #define LOGE(...) AudioLogger::instance().printLog(__FILE__,__LINE__, AudioLogger::Error, __VA_ARGS__)
+#if USE_AUDIO_LOGGING
+#define LOGD(...) snprintf(AudioLogger::instance().prefix(__FILE__,__LINE__, AudioLogger::Debug).str(),PRINTF_BUFFER_SIZE,__VA_ARGS__); AudioLogger::instance().println();
+#define LOGI(...) snprintf(AudioLogger::instance().prefix(__FILE__,__LINE__, AudioLogger::Info).str(),PRINTF_BUFFER_SIZE,__VA_ARGS__); AudioLogger::instance().println();
+#define LOGW(...) snprintf(AudioLogger::instance().prefix(__FILE__,__LINE__, AudioLogger::Warning).str(),PRINTF_BUFFER_SIZE,__VA_ARGS__); AudioLogger::instance().println();
+#define LOGE(...) snprintf(AudioLogger::instance().prefix(__FILE__,__LINE__, AudioLogger::Error).str(),PRINTF_BUFFER_SIZE,__VA_ARGS__); AudioLogger::instance().println();
+#else
+#define LOGD(...) 
+#define LOGI(...) 
+#define LOGW(...) 
+#define LOGE(...) 
+#endif
 
 namespace audio_tools {
 

src/AudioTools/Buffers.h

@@ -1,6 +1,8 @@
 
 #pragma once
 
+#include "AudioTools/AudioLogger.h"
+
 #undef MIN
 #define MIN(A,B) ((A) < (B) ? (A) : (B))