Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
card10
firmware
Commits
901b2048
Commit
901b2048
authored
3 years ago
by
rahix
Browse files
Options
Downloads
Plain Diff
Merge 'Revert "feat(micropython): Print exceptions to the screen"'
See merge request
!502
parents
a32948b7
a3e4c71d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!502
Revert "feat(micropython): Print exceptions to the screen"
Pipeline
#5388
passed
3 years ago
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pycardium/mphalport.c
+0
-73
0 additions, 73 deletions
pycardium/mphalport.c
with
0 additions
and
73 deletions
pycardium/mphalport.c
+
0
−
73
View file @
901b2048
...
...
@@ -17,7 +17,6 @@
#include
"py/mpprint.h"
#include
<stdint.h>
#include
<stdbool.h>
#include
<stdio.h>
#include
<string.h>
...
...
@@ -87,68 +86,6 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len)
epic_uart_write_str
(
str
,
len
);
}
static
char
exception_lines
[
2
][
80
];
static
bool
exception
;
static
size_t
exception_line_index
;
static
void
exception_feed
(
char
c
)
{
if
(
c
==
'\n'
)
{
exception_lines
[
1
][
exception_line_index
]
=
0
;
if
(
exception_lines
[
1
][
0
]
==
' '
)
{
memcpy
(
exception_lines
[
0
],
exception_lines
[
1
],
sizeof
(
exception_lines
[
0
]));
exception_line_index
=
0
;
}
else
{
exception
=
false
;
epic_disp_open
();
epic_disp_clear
(
0
);
epic_disp_print_adv
(
1
,
0
,
0
,
"Exception:"
,
0xF800
,
0x0000
);
char
buf
=
exception_lines
[
0
][
26
];
exception_lines
[
0
][
26
]
=
0
;
epic_disp_print_adv
(
1
,
0
,
12
,
exception_lines
[
0
],
0xFFFF
,
0x0000
);
exception_lines
[
0
][
26
]
=
buf
;
if
(
strlen
(
exception_lines
[
0
])
>
26
)
{
epic_disp_print_adv
(
1
,
0
,
24
,
exception_lines
[
0
]
+
26
,
0xFFFF
,
0x0000
);
}
buf
=
exception_lines
[
1
][
26
];
exception_lines
[
1
][
26
]
=
0
;
epic_disp_print_adv
(
1
,
0
,
40
,
exception_lines
[
1
],
0xF800
,
0x0000
);
exception_lines
[
1
][
26
]
=
buf
;
if
(
strlen
(
exception_lines
[
1
])
>
26
)
{
epic_disp_print_adv
(
1
,
0
,
52
,
exception_lines
[
1
]
+
26
,
0xF800
,
0x0000
);
}
epic_disp_update
();
}
}
else
{
if
(
exception_line_index
<
sizeof
(
exception_lines
[
0
])
-
1
)
{
exception_lines
[
1
][
exception_line_index
++
]
=
c
;
}
}
}
/* Send a string, but replace \n with \n\r */
void
mp_hal_stdout_tx_strn_cooked
(
const
char
*
str
,
size_t
len
)
{
...
...
@@ -156,16 +93,6 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len)
* Only print one line at a time. Insert `\r` between lines so
* they are properly displayed on the serial console.
*/
if
(
strncmp
(
str
,
"Traceback (most recent call last):
\n
"
,
len
)
==
0
)
{
exception
=
true
;
exception_line_index
=
0
;
}
else
if
(
exception
)
{
for
(
size_t
i
=
0
;
i
<
len
;
i
++
)
{
exception_feed
(
str
[
i
]);
}
}
size_t
i
,
last
=
0
;
for
(
i
=
0
;
i
<
len
;
i
++
)
{
if
(
str
[
i
]
==
'\n'
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment