Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
arduino-esp32
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
arduino-esp32
Commits
44fbde01
Unverified
Commit
44fbde01
authored
Dec 22, 2021
by
Rodrigo Garcia
Committed by
GitHub
Dec 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes Lib Builder compiling errors (#6052)
parent
8c88ecbf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
15 deletions
+10
-15
cores/esp32/esp32-hal-rmt.c
cores/esp32/esp32-hal-rmt.c
+10
-15
No files found.
cores/esp32/esp32-hal-rmt.c
View file @
44fbde01
...
@@ -124,10 +124,6 @@ static rmt_obj_t g_rmt_objects[MAX_CHANNELS] = {
...
@@ -124,10 +124,6 @@ static rmt_obj_t g_rmt_objects[MAX_CHANNELS] = {
/**
/**
* Internal variables for driver data
* Internal variables for driver data
*/
*/
static
intr_handle_t
intr_handle
;
static
bool
periph_enabled
=
false
;
static
xSemaphoreHandle
g_rmt_block_lock
=
NULL
;
static
xSemaphoreHandle
g_rmt_block_lock
=
NULL
;
/**
/**
...
@@ -188,21 +184,21 @@ static void _rmtRxTask(void *args) {
...
@@ -188,21 +184,21 @@ static void _rmtRxTask(void *args) {
rmt_item32_t
*
data
=
NULL
;
rmt_item32_t
*
data
=
NULL
;
if
(
!
rmt
)
{
if
(
!
rmt
)
{
log_e
(
" -- Inavalid Argument
\n
"
);
log_e
(
" -- Inavalid Argument"
);
goto
err
;
goto
err
;
}
}
int
channel
=
rmt
->
channel
;
int
channel
=
rmt
->
channel
;
rmt_get_ringbuf_handle
(
channel
,
&
rb
);
rmt_get_ringbuf_handle
(
channel
,
&
rb
);
if
(
!
rb
)
{
if
(
!
rb
)
{
log_e
(
" -- Failed to get RMT ringbuffer handle
\n
"
);
log_e
(
" -- Failed to get RMT ringbuffer handle"
);
goto
err
;
goto
err
;
}
}
for
(;;)
{
for
(;;)
{
data
=
(
rmt_item32_t
*
)
xRingbufferReceive
(
rb
,
&
rmt_len
,
portMAX_DELAY
);
data
=
(
rmt_item32_t
*
)
xRingbufferReceive
(
rb
,
&
rmt_len
,
portMAX_DELAY
);
if
(
data
)
{
if
(
data
)
{
log_d
(
" -- Got %d bytes on RX Ringbuffer - CH %d
\n
"
,
rmt_len
,
rmt
->
channel
);
log_d
(
" -- Got %d bytes on RX Ringbuffer - CH %d"
,
rmt_len
,
rmt
->
channel
);
rmt
->
rx_completed
=
true
;
// used in rmtReceiveCompleted()
rmt
->
rx_completed
=
true
;
// used in rmtReceiveCompleted()
// callback
// callback
if
(
rmt
->
cb
)
{
if
(
rmt
->
cb
)
{
...
@@ -390,7 +386,6 @@ bool rmtReadData(rmt_obj_t* rmt, uint32_t* data, size_t size)
...
@@ -390,7 +386,6 @@ bool rmtReadData(rmt_obj_t* rmt, uint32_t* data, size_t size)
if
(
!
rmt
)
{
if
(
!
rmt
)
{
return
false
;
return
false
;
}
}
int
channel
=
rmt
->
channel
;
rmtReadAsync
(
rmt
,
(
rmt_data_t
*
)
data
,
size
,
NULL
,
false
,
0
);
rmtReadAsync
(
rmt
,
(
rmt_data_t
*
)
data
,
size
,
NULL
,
false
,
0
);
return
true
;
return
true
;
...
@@ -492,7 +487,7 @@ bool rmtReadAsync(rmt_obj_t* rmt, rmt_data_t* data, size_t size, void* eventFlag
...
@@ -492,7 +487,7 @@ bool rmtReadAsync(rmt_obj_t* rmt, rmt_data_t* data, size_t size, void* eventFlag
// wait for data if requested so
// wait for data if requested so
if
(
waitForData
&&
eventFlag
)
{
if
(
waitForData
&&
eventFlag
)
{
uint32_t
flags
=
xEventGroupWaitBits
(
eventFlag
,
RMT_FLAGS_ALL
,
xEventGroupWaitBits
(
eventFlag
,
RMT_FLAGS_ALL
,
pdTRUE
/* clear on exit */
,
pdFALSE
/* wait for all bits */
,
timeout
);
pdTRUE
/* clear on exit */
,
pdFALSE
/* wait for all bits */
,
timeout
);
}
}
return
true
;
return
true
;
...
@@ -520,9 +515,9 @@ float rmtSetTick(rmt_obj_t* rmt, float tick)
...
@@ -520,9 +515,9 @@ float rmtSetTick(rmt_obj_t* rmt, float tick)
rmt_obj_t
*
rmtInit
(
int
pin
,
bool
tx_not_rx
,
rmt_reserve_memsize_t
memsize
)
rmt_obj_t
*
rmtInit
(
int
pin
,
bool
tx_not_rx
,
rmt_reserve_memsize_t
memsize
)
{
{
int
buffers
=
memsize
;
int
buffers
=
memsize
;
rmt_obj_t
*
rmt
;
rmt_obj_t
*
rmt
=
NULL
;
size_t
i
;
size_t
i
=
0
;
size_t
j
;
size_t
j
=
0
;
// create common block mutex for protecting allocs from multiple threads
// create common block mutex for protecting allocs from multiple threads
if
(
!
g_rmt_block_lock
)
{
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,7 +550,7 @@ rmt_obj_t* rmtInit(int pin, bool tx_not_rx, rmt_reserve_memsize_t memsize)
}
}
if
(
i
==
MAX_CHANNELS
||
i
+
j
>
MAX_CHANNELS
||
j
!=
buffers
)
{
if
(
i
==
MAX_CHANNELS
||
i
+
j
>
MAX_CHANNELS
||
j
!=
buffers
)
{
xSemaphoreGive
(
g_rmt_block_lock
);
xSemaphoreGive
(
g_rmt_block_lock
);
log_e
(
"rmInit Failed - not enough channels
\n
"
);
log_e
(
"rmInit Failed - not enough channels"
);
return
NULL
;
return
NULL
;
}
}
...
@@ -591,7 +586,7 @@ rmt_obj_t* rmtInit(int pin, bool tx_not_rx, rmt_reserve_memsize_t memsize)
...
@@ -591,7 +586,7 @@ rmt_obj_t* rmtInit(int pin, bool tx_not_rx, rmt_reserve_memsize_t memsize)
esp_err_code
=
rmt_config
(
&
config
);
esp_err_code
=
rmt_config
(
&
config
);
if
(
esp_err_code
==
ESP_OK
)
if
(
esp_err_code
==
ESP_OK
)
esp_err_code
=
rmt_driver_install
(
channel
,
0
,
0
);
esp_err_code
=
rmt_driver_install
(
channel
,
0
,
0
);
log_d
(
" -- %s RMT - CH %d - %d RAM Blocks - pin %d
\n
"
,
tx_not_rx
?
"TX"
:
"RX"
,
channel
,
buffers
,
pin
);
log_d
(
" -- %s RMT - CH %d - %d RAM Blocks - pin %d"
,
tx_not_rx
?
"TX"
:
"RX"
,
channel
,
buffers
,
pin
);
}
else
{
}
else
{
rmt_config_t
config
=
RMT_DEFAULT_ARD_CONFIG_RX
(
pin
,
channel
,
buffers
);
rmt_config_t
config
=
RMT_DEFAULT_ARD_CONFIG_RX
(
pin
,
channel
,
buffers
);
esp_err_code
=
rmt_config
(
&
config
);
esp_err_code
=
rmt_config
(
&
config
);
...
@@ -599,7 +594,7 @@ rmt_obj_t* rmtInit(int pin, bool tx_not_rx, rmt_reserve_memsize_t memsize)
...
@@ -599,7 +594,7 @@ rmt_obj_t* rmtInit(int pin, bool tx_not_rx, rmt_reserve_memsize_t memsize)
esp_err_code
=
rmt_driver_install
(
channel
,
1024
,
0
);
esp_err_code
=
rmt_driver_install
(
channel
,
1024
,
0
);
if
(
esp_err_code
==
ESP_OK
)
if
(
esp_err_code
==
ESP_OK
)
esp_err_code
=
rmt_set_memory_owner
(
channel
,
RMT_MEM_OWNER_RX
);
esp_err_code
=
rmt_set_memory_owner
(
channel
,
RMT_MEM_OWNER_RX
);
log_d
(
" -- %s RMT - CH %d - %d RAM Blocks - pin %d
\n
"
,
tx_not_rx
?
"TX"
:
"RX"
,
channel
,
buffers
,
pin
);
log_d
(
" -- %s RMT - CH %d - %d RAM Blocks - pin %d"
,
tx_not_rx
?
"TX"
:
"RX"
,
channel
,
buffers
,
pin
);
}
}
RMT_MUTEX_UNLOCK
(
channel
);
RMT_MUTEX_UNLOCK
(
channel
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment