Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
card10
firmware
Commits
69775a15
Verified
Commit
69775a15
authored
Aug 15, 2019
by
Rahix
Browse files
feat(epicardium): Display all output on CDC-ACM
Closes #67 Signed-off-by:
Rahix
<
rahix@rahix.de
>
parent
4b465ff4
Pipeline
#2020
passed with stages
in 52 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
epicardium/meson.build
View file @
69775a15
...
...
@@ -85,6 +85,7 @@ elf = executable(
include_directories: [freertos_includes],
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
'-Wl,--defsym=_write=_write_epicardium',
],
)
...
...
epicardium/modules/serial.c
View file @
69775a15
...
...
@@ -49,7 +49,7 @@ int epic_uart_read_char(void)
*/
int
epic_uart_read_str
(
char
*
buf
,
size_t
cnt
)
{
in
t
i
=
0
;
size_
t
i
=
0
;
for
(
i
=
0
;
i
<
cnt
;
i
++
)
{
if
(
xQueueReceive
(
read_queue
,
&
buf
[
i
],
0
)
!=
pdTRUE
)
{
...
...
@@ -60,6 +60,24 @@ int epic_uart_read_str(char *buf, size_t cnt)
return
i
;
}
long
_write_epicardium
(
int
fd
,
const
char
*
buf
,
size_t
cnt
)
{
/*
* Only print one line at a time. Insert `\r` between lines so they are
* properly displayed on the serial console.
*/
size_t
i
,
last
=
0
;
for
(
i
=
0
;
i
<
cnt
;
i
++
)
{
if
(
buf
[
i
]
==
'\n'
)
{
epic_uart_write_str
(
&
buf
[
last
],
i
-
last
);
epic_uart_write_str
(
"
\r
"
,
1
);
last
=
i
;
}
}
epic_uart_write_str
(
&
buf
[
last
],
cnt
-
last
);
return
cnt
;
}
/* Interrupt handler needed for SDK UART implementation */
void
UART0_IRQHandler
(
void
)
{
...
...
Rahix
@rahix
mentioned in issue
#80 (closed)
·
Aug 19, 2019
mentioned in issue
#80 (closed)
mentioned in issue #80
Toggle commit list
Write
Preview
Supports
Markdown
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