@@ -124,10 +124,6 @@ static rmt_obj_t g_rmt_objects[MAX_CHANNELS] = {
124124/**
125125 * Internal variables for driver data
126126 */
127- static intr_handle_t intr_handle ;
128-
129- static bool periph_enabled = false;
130-
131127static xSemaphoreHandle g_rmt_block_lock = NULL ;
132128
133129/**
@@ -188,21 +184,21 @@ static void _rmtRxTask(void *args) {
188184 rmt_item32_t * data = NULL ;
189185
190186 if (!rmt ) {
191- log_e (" -- Inavalid Argument \n " );
187+ log_e (" -- Inavalid Argument" );
192188 goto err ;
193189 }
194190
195191 int channel = rmt -> channel ;
196192 rmt_get_ringbuf_handle (channel , & rb );
197193 if (!rb ) {
198- log_e (" -- Failed to get RMT ringbuffer handle\n " );
194+ log_e (" -- Failed to get RMT ringbuffer handle" );
199195 goto err ;
200196 }
201197
202198 for (;;) {
203199 data = (rmt_item32_t * ) xRingbufferReceive (rb , & rmt_len , portMAX_DELAY );
204200 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 );
206202 rmt -> rx_completed = true; // used in rmtReceiveCompleted()
207203 // callback
208204 if (rmt -> cb ) {
@@ -390,7 +386,6 @@ bool rmtReadData(rmt_obj_t* rmt, uint32_t* data, size_t size)
390386 if (!rmt ) {
391387 return false;
392388 }
393- int channel = rmt -> channel ;
394389
395390 rmtReadAsync (rmt , (rmt_data_t * ) data , size , NULL , false, 0 );
396391 return true;
@@ -492,7 +487,7 @@ bool rmtReadAsync(rmt_obj_t* rmt, rmt_data_t* data, size_t size, void* eventFlag
492487
493488 // wait for data if requested so
494489 if (waitForData && eventFlag ) {
495- uint32_t flags = xEventGroupWaitBits (eventFlag , RMT_FLAGS_ALL ,
490+ xEventGroupWaitBits (eventFlag , RMT_FLAGS_ALL ,
496491 pdTRUE /* clear on exit */ , pdFALSE /* wait for all bits */ , timeout );
497492 }
498493 return true;
@@ -520,9 +515,9 @@ float rmtSetTick(rmt_obj_t* rmt, float tick)
520515rmt_obj_t * rmtInit (int pin , bool tx_not_rx , rmt_reserve_memsize_t memsize )
521516{
522517 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 ;
526521
527522 // create common block mutex for protecting allocs from multiple threads
528523 if (!g_rmt_block_lock ) {
@@ -555,7 +550,7 @@ rmt_obj_t* rmtInit(int pin, bool tx_not_rx, rmt_reserve_memsize_t memsize)
555550 }
556551 if (i == MAX_CHANNELS || i + j > MAX_CHANNELS || j != buffers ) {
557552 xSemaphoreGive (g_rmt_block_lock );
558- log_e ("rmInit Failed - not enough channels\n " );
553+ log_e ("rmInit Failed - not enough channels" );
559554 return NULL ;
560555 }
561556
@@ -591,15 +586,15 @@ rmt_obj_t* rmtInit(int pin, bool tx_not_rx, rmt_reserve_memsize_t memsize)
591586 esp_err_code = rmt_config (& config );
592587 if (esp_err_code == ESP_OK )
593588 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 );
595590 } else {
596591 rmt_config_t config = RMT_DEFAULT_ARD_CONFIG_RX (pin , channel , buffers );
597592 esp_err_code = rmt_config (& config );
598593 if (esp_err_code == ESP_OK )
599594 esp_err_code = rmt_driver_install (channel , 1024 , 0 );
600595 if (esp_err_code == ESP_OK )
601596 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 );
603598 }
604599
605600 RMT_MUTEX_UNLOCK (channel );
0 commit comments