compile errors in examples

Author: pschatzmann

examples/audiotools/audiotools-custom-max/audiotools-custom-max.ino

@@ -11,7 +11,7 @@ AudioInfo info(44100, 2, 16);
 SineWaveGenerator<int16_t> sineWave(32000);
 GeneratedSoundStream<int16_t> sound(sineWave);
 DriverPins my_pins;
-AudioBoard board(&AudioDriverES8388, my_pins);
+AudioBoard board(AudioDriverES8388, my_pins);
 I2SCodecStream out(board);
 StreamCopy copier(out, sound);
 

examples/audiotools/audiotools-custom-min/audiotools-custom-min.ino

@@ -10,7 +10,7 @@
 AudioInfo info(44100, 2, 16);
 SineWaveGenerator<int16_t> sineWave(32000);
 GeneratedSoundStream<int16_t> sound(sineWave);
-AudioBoard board(&AudioDriverES8388);
+AudioBoard board(AudioDriverES8388);
 I2SCodecStream out(board);
 StreamCopy copier(out, sound);
 

examples/audiotools/audiotools-standard/audiotools-standard.ino

@@ -19,12 +19,6 @@ void setup() {
   AudioLogger::instance().begin(Serial, AudioLogger::Info);
   LOGLEVEL_AUDIODRIVER = AudioDriverInfo;
 
-  // setup pins
-  // - add i2c codec pins: scl, sda, port, (I2C object)
-  my_pins.addI2C(CODEC, 32, 22, 0x20, 100000, Wire);
-  // - add i2s pins: mclk, bclk, ws, data_out, data_in
-  my_pins.addI2S(CODEC, 0, 14, 15, 22);
-
   // start I2S & codec with i2c and i2s configured above
   Serial.println("starting I2S...");
   auto config = out.defaultConfig();

examples/custom/custom-max/custom-max.ino

@@ -7,7 +7,8 @@
 
 #include "AudioBoard.h"
 
-AudioBoard board(&AudioDriverES8388);
+DriverPins my_pins;
+AudioBoard board(AudioDriverES8388);
 
 void setup() {
   // add i2c codec pins: scl, sda, port

examples/custom/custom-min/custom-min.ino

@@ -6,7 +6,7 @@
 
 #include "AudioBoard.h"
 
-AudioBoard board(&AudioDriverES8388, my_pins);
+AudioBoard board(AudioDriverES8388);
 
 void setup() {
   // start I2C for the communication with the codec

examples/custom/custom-standard/custom-standard.ino

@@ -1,5 +1,5 @@
 /**
- * @brief We just set up the codec for a predefined board (AudioDriverES8388)
+ * @brief We just set up the codec for a predefined board (AudioKitEs8388V1)
  * @author phil schatzmann
  */
 
@@ -14,7 +14,7 @@ void setup() {
   cfg.i2s.rate = RATE_44K;
   // cfg.i2s.fmt = I2S_NORMAL;
   // cfg.i2s.mode = MODE_SLAVE;
-  AudioDriverES8388.begin(cfg);
+  AudioKitEs8388V1.begin(cfg);
 }
 
 void loop() {}

src/Utils/I2C.cpp

@@ -26,23 +26,6 @@ error_t i2c_bus_write_bytes(i2c_bus_handle_t bus, int addr, uint8_t *reg,
   return result;
 }
 
-error_t i2c_bus_write_data(i2c_bus_handle_t bus, int addr, uint8_t *data,
-                             int datalen) {
-  AUDIODRIVER_LOGD("i2c_bus_write_data: addr=%d len=%d", addr, datalen);
-  TwoWire *p_wire = (TwoWire *)bus;
-  assert(datalen == 1);
-  assert(p_wire!=nullptr);
-
-  int result = RESULT_OK;
-  p_wire->beginTransmission(addr >> 1);
-  p_wire->write(data, datalen);
-  int rc = p_wire->endTransmission(I2C_END);
-  if (rc != 0) {
-    AUDIODRIVER_LOGE("->p_wire->endTransmission: %d", rc);
-    result = RESULT_FAIL;
-  }
-  return result;
-}
 
 /// This method is used
 error_t i2c_bus_read_bytes(i2c_bus_handle_t bus, int addr, uint8_t *reg,

src/Utils/I2C.h

@@ -24,19 +24,6 @@ extern "C" {
  */
 error_t i2c_bus_write_bytes(i2c_bus_handle_t bus, int addr, uint8_t *reg, int regLen, uint8_t *data, int datalen);
 
-/**
- * @brief Write data to I2C bus
- *
- * @param bus        I2C bus handle
- * @param addr       The address of the device
- * @param data       The data pointer
- * @param datalen    The length of data
- *
- * @return
- *     - NULL Fail
- *     - Others Success
- */
-error_t i2c_bus_write_data(i2c_bus_handle_t bus, int addr, uint8_t *data, int datalen);
 
 /**
  * @brief Read bytes to I2C bus

src/Utils/etc.h

@@ -26,9 +26,9 @@ extern "C" {
 #endif
 
 #ifndef ARDUINO
-extern void pinMode(int, int);
-extern void digitalWrite(int, int);
-extern void delay(uint32_t);
+void pinMode(int, int);
+void digitalWrite(int, int);
+void delay(uint32_t);
 #endif