Skip to content

Commit 912d7fb

Browse files
jason-maojason-mao
committed
Merge branch 'feature/add_sdcard_spi_mode_support' into 'master'
audio_board: Support sdcard read and write in spi mode See merge request adf/esp-adf-internal!1197
2 parents 25ba7ee + 80fd016 commit 912d7fb

File tree

31 files changed

+191
-44
lines changed

31 files changed

+191
-44
lines changed

‎components/audio_board/esp32_c3_lyra/board.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ audio_hal_handle_t audio_board_codec_init(void)
6262
}
6363
return NULL;
6464
}
65+
6566
esp_err_t audio_board_sdcard_init(esp_periph_set_handle_t set, periph_sdcard_mode_t mode)
6667
{
67-
esp_err_t ret = ESP_OK;
68+
esp_err_t ret = ESP_FAIL;
6869
return ret;
6970
}
7071

‎components/audio_board/esp32_c3_lyra/board_def.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,20 @@
4040
#define BUTTON_ADC_GPIO GPIO_NUM_2
4141

4242

43+
/**
44+
* @brief SDCARD Function Definition
45+
*/
46+
#define FUNC_SDCARD_EN (0)
47+
#define SDCARD_OPEN_FILE_NUM_MAX 5
48+
#define SDCARD_INTR_GPIO -1
49+
#define SDCARD_PWR_CTRL -1
50+
51+
#define ESP_SD_PIN_CLK -1
52+
#define ESP_SD_PIN_CMD -1
53+
#define ESP_SD_PIN_D0 -1
54+
#define ESP_SD_PIN_D3 -1
55+
56+
4357
/**
4458
* @brief PDM TX Function Definition
4559
*/

‎components/audio_board/esp32_c3_lyra/board_pins_config.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,22 @@ esp_err_t get_spi_pins(spi_bus_config_t *spi_config, spi_device_interface_config
7676
return ESP_OK;
7777
}
7878

79+
// sdcard
80+
int8_t get_sdcard_intr_gpio(void)
81+
{
82+
return SDCARD_INTR_GPIO;
83+
}
84+
85+
int8_t get_sdcard_open_file_num_max(void)
86+
{
87+
return SDCARD_OPEN_FILE_NUM_MAX;
88+
}
89+
90+
int8_t get_sdcard_power_ctrl_gpio(void)
91+
{
92+
return SDCARD_PWR_CTRL;
93+
}
94+
7995
// input-output pins
8096
int8_t get_pa_enable_gpio(void)
8197
{

‎components/audio_board/esp32_c6_devkit/board.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ audio_board_handle_t audio_board_init(void)
4747
return board_handle;
4848
}
4949

50-
5150
esp_err_t audio_board_sdcard_init(esp_periph_set_handle_t set, periph_sdcard_mode_t mode)
5251
{
53-
esp_err_t ret = ESP_OK;
52+
esp_err_t ret = ESP_FAIL;
5453
return ret;
5554
}
5655

‎components/audio_board/esp32_c6_devkit/board_def.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,20 @@
4040
#define BUTTON_ADC_GPIO GPIO_NUM_2
4141

4242

43+
/**
44+
* @brief SDCARD Function Definition
45+
*/
46+
#define FUNC_SDCARD_EN (0)
47+
#define SDCARD_OPEN_FILE_NUM_MAX 5
48+
#define SDCARD_INTR_GPIO -1
49+
#define SDCARD_PWR_CTRL -1
50+
51+
#define ESP_SD_PIN_CLK -1
52+
#define ESP_SD_PIN_CMD -1
53+
#define ESP_SD_PIN_D0 -1
54+
#define ESP_SD_PIN_D3 -1
55+
56+
4357
/**
4458
* @brief PDM TX Function Definition
4559
*/

‎components/audio_board/esp32_c6_devkit/board_pins_config.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,22 @@ esp_err_t get_spi_pins(spi_bus_config_t *spi_config, spi_device_interface_config
7575
return ESP_OK;
7676
}
7777

78+
// sdcard
79+
int8_t get_sdcard_intr_gpio(void)
80+
{
81+
return SDCARD_INTR_GPIO;
82+
}
83+
84+
int8_t get_sdcard_open_file_num_max(void)
85+
{
86+
return SDCARD_OPEN_FILE_NUM_MAX;
87+
}
88+
89+
int8_t get_sdcard_power_ctrl_gpio(void)
90+
{
91+
return SDCARD_PWR_CTRL;
92+
}
93+
7894
// input-output pins
7995
int8_t get_pa_enable_gpio(void)
8096
{

‎components/audio_board/esp32_korvo_du1906/board.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ esp_err_t audio_board_key_init(esp_periph_set_handle_t set)
121121
esp_err_t audio_board_sdcard_init(esp_periph_set_handle_t set, periph_sdcard_mode_t mode)
122122
{
123123
if (mode != SD_MODE_1_LINE) {
124-
ESP_LOGE(TAG, "current board only support 1-line SD mode!");
124+
ESP_LOGE(TAG, "Current board only support 1-line SD mode!");
125125
return ESP_FAIL;
126126
}
127127
periph_sdcard_cfg_t sdcard_cfg = {

‎components/audio_board/esp32_korvo_du1906/board_def.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
#define SDCARD_OPEN_FILE_NUM_MAX 5
3333
#define SDCARD_INTR_GPIO GPIO_NUM_39
3434

35+
#define ESP_SD_PIN_CLK GPIO_NUM_14
36+
#define ESP_SD_PIN_CMD GPIO_NUM_15
37+
#define ESP_SD_PIN_D0 GPIO_NUM_2
38+
#define ESP_SD_PIN_D3 -1
39+
3540

3641
/**
3742
* @brief LED Function Definition

‎components/audio_board/esp32_s2_kaluga_1_v1_2/board.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ audio_hal_handle_t audio_board_codec_init(void)
5151
AUDIO_NULL_CHECK(TAG, codec_hal, return NULL);
5252
return codec_hal;
5353
}
54+
5455
esp_err_t audio_board_sdcard_init(esp_periph_set_handle_t set, periph_sdcard_mode_t mode)
5556
{
56-
esp_err_t ret = ESP_OK;
57+
esp_err_t ret = ESP_FAIL;
5758
return ret;
5859
}
5960

‎components/audio_board/esp32_s2_kaluga_1_v1_2/board_def.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,20 @@
5454
#define LCD_COLOR_INV (false)
5555

5656

57+
/**
58+
* @brief SDCARD Function Definition
59+
*/
60+
#define FUNC_SDCARD_EN (0)
61+
#define SDCARD_OPEN_FILE_NUM_MAX 5
62+
#define SDCARD_INTR_GPIO -1
63+
#define SDCARD_PWR_CTRL -1
64+
65+
#define ESP_SD_PIN_CLK -1
66+
#define ESP_SD_PIN_CMD -1
67+
#define ESP_SD_PIN_D0 -1
68+
#define ESP_SD_PIN_D3 -1
69+
70+
5771
/**
5872
* @brief Audio Codec Chip Function Definition
5973
*/

0 commit comments

Comments
 (0)