Deactivate Logging

Author: pschatzmann

src/AudioConfig.h

@@ -78,7 +78,7 @@
  */
 
 #ifndef USE_AUDIO_LOGGING
-#define USE_AUDIO_LOGGING true
+#define USE_AUDIO_LOGGING false
 #endif 
 
 // Logging Implementation

src/AudioTools/AudioLogger.h

@@ -1,13 +1,18 @@
 #pragma once
 
+#include "AudioConfig.h"
+
+#if USE_AUDIO_LOGGING
+
+
 #include "Stream.h"
 #include <cstdarg>
 
 #ifndef PRINTF_BUFFER_SIZE
 #define PRINTF_BUFFER_SIZE 160
 #endif
 
-#define LOG_LEVEL  AudioLogger::Warning
+#define LOG_LEVEL AudioLogger::Warning
 #define LOG_STREAM Serial
 
 
@@ -156,3 +161,5 @@ class AudioLogger {
 };
 
 }    
+
+#endif

src/AudioTools/MusicalNotes.h

@@ -4,114 +4,114 @@
 
 #pragma once
 
-#define C0  16
-#define CS0 17
-#define D0  18
-#define DS0 19
-#define E0  21
-#define F0  22
-#define FS0 23
-#define G0  25
-#define GS0 26
-#define A0  28
-#define AS0 29
-#define B0  31
-#define C1  33
-#define CS1 35
-#define D1  37
-#define DS1 39
-#define E1  41
-#define F1  44
-#define FS1 46
-#define G1  49
-#define GS1 52
-#define A1  55
-#define AS1 58
-#define B1  62
-#define C2  65
-#define CS2 69
-#define D2  73
-#define DS2 78
-#define E2  82
-#define F2  87
-#define FS2 93
-#define G2  98
-#define GS2 104
-#define A2  110
-#define AS2 117
-#define B2  123
-#define C3  131
-#define CS3 139
-#define D3  147
-#define DS3 156
-#define E3  165
-#define F3  175
-#define FS3 185
-#define G3  196
-#define GS3 208
-#define A3  220
-#define AS3 233
-#define B3  247
-#define C4  262
-#define CS4 277
-#define D4  294
-#define DS4 311
-#define E4  330
-#define F4  349
-#define FS4 370
-#define G4  392
-#define GS4 415
-#define A4  440
-#define AS4 466
-#define B4  494
-#define C5  523
-#define CS5 554
-#define D5  587
-#define DS5 622
-#define E5  659
-#define F5  698
-#define FS5 740
-#define G5  784
-#define GS5 831
-#define A5  880
-#define AS5 932
-#define B5  988
-#define C6  1047
-#define CS6 1109
-#define D6  1175
-#define DS6 1245
-#define E6  1319
-#define F6  1397
-#define FS6 1480
-#define G6  1568
-#define GS6 1661
-#define A6  1760
-#define AS6 1865
-#define B6  1976
-#define C7  2093
-#define CS7 2217
-#define D7  2349
-#define DS7 2489
-#define E7  2637
-#define F7  2794
-#define FS7 2960
-#define G7  3136
-#define GS7 3322
-#define A7  3520
-#define AS7 3729
-#define B7  3951
-#define C8  4186
-#define CS8 4435
-#define D8  4699
-#define DS8 4978
-#define E8  5274
-#define F8  5588
-#define FS8 5920
-#define G8  6272
-#define GS8 6645
-#define A8  7040
-#define AS8 7459
-#define B8  7902
+#define N_C0  16
+#define N_CS0 17
+#define N_D0  18
+#define N_DS0 19
+#define N_E0  21
+#define N_F0  22
+#define N_FS0 23
+#define N_G0  25
+#define N_GS0 26
+#define N_A0  28
+#define N_AS0 29
+#define N_B0  31
+#define N_C1  33
+#define N_CS1 35
+#define N_D1  37
+#define N_DS1 39
+#define N_E1  41
+#define N_F1  44
+#define N_FS1 46
+#define N_G1  49
+#define N_GS1 52
+#define N_A1  55
+#define N_AS1 58
+#define N_B1  62
+#define N_C2  65
+#define N_CS2 69
+#define N_D2  73
+#define N_DS2 78
+#define N_E2  82
+#define N_F2  87
+#define N_FS2 93
+#define N_G2  98
+#define N_GS2 104
+#define N_A2  110
+#define N_AS2 117
+#define N_B2  123
+#define N_C3  131
+#define N_CS3 139
+#define N_D3  147
+#define N_DS3 156
+#define N_E3  165
+#define N_F3  175
+#define N_FS3 185
+#define N_G3  196
+#define N_GS3 208
+#define N_A3  220
+#define N_AS3 233
+#define N_B3  247
+#define N_C4  262
+#define N_CS4 277
+#define N_D4  294
+#define N_DS4 311
+#define N_E4  330
+#define N_F4  349
+#define N_FS4 370
+#define N_G4  392
+#define N_GS4 415
+#define N_A4  440
+#define N_AS4 466
+#define N_B4  494
+#define N_C5  523
+#define N_CS5 554
+#define N_D5  587
+#define N_DS5 622
+#define N_E5  659
+#define N_F5  698
+#define N_FS5 740
+#define N_G5  784
+#define N_GS5 831
+#define N_A5  880
+#define N_AS5 932
+#define N_B5  988
+#define N_C6  1047
+#define N_CS6 1109
+#define N_D6  1175
+#define N_DS6 1245
+#define N_E6  1319
+#define N_F6  1397
+#define N_FS6 1480
+#define N_G6  1568
+#define N_GS6 1661
+#define N_A6  1760
+#define N_AS6 1865
+#define N_B6  1976
+#define N_C7  2093
+#define N_CS7 2217
+#define N_D7  2349
+#define N_DS7 2489
+#define N_E7  2637
+#define N_F7  2794
+#define N_FS7 2960
+#define N_G7  3136
+#define N_GS7 3322
+#define N_A7  3520
+#define N_AS7 3729
+#define N_B7  3951
+#define N_C8  4186
+#define N_CS8 4435
+#define N_D8  4699
+#define N_DS8 4978
+#define N_E8  5274
+#define N_F8  5588
+#define N_FS8 5920
+#define N_G8  6272
+#define N_GS8 6645
+#define N_A8  7040
+#define N_AS8 7459
+#define N_B8  7902
 
 namespace audio_tools {
 
@@ -157,15 +157,15 @@ class MusicalNotes {
 protected:
 
     uint16_t notes[9][12] = {
-        {C0, CS0, D0, DS0, E0, F0, FS0, G0, GS0, A0, AS0, B0},
-        {C1, CS1, D1, DS1, E1, F1, FS1, G1, GS1, A1, AS1, B1},
-        {C2, CS2, D2, DS2, E2, F2, FS2, G2, GS2, A2, AS2, B2},
-        {C3, CS3, D3, DS3, E3, F3, FS3, G3, GS3, A3, AS3, B3},
-        {C4, CS4, D4, DS4, E4, F4, FS4, G4, GS4, A4, AS4, B4},
-        {C5, CS5, D5, DS5, E5, F5, FS5, G5, GS5, A5, AS5, B5},
-        {C6, CS6, D6, DS6, E6, F6, FS6, G6, GS6, A6, AS6, B6},
-        {C7, CS7, D7, DS7, E7, F7, FS7, G7, GS7, A7, AS7, B7},
-        {C8, CS8, D8, DS8, E8, F8, FS8, G8, GS8, A8, AS8, B8}
+        {N_C0, N_CS0, N_D0, N_DS0, N_E0, N_F0, N_FS0, N_G0, N_GS0, N_A0, N_AS0, N_B0},
+        {N_C1, N_CS1, N_D1, N_DS1, N_E1, N_F1, N_FS1, N_G1, N_GS1, N_A1, N_AS1, N_B1},
+        {N_C2, N_CS2, N_D2, N_DS2, N_E2, N_F2, N_FS2, N_G2, N_GS2, N_A2, N_AS2, N_B2},
+        {N_C3, N_CS3, N_D3, N_DS3, N_E3, N_F3, N_FS3, N_G3, N_GS3, N_A3, N_AS3, N_B3},
+        {N_C4, N_CS4, N_D4, N_DS4, N_E4, N_F4, N_FS4, N_G4, N_GS4, N_A4, N_AS4, N_B4},
+        {N_C5, N_CS5, N_D5, N_DS5, N_E5, N_F5, N_FS5, N_G5, N_GS5, N_A5, N_AS5, N_B5},
+        {N_C6, N_CS6, N_D6, N_DS6, N_E6, N_F6, N_FS6, N_G6, N_GS6, N_A6, N_AS6, N_B6},
+        {N_C7, N_CS7, N_D7, N_DS7, N_E7, N_F7, N_FS7, N_G7, N_GS7, N_A7, N_AS7, N_B7},
+        {N_C8, N_CS8, N_D8, N_DS8, N_E8, N_F8, N_FS8, N_G8, N_GS8, N_A8, N_AS8, N_B8}
     };
 
 

src/AudioWAVServer.h

@@ -28,8 +28,8 @@ class AudioWAVServer {
      * @param password 
      */
     AudioWAVServer(const char* network, const char *password) {
-        this->network = network;
-        this->password = password;
+        this->network = (char*)network;
+        this->password = (char*)password;
     }
 
     /**
@@ -39,10 +39,11 @@ class AudioWAVServer {
      * @param sample_rate 
      * @param channels 
      */
-    void begin(Stream &in, int sample_rate, int channels) {
+    void begin(Stream &in, int sample_rate, int channels, int bits_per_sample=16) {
         this->in = ∈
         this->sample_rate = sample_rate;
         this->channels = channels;
+        this->bits_per_sample = bits_per_sample;
 
         connectWiFi();
 
@@ -57,11 +58,12 @@ class AudioWAVServer {
      * @param sample_rate 
      * @param channels 
      */
-    void begin(AudioWAVServerDataCallback cb, int sample_rate, int channels) {
+    void begin(AudioWAVServerDataCallback cb, int sample_rate, int channels, int bits_per_sample=16) {
         this->in =nullptr;
         this->callback = cb;
         this->sample_rate = sample_rate;
         this->channels = channels;
+        this->bits_per_sample = bits_per_sample;
 
         connectWiFi();
 
@@ -115,12 +117,13 @@ class AudioWAVServer {
     // WIFI
     WiFiServer server = WiFiServer(80);
     WiFiClient client;
-    const char *password = nullptr;
-    const char *network = nullptr;
+    char *password = nullptr;
+    char *network = nullptr;
 
     // Sound Generation
     int sample_rate;
     int channels;
+    int bits_per_sample;
 
     AudioWAVServerDataCallback callback = nullptr;
     Stream *in = nullptr;                    
@@ -132,17 +135,15 @@ class AudioWAVServer {
         LOGD("connectWiFi");
         if (WiFi.status() != WL_CONNECTED && network!=nullptr && password != nullptr){
             WiFi.begin(network, password);
-            WiFi.setSleep(false);
+            //WiFi.setSleep(false);
             while (WiFi.status() != WL_CONNECTED){
                 Serial.print(".");
                 delay(500); 
             }
             Serial.println();
         }
-        char msg[80];
-        sprintf(msg, "IP address: %s",WiFi.localIP().toString().c_str());
-        LOGI(msg);
-        Serial.println(msg);
+        Serial.print("IP address: ");
+        Serial.println(WiFi.localIP());
     }
 
     void sendReply(){
@@ -158,16 +159,17 @@ class AudioWAVServer {
         config.channels = channels;
         config.sample_rate = sample_rate;
         //config.data_length = data_length;
+        config.bits_per_sample = bits_per_sample;
         config.is_streamed = true;
         encoder.begin(client, config);
 
-        // copy only for stream
         if (callback!=nullptr){
-            LOGI("sendReply - calling callback");
             // provide data via Callback
+            LOGI("sendReply - calling callback");
             callback(wav_stream);
             client.stop();
         } else {
+            // provide data for stream
             LOGI("sendReply - Returning WAV stream...");
             copier.begin(wav_stream, *in);
         }