Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(i2s_pdm): remove incorrect check for raw PDM usage

Browse Source
This commit is contained in:
Chen Chen
2026-06-12 09:26:06 +08:00
parent 0af956f7af
commit fe21c32ccb
16 changed files with 20 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_i2s/i2s_pdm.c
+15 -4
View File
@@ -129,6 +129,12 @@ static esp_err_t i2s_pdm_tx_set_slot(i2s_chan_handle_t handle, const i2s_pdm_tx_
ESP_RETURN_ON_FALSE(slot_cfg->data_fmt != I2S_PDM_DATA_FMT_PCM ||
i2s_ll_is_pcm2pdm_supported(handle->controller->id),
ESP_ERR_NOT_SUPPORTED, TAG, "PCM2PDM converter is not supported on selected port");
#if SOC_I2S_PDM_MAX_TX_LINES > 1
int id = handle->controller->id;
ESP_RETURN_ON_FALSE(slot_cfg->line_mode != I2S_PDM_TX_TWO_LINE_DAC ||
i2s_periph_signal[id].data_out_sigs[1] != (uint8_t) -1,
ESP_ERR_NOT_SUPPORTED, TAG, "PDM TX dual-line mode is not supported on selected port");
#endif
/* Update the total slot num and active slot num */
handle->is_raw_pdm = slot_cfg->data_fmt == I2S_PDM_DATA_FMT_RAW;
handle->total_slot = 2;
@@ -214,8 +220,6 @@ esp_err_t i2s_channel_init_pdm_tx_mode(i2s_chan_handle_t handle, const i2s_pdm_t
#endif
I2S_NULL_POINTER_CHECK(TAG, handle);
ESP_RETURN_ON_FALSE(handle->dir == I2S_DIR_TX, ESP_ERR_INVALID_ARG, TAG, "This channel handle is not a TX handle");
ESP_RETURN_ON_FALSE(i2s_ll_is_pdm_supported(handle->controller->id),
ESP_ERR_NOT_SUPPORTED, TAG, "PDM TX mode is not supported on selected port");
esp_err_t ret = ESP_OK;
@@ -478,6 +482,15 @@ static esp_err_t i2s_pdm_rx_set_slot(i2s_chan_handle_t handle, const i2s_pdm_rx_
ESP_RETURN_ON_FALSE(slot_cfg->data_fmt != I2S_PDM_DATA_FMT_PCM ||
i2s_ll_is_pdm2pcm_supported(handle->controller->id),
ESP_ERR_NOT_SUPPORTED, TAG, "PDM2PCM converter is not supported on selected port");
#if SOC_I2S_PDM_MAX_RX_LINES > 1
int id = handle->controller->id;
for (int i = 0; i < SOC_I2S_PDM_MAX_RX_LINES; i++) {
if (slot_cfg->slot_mask & (0x03 << (i * 2))) {
ESP_RETURN_ON_FALSE(i2s_periph_signal[id].data_in_sigs[i] != (uint8_t) -1,
ESP_ERR_NOT_SUPPORTED, TAG, "PDM RX line %d is not supported on selected port", i);
}
}
#endif
/* Update the total slot num and active slot num */
handle->is_raw_pdm = slot_cfg->data_fmt == I2S_PDM_DATA_FMT_RAW;
handle->total_slot = 2;
@@ -565,8 +578,6 @@ esp_err_t i2s_channel_init_pdm_rx_mode(i2s_chan_handle_t handle, const i2s_pdm_r
#endif
I2S_NULL_POINTER_CHECK(TAG, handle);
ESP_RETURN_ON_FALSE(handle->dir == I2S_DIR_RX, ESP_ERR_INVALID_ARG, TAG, "This channel handle is not a RX handle");
ESP_RETURN_ON_FALSE(i2s_ll_is_pdm_supported(handle->controller->id),
ESP_ERR_NOT_SUPPORTED, TAG, "PDM RX mode is not supported on selected port");
esp_err_t ret = ESP_OK;
components/esp_driver_i2s/include/driver/i2s_pdm.h
+1 -1
View File
@@ -117,7 +117,7 @@ typedef struct {
/* Particular fields */
i2s_pdm_slot_mask_t slot_mask; /*!< Choose the slots to activate */
i2s_pdm_data_fmt_t data_fmt; /*!< The data format of PDM RX mode. It determines what kind of data format is read in software.
* Typically, set this field to I2S_PDM_DATA_FMT_PCM when PCM2PDM filter is supported in the hardware,
* Typically, set this field to I2S_PDM_DATA_FMT_PCM when PDM2PCM filter is supported in the hardware,
* so that the hardware PDM2PCM filter will help to convert the raw PDM data on the line into PCM format,
* And then you can read PCM format data in software. Otherwise if this field is set to I2S_PDM_DATA_FMT_RAW,
* The data read in software are still in raw PDM format, you may need to convert the raw PDM data into PCM format manually by a software filter.