MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consider RMT channel limitations at allocation time. (#3481) 

* Consider RMT channel limitations at allocation time.

The ESP32-C3 is limited to TX on channel 0-1 and RX on channel 2-3.
This commit is contained in:
Christoph Thelen 2022-01-07 04:50:28 +01:00 committed by GitHub
parent 6e63264963
commit 8b1ef35b66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/platform/dht.c
View File

@ -76,7 +76,7 @@ static void dht_deinit( void )
static int dht_init( uint8_t gpio_num ) static int dht_init( uint8_t gpio_num )
{ {
// acquire an RMT module for RX // acquire an RMT module for RX
if ((dht_rmt.channel = platform_rmt_allocate( 1 )) >= 0) { if ((dht_rmt.channel = platform_rmt_allocate( 1, RMT_MODE_RX )) >= 0) {
#ifdef DHT_DEBUG #ifdef DHT_DEBUG
ESP_LOGI("dht", "RMT RX channel: %d", dht_rmt.channel); ESP_LOGI("dht", "RMT RX channel: %d", dht_rmt.channel);

3
components/platform/include/platform_rmt.h
View File

@ -14,13 +14,14 @@
* @brief Allocate an RMT channel. * @brief Allocate an RMT channel.
* *
* @param num_mem Number of memory blocks. * @param num_mem Number of memory blocks.
* @param mode Mode of the channel, RMT_MODE_TX allocates a TX channel, RMT_MODE_RX an RX channel.
* *
* @return * @return
* - Channel number when successful * - Channel number when successful
* - -1 if no channel available * - -1 if no channel available
* *
*/ */
int platform_rmt_allocate( uint8_t num_mem ); int platform_rmt_allocate( uint8_t num_mem, rmt_mode_t mode );
/** /**
* @brief Release a previously allocated RMT channel. * @brief Release a previously allocated RMT channel.

4
components/platform/onewire.c
View File

@ -113,8 +113,8 @@ static int onewire_rmt_init( uint8_t gpio_num )
} }
// acquire an RMT module for TX and RX each // acquire an RMT module for TX and RX each
if ((ow_rmt.tx = platform_rmt_allocate( 1 )) >= 0) { if ((ow_rmt.tx = platform_rmt_allocate( 1, RMT_MODE_TX )) >= 0) {
if ((ow_rmt.rx = platform_rmt_allocate( 1 )) >= 0) { if ((ow_rmt.rx = platform_rmt_allocate( 1, RMT_MODE_RX )) >= 0) {
#ifdef OW_DEBUG #ifdef OW_DEBUG
ESP_LOGI("ow", "RMT TX channel: %d", ow_rmt.tx); ESP_LOGI("ow", "RMT TX channel: %d", ow_rmt.tx);

25
components/platform/platform_rmt.c
View File

@ -24,12 +24,33 @@ static bool rmt_channel_check( uint8_t channel, uint8_t num_mem )
return rmt_channel_check( channel-1, num_mem-1); return rmt_channel_check( channel-1, num_mem-1);
} }
int platform_rmt_allocate( uint8_t num_mem ) #if defined(CONFIG_IDF_TARGET_ESP32C3)
int platform_rmt_allocate( uint8_t num_mem, rmt_mode_t mode )
#else
int platform_rmt_allocate( uint8_t num_mem, rmt_mode_t mode __attribute__((unused)))
#endif
{ {
int channel; int channel;
int alloc_min;
int alloc_max;
uint8_t tag = 1; uint8_t tag = 1;
for (channel = RMT_CHANNEL_MAX-1; channel >= 0; channel--) { #if defined(CONFIG_IDF_TARGET_ESP32C3)
/* The ESP32-C3 is limited to TX on channel 0-1 and RX on channel 2-3. */
if( mode==RMT_MODE_TX ) {
alloc_min = 0;
alloc_max = SOC_RMT_TX_CANDIDATES_PER_GROUP - 1;
} else {
alloc_min = RMT_CHANNEL_MAX - SOC_RMT_RX_CANDIDATES_PER_GROUP;
alloc_max = RMT_CHANNEL_MAX - 1;
}
#else
/* The other ESP32 devices can do RX and TX on all channels. */
alloc_min = 0;
alloc_max = RMT_CHANNEL_MAX - 1;
#endif
for (channel = alloc_max; channel >= alloc_min; channel--) {
if (rmt_channel_alloc[channel] == 0) { if (rmt_channel_alloc[channel] == 0) {
if (rmt_channel_check( channel, num_mem )) { if (rmt_channel_check( channel, num_mem )) {
rmt_channel_alloc[channel] = tag++; rmt_channel_alloc[channel] = tag++;

2
components/platform/ws2812.c
View File

@ -138,7 +138,7 @@ int platform_ws2812_setup( uint8_t gpio_num, uint8_t num_mem, const uint8_t *dat
{ {
int channel; int channel;
if ((channel = platform_rmt_allocate( num_mem )) >= 0) { if ((channel = platform_rmt_allocate( num_mem, RMT_MODE_TX )) >= 0) {
ws2812_chain_t *chain = &(ws2812_chains[channel]); ws2812_chain_t *chain = &(ws2812_chains[channel]);
chain->valid = true; chain->valid = true;