@@ -124,10 +124,6 @@ static rmt_obj_t g_rmt_objects[MAX_CHANNELS] = {
124
124
/**
125
125
* Internal variables for driver data
126
126
*/
127
- static intr_handle_t intr_handle ;
128
-
129
- static bool periph_enabled = false;
130
-
131
127
static xSemaphoreHandle g_rmt_block_lock = NULL ;
132
128
133
129
/**
@@ -188,21 +184,21 @@ static void _rmtRxTask(void *args) {
188
184
rmt_item32_t * data = NULL ;
189
185
190
186
if (!rmt ) {
191
- log_e (" -- Inavalid Argument \n " );
187
+ log_e (" -- Inavalid Argument" );
192
188
goto err ;
193
189
}
194
190
195
191
int channel = rmt -> channel ;
196
192
rmt_get_ringbuf_handle (channel , & rb );
197
193
if (!rb ) {
198
- log_e (" -- Failed to get RMT ringbuffer handle\n " );
194
+ log_e (" -- Failed to get RMT ringbuffer handle" );
199
195
goto err ;
200
196
}
201
197
202
198
for (;;) {
203
199
data = (rmt_item32_t * ) xRingbufferReceive (rb , & rmt_len , portMAX_DELAY );
204
200
if (data ) {
205
- log_d (" -- Got %d bytes on RX Ringbuffer - CH %d\n " , rmt_len , rmt -> channel );
201
+ log_d (" -- Got %d bytes on RX Ringbuffer - CH %d" , rmt_len , rmt -> channel );
206
202
rmt -> rx_completed = true; // used in rmtReceiveCompleted()
207
203
// callback
208
204
if (rmt -> cb ) {
@@ -390,7 +386,6 @@ bool rmtReadData(rmt_obj_t* rmt, uint32_t* data, size_t size)
390
386
if (!rmt ) {
391
387
return false;
392
388
}
393
- int channel = rmt -> channel ;
394
389
395
390
rmtReadAsync (rmt , (rmt_data_t * ) data , size , NULL , false, 0 );
396
391
return true;
@@ -492,7 +487,7 @@ bool rmtReadAsync(rmt_obj_t* rmt, rmt_data_t* data, size_t size, void* eventFlag
492
487
493
488
// wait for data if requested so
494
489
if (waitForData && eventFlag ) {
495
- uint32_t flags = xEventGroupWaitBits (eventFlag , RMT_FLAGS_ALL ,
490
+ xEventGroupWaitBits (eventFlag , RMT_FLAGS_ALL ,
496
491
pdTRUE /* clear on exit */ , pdFALSE /* wait for all bits */ , timeout );
497
492
}
498
493
return true;
@@ -520,9 +515,9 @@ float rmtSetTick(rmt_obj_t* rmt, float tick)
520
515
rmt_obj_t * rmtInit (int pin , bool tx_not_rx , rmt_reserve_memsize_t memsize )
521
516
{
522
517
int buffers = memsize ;
523
- rmt_obj_t * rmt ;
524
- size_t i ;
525
- size_t j ;
518
+ rmt_obj_t * rmt = NULL ;
519
+ size_t i = 0 ;
520
+ size_t j = 0 ;
526
521
527
522
// create common block mutex for protecting allocs from multiple threads
528
523
if (!g_rmt_block_lock ) {
@@ -555,7 +550,7 @@ rmt_obj_t* rmtInit(int pin, bool tx_not_rx, rmt_reserve_memsize_t memsize)
555
550
}
556
551
if (i == MAX_CHANNELS || i + j > MAX_CHANNELS || j != buffers ) {
557
552
xSemaphoreGive (g_rmt_block_lock );
558
- log_e ("rmInit Failed - not enough channels\n " );
553
+ log_e ("rmInit Failed - not enough channels" );
559
554
return NULL ;
560
555
}
561
556
@@ -591,15 +586,15 @@ rmt_obj_t* rmtInit(int pin, bool tx_not_rx, rmt_reserve_memsize_t memsize)
591
586
esp_err_code = rmt_config (& config );
592
587
if (esp_err_code == ESP_OK )
593
588
esp_err_code = rmt_driver_install (channel , 0 , 0 );
594
- log_d (" -- %s RMT - CH %d - %d RAM Blocks - pin %d\n " , tx_not_rx ?"TX" :"RX" , channel , buffers , pin );
589
+ log_d (" -- %s RMT - CH %d - %d RAM Blocks - pin %d" , tx_not_rx ?"TX" :"RX" , channel , buffers , pin );
595
590
} else {
596
591
rmt_config_t config = RMT_DEFAULT_ARD_CONFIG_RX (pin , channel , buffers );
597
592
esp_err_code = rmt_config (& config );
598
593
if (esp_err_code == ESP_OK )
599
594
esp_err_code = rmt_driver_install (channel , 1024 , 0 );
600
595
if (esp_err_code == ESP_OK )
601
596
esp_err_code = rmt_set_memory_owner (channel , RMT_MEM_OWNER_RX );
602
- log_d (" -- %s RMT - CH %d - %d RAM Blocks - pin %d\n " , tx_not_rx ?"TX" :"RX" , channel , buffers , pin );
597
+ log_d (" -- %s RMT - CH %d - %d RAM Blocks - pin %d" , tx_not_rx ?"TX" :"RX" , channel , buffers , pin );
603
598
}
604
599
605
600
RMT_MUTEX_UNLOCK (channel );
0 commit comments