sd_mmc

Author: pschatzmann

examples/sdbegin/sdbegin.ino examples/sd_begin/sd_begin.inoexamples/sdbegin/sdbegin.ino renamed to examples/sd_begin/sd_begin.ino

@@ -4,6 +4,8 @@
  * @brief  A simple test if we can start the SD of the AudioKit
  * @date 2021-12-10
  * 
+ * On the AI Thinker boards the pin settings should be Off, On, On, Off, Off,
+ * 
  * @copyright Copyright (c) 2021
  * 
  */
@@ -15,7 +17,7 @@ AudioKit kit;
 
 void setup(){
     Serial.begin(115200);
-    if(!SD.begin(kit.pinSpiCs())){
+    if(!SD.begin(kit.pinSpiCs(), AUDIOKIT_SD_SPI)){
         Serial.println("Card Mount Failed");
         return;
     } else {

examples/sdmmc_begin/sdmmc_begin.ino

@@ -0,0 +1,33 @@
+/**
+ * @file sdmmc_begin.ino
+ * @author Phil Schatzmann
+ * @brief  A simple test if we can start the SD via SDMMC of the AudioKit
+ * @date 2022-5-12
+ *
+ *  On the AI Thinker boards the pin settings should be On, On, On, On, On,
+ *
+ * @copyright Copyright (c) 2021
+ * 
+ */
+
+#include "AudioKitHAL.h"
+#include "SD_MMC.h"
+
+AudioKit kit;
+
+void setup(){
+    Serial.begin(115200);
+    auto cfg = kit.defaultConfig();
+    cfg.sd_active = false
+    kit.begin(cfg);
+    if(!SD_MMC.begin("/sdcard", true)){    // 1-bit mode
+        Serial.println("Card Mount Failed");
+        return;
+    } else {
+        Serial.println("Card Mount Success");
+    }
+}
+
+void loop() {
+
+}

src/AudioKitHAL.h

@@ -50,6 +50,8 @@ typedef uint32_t eps32_i2s_audio_sample_rate_type;
 class AudioKit;
 class AudioKit* selfAudioKit = nullptr;
 
+SPIClass SPI_VSPI(VSPI);
+
 /**
  * @brief Configuation for AudioKit
  *
@@ -230,8 +232,10 @@ class AudioKit {
     cfg = cnfg;
     KIT_LOGI("Selected board: %d", AUDIOKIT_BOARD);
 
-    // setup SPI for SD card
-    setupSPI();
+    // release SPI for SD card if it is not necessary
+    if (AUDIOKIT_SETUP_SD && !cfg.sd_active){
+      p_spi->end();
+    }
 
     // setup headphone if necessary
     setupHeadphoneDetection();
@@ -549,7 +553,7 @@ class AudioKit {
   bool headphoneIsConnected = false;
   unsigned long speakerChangeTimeout = 0;
   int8_t headphonePin = -1;
-  bool setup_sd_spi = true;
+  SPIClass *p_spi = &AUDIOKIT_SD_SPI;
 
   /**
    * @brief Setup the headphone detection
@@ -576,15 +580,12 @@ class AudioKit {
   void setupSPI() {
 //  I assume this is valid for all AudioKits!
 #if AUDIOKIT_SETUP_SD==1
-    if (cfg.sd_active && setup_sd_spi){
       KIT_LOGI(LOG_METHOD);
       spi_cs_pin = PIN_AUDIO_KIT_SD_CARD_CS;
       pinMode(spi_cs_pin, OUTPUT);
       digitalWrite(spi_cs_pin, HIGH);
 
-      SPI.begin(PIN_AUDIO_KIT_SD_CARD_CLK, PIN_AUDIO_KIT_SD_CARD_MISO, PIN_AUDIO_KIT_SD_CARD_MOSI, PIN_AUDIO_KIT_SD_CARD_CS);
-      setup_sd_spi = false;
-    }
+      p_spi->begin(PIN_AUDIO_KIT_SD_CARD_CLK, PIN_AUDIO_KIT_SD_CARD_MISO, PIN_AUDIO_KIT_SD_CARD_MOSI, PIN_AUDIO_KIT_SD_CARD_CS);    
 #else
     #warning "SPI initialization for the SD drive not supported - you might need to take care of this yourself" 
     cfg.sd_active = false;

src/AudioKitSettings.h

@@ -33,6 +33,8 @@
 // 1 = Using Arduino Wire Library; 0 = Use ESP32 I2C API
 #ifndef AUDIOKIT_USE_WIRE
 #define AUDIOKIT_USE_WIRE 1
+// for AUDIOKIT_WIRE use Wire or Wire1
+#define AUDIOKIT_WIRE Wire1
 #endif
 
 #ifdef ESP32
@@ -45,8 +47,11 @@
 #define AUDIOKIT_MUTEX_SUPPORT 1
 #endif
 
+// This reserves a SPI port
 #ifndef AUDIOKIT_SETUP_SD
 #define AUDIOKIT_SETUP_SD 1
+// for AUDIOKIT_SD_SPI you can select SPI or SPI_VSPI
+#define AUDIOKIT_SD_SPI SPI
 #endif
 
 // to increase the max volume e.g. for ai_thinker (ES8388) 2957 -> set to 1
@@ -55,3 +60,5 @@
 #endif
 
 #endif
+
+

src/audio_driver/ac101/ac101.c

@@ -167,10 +167,8 @@ esp_err_t ac101_init(audio_hal_codec_config_t *codec_cfg)
 	{
 		KIT_LOGE("reset failed!");
 		return res;
-	}
-	else
-	{
-		KIT_LOGW("reset succeed");
+	} else {
+		KIT_LOGI("reset");
 	}
 	res |= ac101_write_reg(SPKOUT_CTRL, 0xe880);
 

src/audio_hal/i2c_wire.cpp

@@ -1,5 +1,5 @@
 /**
- * @file i2c_wire.cpp
+ * @file i2c_p_wire->cpp
  * @author Phil Schatzmann
  * @brief I2S Implementation using Arduino Wire Library
  * @date 2021-12-12
@@ -20,24 +20,26 @@
 #define PORT 0x20
 #define END true
 
+TwoWire *p_wire = &AUDIOKIT_WIRE;
+
 i2c_bus_handle_t i2c_bus_create(i2c_port_t port, i2c_config_t* conf)
 {
     KIT_LOGD(LOG_METHOD);
 
 #if defined(ESP32)
     KIT_LOGI("i2c sda: %d", conf->sda_io_num);
     KIT_LOGI("i2c scl: %d", conf->scl_io_num);
-    Wire.setPins(conf->sda_io_num, conf->scl_io_num);
+    p_wire->setPins(conf->sda_io_num, conf->scl_io_num);
     KIT_LOGI("i2c clk_speed: %d", conf->master.clk_speed);
 #elif defined(ARDUINO_ARCH_RP2040)
-    Wire.setSDA(conf->sda_io_num);
+    p_wire->setSDA(conf->sda_io_num);
     bool setSCL(conf->scl_io_num);
 #else
 #warning "Pins in Wire Library ignored"
 #endif
 
-    Wire.setClock(conf->master.clk_speed);
-    Wire.begin();
+    p_wire->setClock(conf->master.clk_speed);
+    p_wire->begin();
 
     return nullptr;
 }
@@ -57,12 +59,12 @@ esp_err_t i2c_bus_write_bytes(i2c_bus_handle_t bus, int addr, uint8_t* reg, int
     assert(datalen == 1);
 
     int result = ESP_OK;
-    Wire.beginTransmission(addr >> 1);
-    Wire.write(reg[0]);
-    Wire.write(data[0]);
-    int rc = Wire.endTransmission(END);
+    p_wire->beginTransmission(addr >> 1);
+    p_wire->write(reg[0]);
+    p_wire->write(data[0]);
+    int rc = p_wire->endTransmission(END);
     if (rc != 0) {
-        KIT_LOGE("->Wire.endTransmission: %d", rc);
+        KIT_LOGE("->p_wire->endTransmission: %d", rc);
         result = ESP_FAIL;
     }
     return result;
@@ -74,11 +76,11 @@ esp_err_t i2c_bus_write_data(i2c_bus_handle_t bus, int addr, uint8_t* data, int
     assert(datalen == 1);
 
     int result = ESP_OK;
-    Wire.beginTransmission(addr >> 1);
-    Wire.write(data, datalen);
-    int rc = Wire.endTransmission(END);
+    p_wire->beginTransmission(addr >> 1);
+    p_wire->write(data, datalen);
+    int rc = p_wire->endTransmission(END);
     if (rc != 0) {
-        KIT_LOGE("->Wire.endTransmission: %d", rc);
+        KIT_LOGE("->p_wire->endTransmission: %d", rc);
         result = ESP_FAIL;
     }
     return result;
@@ -94,18 +96,18 @@ esp_err_t i2c_bus_read_bytes(i2c_bus_handle_t bus, int addr, uint8_t* reg, int r
     outdata[0] = 0;
     int result = ESP_OK;
 
-    Wire.beginTransmission(addr >> 1);
-    Wire.write(reg[0]);
-    int rc = Wire.endTransmission();
+    p_wire->beginTransmission(addr >> 1);
+    p_wire->write(reg[0]);
+    int rc = p_wire->endTransmission();
     if (rc!=0){
-        KIT_LOGE("->Wire.endTransmission: %d", rc);
+        KIT_LOGE("->p_wire->endTransmission: %d", rc);
     }
 
-    uint8_t result_len = Wire.requestFrom((uint16_t)(addr >> 1), (uint8_t)1, true);
+    uint8_t result_len = p_wire->requestFrom((uint16_t)(addr >> 1), (uint8_t)1, true);
     if (result_len > 0) {
-        result_len = Wire.readBytes(outdata, datalen);
+        result_len = p_wire->readBytes(outdata, datalen);
     } else {
-        KIT_LOGE("->Wire.requestFrom %d->%d", datalen, result_len);
+        KIT_LOGE("->p_wire->requestFrom %d->%d", datalen, result_len);
         result = ESP_FAIL;
     }
     return result;
@@ -116,7 +118,7 @@ esp_err_t i2c_bus_delete(i2c_bus_handle_t bus)
     KIT_LOGD(LOG_METHOD);
 // All arduino implementations except old IDF versions
 #if !defined(ESP32) || ESP_IDF_VERSION_MAJOR >= 4    
-    Wire.end();
+    p_wire->end();
 #endif
 
     return ESP_OK;