support for isKeyPressed()

Author: pschatzmann

src/AudioBoard.h

@@ -93,6 +93,9 @@ class AudioBoard {
     return *p_driver;
   }
 
+  // platform specific logic to determine if key is pressed
+  bool isKeyPressed(uint8_t key) { return p_pins->isKeyPressed(key); }
+
   operator bool() { return is_active && p_driver != nullptr && p_pins != nullptr;}
 
 protected:
@@ -104,6 +107,9 @@ class AudioBoard {
   bool is_active = false;
 };
 
+
+
+
 // -- Boards
 /// @ingroup audio_driver
 static AudioBoard AudioKitEs8388V1{AudioDriverES8388, PinsAudioKitEs8388v1};

src/Driver.h

@@ -1417,15 +1417,25 @@ class AudioDriverLyratMiniClass : public AudioDriver {
     AD_LOGI("AudioDriverLyratMiniClass::begin");
     p_pins = &pins;
     codec_cfg = codecCfg;
+
+    // setup SPI for SD
+    pins.setSPIActiveForSD(codecCfg.sd_active);
+
+    // Start ADC
     bool ok = true;
-    if (codecCfg.output_device != DAC_OUTPUT_NONE){
-      AD_LOGI("starting DAC");
-      ok = dac.begin(codecCfg, pins);
-    }
     if (codecCfg.input_device != ADC_INPUT_NONE){
       AD_LOGI("starting ADC");
-      ok = ok && adc.begin(codecCfg, pins);
+      ok = ok && adc.setConfig(codecCfg);
     }
+
+    // Start DAC
+    if (codecCfg.output_device != DAC_OUTPUT_NONE){
+      AD_LOGI("starting DAC");
+      ok = dac.setConfig(codecCfg);
+      adc.setPAPower(true);
+      setVolume(DRIVER_DEFAULT_VOLUME);
+    }
+
     if (!ok) {
       AD_LOGI("AudioDriverLyratMiniClass::begin failed");
     }

src/DriverPins.h

@@ -6,6 +6,10 @@
 #include "Utils/Optional.h"
 #include "Utils/Vector.h"
 
+#ifndef TOUCH_LIMIT
+#  define TOUCH_LIMIT 20
+#endif
+
 namespace audio_driver {
 
 /** @file */
@@ -48,6 +52,22 @@ enum class PinFunction {
   MCLK_SOURCE,
 };
 
+
+/**
+ * @enum AudioDriverKey
+ * @brief Key names
+ * @ingroup enumerations
+ * @ingroup audio_driver
+ */
+enum AudioDriverKeys {
+  KEY_REC = 0,
+  KEY_MODE,
+  KEY_PLAY,
+  KEY_SET,
+  KEY_VOLUME_DOWN,
+  KEY_VOLUME_UP
+};
+
 /**
  * @brief I2S pins
  * @author Phil Schatzmann
@@ -405,6 +425,15 @@ class DriverPins {
   /// Returns true if some function pins have been defined
   bool hasPins() { return !pins.empty(); }
 
+  /// returns true if pressed
+  virtual bool isKeyPressed(uint8_t key) {
+    auto pin_opt = getPin(PinFunction::KEY, key);
+    if (!pin_opt) return false;
+    auto pin = pin_opt.value();
+    bool value = digitalRead(pin.pin);
+    return pin.pin_logic == PinLogic::InputActiveLow ? !value : value;
+  }
+
  protected:
   audio_driver_local::Vector<PinsI2S> i2s{0};
   audio_driver_local::Vector<PinsSPI> spi{0};
@@ -488,12 +517,41 @@ class DriverPins {
   }
 };
 
+/**
+ * @brief Support for Touch
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+class DriverTouchClass : public DriverPins {
+#ifdef ESP32
+  bool isKeyPressed(uint8_t key) override {
+    auto pin_opt = getPin(PinFunction::KEY, key);
+    if (!pin_opt) return false;
+    auto pin = pin_opt.value();
+    int value = touchRead(pin.pin);
+    bool result = value <= touch_limit;
+    if (result) {
+      // retry to confirm reading
+      value = touchRead(pin.pin);
+      result = value <= touch_limit;
+    }
+    return result;
+  }
+#endif
+  void setTouchLimit(int limit){
+    touch_limit = limit;
+  }
+
+  protected:
+    int touch_limit = TOUCH_LIMIT;
+};
+
 /**
  * @brief Pins for Lyrat 4.3 - use the PinsLyrat43 object!
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class PinsLyrat43Class : public DriverPins {
+class PinsLyrat43Class : public DriverTouchClass {
  public:
   PinsLyrat43Class() {
     // sd pins
@@ -522,7 +580,7 @@ class PinsLyrat43Class : public DriverPins {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
-class PinsLyrat42Class : public DriverPins {
+class PinsLyrat42Class : public DriverTouchClass {
  public:
   PinsLyrat42Class() {
     // sd pins
@@ -568,7 +626,28 @@ class PinsLyratMiniClass : public DriverPins {
     addPin(PinFunction::LED, 22, PinLogic::Output, 1);
     addPin(PinFunction::LED, 27, PinLogic::Output, 2);
     addPin(PinFunction::MCLK_SOURCE, 0, PinLogic::Inactive);
+    addPin(PinFunction::KEY, 39, PinLogic::Input, 0);
   }
+
+  bool isKeyPressed(uint8_t key) override {
+    if (key > 5) return false;
+    int value = analogRead(39);
+    return inRange(value, analog_values[key]);    
+  }
+
+  void setRange(int value) {
+    range = value;
+  }
+
+protected:
+  // analog values for rec, mute, play, set, vol-, vol+
+  int analog_values[6] {2802, 2270, 1754, 1284, 827, 304};
+  int range = 5;
+
+  bool inRange(int in, int toBe){
+    return in >= (toBe-range)  &&  in <= (toBe+range); 
+  }
+
 };
 
 /**