wm8960 configuration

Author: pschatzmann

src/Driver.h

@@ -678,25 +678,40 @@ class AudioDriverWM8960Class : public AudioDriver {
     mtb_wm8960_free();
     return true;
   }
+
   bool setMute(bool enable) { return setVolume(enable ? 0 : volume_out); }
+
   /// Defines the Volume (in %) if volume is 0, mute is enabled,range is 0-100.
   bool setVolume(int volume) {
     setOutputVolume(volume);
     return true;
   };
   int getVolume() { return volume_out; }
+
   bool setInputVolume(int volume) {
     adjustInputVolume(volume);
     return true;
   }
   bool isVolumeSupported() { return true; }
+
   bool isInputVolumeSupported() { return true; }
 
+  /// Configuration: define retry count (default : 0)
+  void setI2CRetryCount(int cnt) { i2c_retry_count = cnt; }
+
+  /// Configuration: enable/diable PLL (active by default)
+  void setEnablePLL(bool active) { vs1053_enable_pll = active; }
+
+  /// Configuration: define master clock frequency (default: 0)
+  void setMclkHz(uint32_t hz ){
+    vs1053_mclk_hz = hz;
+  }
+
 protected:
-  int volume_in;
-  int volume_out;
-  int i2c_retry_count = 5;
-  int vs1053_mclk_hz = 0;
+  int volume_in = 100;
+  int volume_out = 100;
+  int i2c_retry_count = 0;
+  uint32_t vs1053_mclk_hz = 0;
   bool vs1053_enable_pll = true;
 
   void adjustInputVolume(int vol) {
@@ -751,7 +766,8 @@ class AudioDriverWM8960Class : public AudioDriver {
       vs1053_mclk_hz = 512 * codec_cfg.getRateNumeric();
     }
     if (!mtb_wm8960_configure_clocking(
-            vs1053_mclk_hz, vs1053_enable_pll, sampleRate(codec_cfg.getRateNumeric()),
+            vs1053_mclk_hz, vs1053_enable_pll,
+            sampleRate(codec_cfg.getRateNumeric()),
             wordLength(codec_cfg.getBitsNumeric()),
             modeMasterSlave(codec_cfg.i2s.mode == MODE_MASTER))) {
       AD_LOGE("mtb_wm8960_configure_clocking");

src/Driver/wm8960/mtb_wm8960.h

@@ -550,7 +550,6 @@ typedef enum
     WM8960_MODE_SLAVE  = WM8960_AUDIO_INTF0_MS_SLAVE    /**< Slave mode */
 } mtb_wm8960_mode_t;
 
-#ifdef ARDUINO
 
 /**
  * @brief Provide an alternative initialized Wire object. If this is not called we
@@ -561,9 +560,8 @@ typedef enum
  * @return true 
  * @return false 
  */
-bool mtb_wm8960_set_wire(TwoWire* i2c_inst);
+bool mtb_wm8960_set_wire(void* i2c_inst);
 
-#endif
 
 /**
  * @brief Defines the number of times we retry to update a register value via I2C.