Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
micropython
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
micropython
Commits
7d7f59d7
Commit
7d7f59d7
authored
Dec 10, 2018
by
Damien George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stm32/uart: Factor out code to set RX buffer to function uart_set_rxbuf.
parent
9690757c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
11 deletions
+20
-11
ports/stm32/machine_uart.c
ports/stm32/machine_uart.c
+4
-11
ports/stm32/uart.c
ports/stm32/uart.c
+15
-0
ports/stm32/uart.h
ports/stm32/uart.h
+1
-0
No files found.
ports/stm32/machine_uart.c
View file @
7d7f59d7
...
...
@@ -223,25 +223,18 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const
}
self
->
char_width
=
CHAR_WIDTH_8BIT
;
}
self
->
read_buf_head
=
0
;
self
->
read_buf_tail
=
0
;
if
(
args
.
rxbuf
.
u_int
>=
0
)
{
// rxbuf overrides legacy read_buf_len
args
.
read_buf_len
.
u_int
=
args
.
rxbuf
.
u_int
;
}
if
(
args
.
read_buf_len
.
u_int
<=
0
)
{
// no read buffer
self
->
read_buf_len
=
0
;
self
->
read_buf
=
NULL
;
HAL_NVIC_DisableIRQ
(
self
->
irqn
);
__HAL_UART_DISABLE_IT
(
&
self
->
uart
,
UART_IT_RXNE
);
uart_set_rxbuf
(
self
,
0
,
NULL
);
}
else
{
// read buffer using interrupts
self
->
read_buf_len
=
args
.
read_buf_len
.
u_int
+
1
;
// +1 to adjust for usable length of buffer
self
->
read_buf
=
m_new
(
byte
,
self
->
read_buf_len
<<
self
->
char_width
);
__HAL_UART_ENABLE_IT
(
&
self
->
uart
,
UART_IT_RXNE
);
NVIC_SetPriority
(
IRQn_NONNEG
(
self
->
irqn
),
IRQ_PRI_UART
);
HAL_NVIC_EnableIRQ
(
self
->
irqn
);
size_t
len
=
args
.
read_buf_len
.
u_int
+
1
;
// +1 to adjust for usable length of buffer
uint8_t
*
buf
=
m_new
(
byte
,
len
<<
self
->
char_width
);
uart_set_rxbuf
(
self
,
len
,
buf
);
}
// compute actual baudrate that was configured
...
...
ports/stm32/uart.c
View file @
7d7f59d7
...
...
@@ -302,6 +302,21 @@ bool uart_init2(pyb_uart_obj_t *uart_obj) {
return
true
;
}
void
uart_set_rxbuf
(
pyb_uart_obj_t
*
self
,
size_t
len
,
void
*
buf
)
{
self
->
read_buf_head
=
0
;
self
->
read_buf_tail
=
0
;
self
->
read_buf_len
=
len
;
self
->
read_buf
=
buf
;
if
(
len
==
0
)
{
HAL_NVIC_DisableIRQ
(
self
->
irqn
);
__HAL_UART_DISABLE_IT
(
&
self
->
uart
,
UART_IT_RXNE
);
}
else
{
__HAL_UART_ENABLE_IT
(
&
self
->
uart
,
UART_IT_RXNE
);
NVIC_SetPriority
(
IRQn_NONNEG
(
self
->
irqn
),
IRQ_PRI_UART
);
HAL_NVIC_EnableIRQ
(
self
->
irqn
);
}
}
void
uart_deinit
(
pyb_uart_obj_t
*
self
)
{
self
->
is_enabled
=
false
;
UART_HandleTypeDef
*
uart
=
&
self
->
uart
;
...
...
ports/stm32/uart.h
View file @
7d7f59d7
...
...
@@ -64,6 +64,7 @@ void uart_init0(void);
void
uart_deinit_all
(
void
);
bool
uart_exists
(
int
uart_id
);
bool
uart_init2
(
pyb_uart_obj_t
*
uart_obj
);
void
uart_set_rxbuf
(
pyb_uart_obj_t
*
self
,
size_t
len
,
void
*
buf
);
void
uart_deinit
(
pyb_uart_obj_t
*
uart_obj
);
void
uart_irq_handler
(
mp_uint_t
uart_id
);
...
...
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