espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 07:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

RMT driver: Rename rmt_set_evt_intr_en to rmt_set_tx_thr_intr_en

Browse Source 
Closes github #115: https://github.com/espressif/esp-idf/issues/115
This commit is contained in:
Angus Gratton
2016-12-22 13:54:42 +11:00
parent 948a2ba23a
commit 9496fda662
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/driver/include/driver/rmt.h
View File

@@ -524,7 +524,9 @@ esp_err_t rmt_set_err_intr_en(rmt_channel_t channel, bool en);
esp_err_t rmt_set_tx_intr_en(rmt_channel_t channel, bool en); esp_err_t rmt_set_tx_intr_en(rmt_channel_t channel, bool en);
/** /**
* @brief Set RMT TX event interrupt enable * @brief Set RMT TX threshold event interrupt enable
*
* Causes an interrupt when a threshold number of items have been transmitted.
* *
* @param channel RMT channel (0 - 7) * @param channel RMT channel (0 - 7)
* *
@@ -536,7 +538,7 @@ esp_err_t rmt_set_tx_intr_en(rmt_channel_t channel, bool en);
* - ESP_ERR_INVALID_ARG Parameter error * - ESP_ERR_INVALID_ARG Parameter error
* - ESP_OK Success * - ESP_OK Success
*/ */
esp_err_t rmt_set_evt_intr_en(rmt_channel_t channel, bool en, uint16_t evt_thresh); esp_err_t rmt_set_tx_thr_intr_en(rmt_channel_t channel, bool en, uint16_t evt_thresh);
/** /**
* @brief Set RMT pins * @brief Set RMT pins

6
components/driver/rmt.c
View File

@@ -341,7 +341,7 @@ esp_err_t rmt_set_tx_intr_en(rmt_channel_t channel, bool en)
return ESP_OK; return ESP_OK;
} }
esp_err_t rmt_set_evt_intr_en(rmt_channel_t channel, bool en, uint16_t evt_thresh) esp_err_t rmt_set_tx_thr_intr_en(rmt_channel_t channel, bool en, uint16_t evt_thresh)
{ {
RMT_CHECK(channel < RMT_CHANNEL_MAX, RMT_CHANNEL_ERROR_STR, ESP_ERR_INVALID_ARG); RMT_CHECK(channel < RMT_CHANNEL_MAX, RMT_CHANNEL_ERROR_STR, ESP_ERR_INVALID_ARG);
RMT_CHECK(evt_thresh < 256, "RMT EVT THRESH ERR", ESP_ERR_INVALID_ARG); RMT_CHECK(evt_thresh < 256, "RMT EVT THRESH ERR", ESP_ERR_INVALID_ARG);
@@ -624,7 +624,7 @@ esp_err_t rmt_driver_uninstall(rmt_channel_t channel)
rmt_set_rx_intr_en(channel, 0); rmt_set_rx_intr_en(channel, 0);
rmt_set_err_intr_en(channel, 0); rmt_set_err_intr_en(channel, 0);
rmt_set_tx_intr_en(channel, 0); rmt_set_tx_intr_en(channel, 0);
rmt_set_evt_intr_en(channel, 0, 0xffff); rmt_set_tx_thr_intr_en(channel, 0, 0xffff);
if(p_rmt_obj[channel]->tx_sem) { if(p_rmt_obj[channel]->tx_sem) {
vSemaphoreDelete(p_rmt_obj[channel]->tx_sem); vSemaphoreDelete(p_rmt_obj[channel]->tx_sem);
p_rmt_obj[channel]->tx_sem = NULL; p_rmt_obj[channel]->tx_sem = NULL;
@@ -697,7 +697,7 @@ esp_err_t rmt_write_items(rmt_channel_t channel, rmt_item32_t* rmt_item, int ite
RMT.apb_conf.mem_tx_wrap_en = 1; RMT.apb_conf.mem_tx_wrap_en = 1;
len_rem -= item_block_len; len_rem -= item_block_len;
RMT.conf_ch[channel].conf1.tx_conti_mode = 0; RMT.conf_ch[channel].conf1.tx_conti_mode = 0;
rmt_set_evt_intr_en(channel, 1, item_sub_len); rmt_set_tx_thr_intr_en(channel, 1, item_sub_len);
p_rmt->tx_data = rmt_item + item_block_len; p_rmt->tx_data = rmt_item + item_block_len;
p_rmt->tx_len_rem = len_rem; p_rmt->tx_len_rem = len_rem;
p_rmt->tx_offset = 0; p_rmt->tx_offset = 0;