Cleanup

Author: pschatzmann

src/ArdBtSource.cpp

@@ -67,7 +67,6 @@ int32_t get_stk_data(uint8_t *data, int32_t len) {
 
     if (logTime < millis()){
       logTime = millis()+5000;
-      ESP_LOGD(APP_ArdBtSource, "Playing %s sound!", hasSoundData ? "" : "no" );
       hasSoundData = false;
     }
 

src/ArdConfig.h

@@ -20,6 +20,7 @@
     #define __RTOS__            // supports Free RTOS
     #define __LWIP__            // use lwip socket implementation
     #define TASK_STACK_SIZE configMINIMAL_STACK_SIZE
+    #define RAWWAVE_PATH "/sdcard/rawwaves/"
 
 //  Uncomment after installing https://github.com/pschatzmann/ESP32-A2DP
 //  #define __BT_A2DP__         // output to A2DP sink
@@ -31,6 +32,7 @@
     #define __NO_EXCEPTIONS__   // comment out exceptions
     #define __NO_FSTREAM__      // No Messanger, MidiFileIn and Skini and FileRead
     #define __NO_RT__           // no STK RT functions
+    #define RAWWAVE_PATH "/sdcard/rawwaves/"
 
     #include "FS.h"
     #undef round
@@ -42,11 +44,7 @@
     #define __NO_EXCEPTIONS__   // comment out exceptions
     #define __NO_FSTREAM__      // No Messanger, MidiFileIn and Skini and FileRead
     #define __NO_RT__           // no STK RT functions
-
-    // Logging support
-    #define STK_ERROR_MSG_LEN 200
-    extern char stk_error_msg[STK_ERROR_MSG_LEN];
-    #define ESP_LOGD(APP,...) { snprintf(stk_error_msg, STK_ERROR_MSG_LEN, __VA_ARGS__); Serial.println(stk_error_msg); }
+    #define RAWWAVE_PATH "/rawwaves/"
 
 #elif defined(IS_DESKTOP)
 //  #define __MIDI__            // support Midi 
@@ -56,11 +54,6 @@
 //    #define __NO_FSTREAM__      // No Messanger, MidiFileIn and Skini and FileRead
 //    #define __NO_RT__           // no STK RT functions
 
-    // Logging support
-    #define STK_ERROR_MSG_LEN 200
-    extern char stk_error_msg[STK_ERROR_MSG_LEN];
-    #define ESP_LOGD(APP,...) { snprintf(stk_error_msg, STK_ERROR_MSG_LEN, __VA_ARGS__); Serial.println(stk_error_msg); }
-
 #endif
 
 // rtos must be loaded on top of other classes - so we add it here

src/ArdUdp.cpp

@@ -1,5 +1,7 @@
 
+#include <ArdStkLogger.h>
 #include <ArdUdp.h>
+
 #ifdef ARDUPD_H
 
 namespace stk {
@@ -29,11 +31,11 @@ size_t ArdUdp :: write(const uint8_t * buffer, size_t size ) {
         result = WiFiUDP::write(buffer, size);
         if (result>0){
             bool packetOk = this->endPacket();
-            ESP_LOGD(APP_ArdUdp, "x%x, Number of bytes have %s been sent out: %d ", __func__, packetOk?"":"not", result);
+            STK_LOGD("x%x, Number of bytes have %s been sent out: %d ", __func__, packetOk?"":"not", result);
         }
         //this->flush();
     } else {
-        ESP_LOGD(APP_ArdUdp, "x%x, beginPacked has failed ", __func__);
+        STK_LOGD("x%x, beginPacked has failed ", __func__);
         this->isValidHostFlag = false;
     }
     return result;

src/MemoryFS.cpp

@@ -74,8 +74,6 @@ void MemoryFS :: close(){
 
 
 bool MemoryFS :: fileRead( StkFrames& frames, unsigned long startFrame, bool doNormalize ){
-  //ESP_LOGD(APP_VFS, "x%x, %s: reading %d from start %ld of %ld", __func__, p_fd->name, frames.size(), startFrame, this->getSize());
-
   // data is available as array of uint16_t
   bool is_finished = false;
 

src/Stk.h

@@ -578,11 +578,7 @@ const unsigned int RT_BUFFER_SIZE = 512;
 // move the rawwaves directory to a different location in your file
 // system, you will need to set this path definition appropriately.
 #if !defined(RAWWAVE_PATH)
-#  ifdef ESP32
-#    define RAWWAVE_PATH "/sdcard/rawwaves/"
-#  else
-#    define RAWWAVE_PATH "../../rawwaves/"
-#  endif
+#  define RAWWAVE_PATH "../../rawwaves/"
 #endif
 
 const StkFloat STK_PI           = 3.14159265358979;

src/StkAll.h

@@ -97,6 +97,7 @@
 #include "WvIn.h"
 #include "WvOut.h"
 #ifdef ARDUINO
+#include "ArdStkLogger.h"
 #include "ArdBtSource.h"
 #include "ArdCommonOut.h"
 #include "ArdConfig.h"