Lephenixnoir
/
PythonExtra
1
0
Fork 2
Code Issues 9 Pull Requests 3 Projects Releases 2 Wiki Activity

ports/sh: basic improvements to USB debugging (not quite ready yet) 

The USB driver isn't stable enough to support funky uncontrolled async
messages yet. Tends to freeze and need a reconnect. Future problem.
This commit is contained in:
Lephenixnoir 2022-12-04 14:34:47 +01:00
parent eeae10abc5
commit ed66b0d6a7
Signed by: Lephenixnoir
GPG Key ID: 1BBA026E13FC0495
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ports/sh/debug.c
View File

@ -4,9 +4,11 @@
#include <gint/kmalloc.h>
#include <gint/display.h>
#include <gint/keyboard.h>
#include <gint/timer.h>
#include <gint/cpu.h>
#include <stdio.h>
#include <stdlib.h>
#include "py/mpstate.h"
void pe_debug_panic(char const *msg)
{
@ -23,44 +25,53 @@ void pe_debug_panic(char const *msg)
#if PE_DEBUG
#if 0 // Timeout fxlink not supported yet
static bool timeout_popup(void)
{
dclear(C_BLACK);
dtext_opt(DWIDTH/2, DHEIGHT/2 - 21, C_WHITE, C_NONE, DTEXT_MIDDLE,
DTEXT_MIDDLE, "An fxlink message timed out!");
dtext_opt(DWIDTH/2, DHEIGHT/2 - 7, C_WHITE, C_NONE, DTEXT_MIDDLE,
DTEXT_MIDDLE, "Start fxlink and press [EXE]:");
dtext_opt(DWIDTH/2, DHEIGHT/2 + 7, C_WHITE, C_NONE, DTEXT_MIDDLE,
DTEXT_MIDDLE, "% fxlink -iqw");
dtext_opt(DWIDTH/2, DHEIGHT/2 + 21, C_WHITE, C_NONE, DTEXT_MIDDLE,
DTEXT_MIDDLE, "or press [EXIT] to drop the message");
dupdate();
while(1) {
int key = getkey().key;
if(key == KEY_EXE)
return false;
if(key == KEY_EXIT)
return true;
}
}
#endif
void pe_debug_init(void)
{
usb_interface_t const *intf[] = { &usb_ff_bulk, NULL };
usb_open(intf, GINT_CALL_NULL);
dclear(C_BLACK);
dtext_opt(DWIDTH/2, DHEIGHT/2 - 3, C_WHITE, C_NONE, DTEXT_MIDDLE,
DTEXT_BOTTOM, "Waiting for USB connection...");
dtext_opt(DWIDTH/2, DHEIGHT/2 + 3, C_WHITE, C_NONE, DTEXT_MIDDLE,
DTEXT_TOP, "% fxlink -iqw");
dupdate();
while(!usb_is_open()) sleep();
usb_open_wait();
}
void pe_debug_printf(char const *fmt, ...)
int pe_debug_printf(char const *fmt, ...)
{
char str_default[256];
char str[512];
va_list args;
va_start(args, fmt);
char *str;
vasprintf(&str, fmt, args);
int rc = vsnprintf(str, sizeof str, fmt, args);
va_end(args);
if(str == NULL) {
va_start(args, fmt);
str = str_default;
vsnprintf(str, sizeof str_default, fmt, args);
va_end(args);
}
if(usb_is_open())
usb_fxlink_text(str, 0);
usb_open_wait();
usb_fxlink_text(str, 0);
return rc;
}
/* This function is used in MicroPython. */
void DEBUG_printf(char const *fmt, ...)
int DEBUG_printf(char const *fmt, ...)
__attribute__((alias("pe_debug_printf")));
void pe_debug_kmalloc(void)
@ -78,8 +89,8 @@ void pe_debug_kmalloc(void)
void pe_debug_screenshot(void)
{
if(usb_is_open())
usb_fxlink_screenshot(true);
usb_open_wait();
usb_fxlink_screenshot(true);
}
#endif /* PE_DEBUG */

2
ports/sh/debug.h
View File

@ -25,7 +25,7 @@ __attribute__((noreturn));
/* Print to the debug stream. This function is also called DEBUG_printf in
MicroPython code. */
void pe_debug_printf(char const *fmt, ...);
int pe_debug_printf(char const *fmt, ...);
/* Print information about allocation status. */
void pe_debug_kmalloc(void);