AudioKitHAL

Author: pschatzmann

examples/examples-audiokit/basic-a2dp-audiokit/basic-a2dp-audiokit.ino

@@ -1,6 +1,6 @@
 #define USE_A2DP
 #include "AudioTools.h"
-#include "AudioLibs/AudioKitHAL.h"
+#include "AudioLibs/AudioKit.h"
 
 
 BluetoothA2DPSink a2dp_sink;

examples/examples-audiokit/player-sd-audiokit/player-sd-audiokit.ino

@@ -10,7 +10,7 @@
 #define USE_SDFAT
 #define USE_HELIX
 #include "AudioTools.h"
-#include "AudioLibs/AudioKitHAL.h"
+#include "AudioLibs/AudioKit.h"
 
 using namespace audio_tools;  
 

examples/examples-audiokit/player-url_icy-audiokit/README.md

@@ -8,9 +8,10 @@ You dont need to bother about any wires because everything is on one nice board.
 
 I also demonstrate how to assign your own actions to the buttons of the audio kit.
 
-### Note
+### Notes
 
-The log level has been set to Info to help you to identify any problems. Please change it to AudioLogger::Warning to get the best sound quality!
+- Do not forget to set the wifi name and password.
+- The log level has been set to Info to help you to identify any problems. Please change it to AudioLogger::Warning to get the best sound quality!
 
 
 ### Dependencies

examples/examples-audiokit/player-url_icy-audiokit/player-url_icy-audiokit.ino

@@ -11,7 +11,7 @@
 
 #include "AudioTools.h"
 #include "AudioCodecs/CodecMP3Helix.h"
-#include "AudioLibs/AudioKitHAL.h"
+#include "AudioLibs/AudioKit.h"
 
 using namespace audio_tools;  
 

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

@@ -9,7 +9,7 @@
 
 
 #include "AudioTools.h"
-#include "AudioLibs/AudioKitHAL.h"
+#include "AudioLibs/AudioKit.h"
 
 using namespace audio_tools;  
 

examples/examples-audiokit/streams-flite-audiokit/streams-flite-audiokit.ino

@@ -8,7 +8,7 @@
 
 #include "flite_arduino.h"
 #include "AudioTools.h"
-#include "AudioLibs/AudioKitHAL.h"
+#include "AudioLibs/AudioKit.h"
 
 using namespace audio_tools;
 

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

@@ -7,7 +7,7 @@
  */
 
 #include "AudioTools.h"
-#include "AudioLibs/AudioKitHAL.h"
+#include "AudioLibs/AudioKit.h"
 #include "flite_arduino.h"
 
 using namespace audio_tools;

src/AudioLibs/AudioKitHAL.h renamed to src/AudioLibs/AudioKit.h

@@ -1,10 +1,8 @@
 #pragma once
 
-#include "AudioKit.h"
+#include "AudioKitHAL.h"
 #include "AudioTools/AudioActions.h"
 
-#define KEY_RESPONSE_TIME_MS 10
-
 namespace audio_tools {
 
 class AudioKitStream;
@@ -231,7 +229,10 @@ class AudioKitStream : public AudioStreamX {
   bool setMute(bool mute) { return kit.setMute(mute); }
 
   /// Defines the Volume
-  bool setVolume(int vol) { return kit.setVolume(vol); }
+  bool setVolume(int vol) { 
+    volume_value = vol;
+    return kit.setVolume(vol);
+  }
 
   /// Determines the volume
   int volume() { return kit.volume(); }
@@ -241,13 +242,8 @@ class AudioKitStream : public AudioStreamX {
    *
    */
   void processActions() {
-//    LOGI(LOG_METHOD);
-//    static unsigned long keys_timeout = 0;
-//    if (keys_timeout < millis()) {
-      // LOGD(LOG_METHOD);
+//    LOGD(LOG_METHOD);
       actions.processActions();
-//      keys_timeout = millis() + KEY_RESPONSE_TIME_MS;
-//    }
     delay(1);
   }
 
@@ -263,7 +259,16 @@ class AudioKitStream : public AudioStreamX {
     actions.add(pin, action);
   }
 
-  void incrementVolume(int vol) { volume_value += vol; }
+  /**
+   * @brief Relative volume control
+   * 
+   * @param vol 
+   */
+  void incrementVolume(int vol) { 
+    volume_value += vol;
+    LOGI("incrementVolume: %d -> %d",vol, volume_value);
+    kit.setVolume(volume_value);
+  }
 
   /**
    * @brief Increase the volume
@@ -437,7 +442,7 @@ class AudioKitStream : public AudioStreamX {
   AudioKit kit;
   AudioKitStreamConfig cfg;
   AudioActions actions;
-  int volume_value = 20;
+  int volume_value = 40;
   bool active = true;
   // channel and sample size conversion support
   AudioKitStreamAdapter kit_stream = AudioKitStreamAdapter(&kit);