diff --git a/bdk/input/joycon.c b/bdk/input/joycon.c index 14fc9ac..d76b796 100644 --- a/bdk/input/joycon.c +++ b/bdk/input/joycon.c @@ -812,7 +812,7 @@ void jc_init_hw() jc_l.uart = UART_C; jc_r.uart = UART_B; -#if (LV_LOG_PRINTF != 1) +#ifndef DEBUG_UART_PORT jc_power_supply(UART_C, true); jc_power_supply(UART_B, true); diff --git a/bdk/libs/lv_conf.h b/bdk/libs/lv_conf.h index ab7f311..dcc437d 100644 --- a/bdk/libs/lv_conf.h +++ b/bdk/libs/lv_conf.h @@ -155,7 +155,11 @@ /*Log settings*/ -#define USE_LV_LOG 0 /*Enable/disable the log module*/ +#ifdef DEBUG_UART_PORT +# define USE_LV_LOG 1 /*Enable/disable the log module*/ +#else +# define USE_LV_LOG 0 /*Enable/disable the log module*/ +#endif #if USE_LV_LOG /* How important log should be added: * LV_LOG_LEVEL_TRACE A lot of logs to give detailed information diff --git a/bdk/libs/lvgl/lv_misc/lv_log.c b/bdk/libs/lvgl/lv_misc/lv_log.c index bd59cf3..d2db0c7 100644 --- a/bdk/libs/lvgl/lv_misc/lv_log.c +++ b/bdk/libs/lvgl/lv_misc/lv_log.c @@ -67,7 +67,7 @@ void lv_log_add(lv_log_level_t level, const char * file, int line, const char * static const char * lvl_prefix[] = {"Trace", "Info", "Warn", "Error"}; char *log = (char *)malloc(0x1000); s_printf(log, "%s: %s \t(%s #%d)\r\n", lvl_prefix[level], dsc, file, line); - uart_send(UART_B, (u8 *)log, strlen(log) + 1); + uart_send(DEBUG_UART_PORT, (u8 *)log, strlen(log) + 1); //gfx_printf("%s: %s \t(%s #%d)\n", lvl_prefix[level], dsc, file, line); #else if(print_cb) print_cb(level, file, line, dsc); diff --git a/nyx/Makefile b/nyx/Makefile index 1c65a78..dabac5c 100644 --- a/nyx/Makefile +++ b/nyx/Makefile @@ -80,7 +80,8 @@ CUSTOMDEFINES := -DNYX_LOAD_ADDR=$(NYX_LOAD_ADDR) -DNYX_MAGIC=$(NYX_MAGIC) CUSTOMDEFINES += -DNYX_VER_MJ=$(NYXVERSION_MAJOR) -DNYX_VER_MN=$(NYXVERSION_MINOR) -DNYX_VER_HF=$(NYXVERSION_HOTFX) -DNYX_RESERVED=$(NYXVERSION_RSVD) CUSTOMDEFINES += -DNYX -DGFX_INC=$(GFX_INC) -DFFCFG_INC=$(FFCFG_INC) -# 0: UART_A, 1: UART_B. +# 0: UART_A, 1: UART_B, 2: UART_C. +# Also enables LV LOG. #CUSTOMDEFINES += -DDEBUG_UART_PORT=1 #CUSTOMDEFINES += -DDEBUG diff --git a/nyx/nyx_gui/nyx.c b/nyx/nyx_gui/nyx.c index 459294a..afed088 100644 --- a/nyx/nyx_gui/nyx.c +++ b/nyx/nyx_gui/nyx.c @@ -402,15 +402,21 @@ void ipl_main() // Important: Preserve version header! __asm__ ("" : : "" (ipl_ver)); -#if (LV_LOG_PRINTF == 1) - gpio_config(GPIO_PORT_G, GPIO_PIN_0, GPIO_MODE_SPIO); - gpio_config(GPIO_PORT_D, GPIO_PIN_1, GPIO_MODE_GPIO); - pinmux_config_uart(UART_B); - clock_enable_uart(UART_B); - uart_init(UART_B, 115200); +#ifdef DEBUG_UART_PORT + #if DEBUG_UART_PORT == UART_B + gpio_config(GPIO_PORT_G, GPIO_PIN_0, GPIO_MODE_SPIO); + gpio_config(GPIO_PORT_D, GPIO_PIN_1, GPIO_MODE_GPIO); + #endif + #if DEBUG_UART_PORT == UART_C + gpio_config(GPIO_PORT_G, GPIO_PIN_0, GPIO_MODE_GPIO); + gpio_config(GPIO_PORT_D, GPIO_PIN_1, GPIO_MODE_SPIO); + #endif + pinmux_config_uart(DEBUG_UART_PORT); + clock_enable_uart(DEBUG_UART_PORT); + uart_init(DEBUG_UART_PORT, 115200); - uart_send(UART_B, (u8 *)"hekate-NYX: Hello!\r\n", 20); - uart_wait_idle(UART_B, UART_TX_IDLE); + uart_send(DEBUG_UART_PORT, (u8 *)"hekate-NYX: Hello!\r\n", 20); + uart_wait_idle(DEBUG_UART_PORT, UART_TX_IDLE); #endif // Initialize the rest of hw and load nyx's resources.