From 0116c1466745d52f130251c3501135f528ffbf21 Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Wed, 23 Oct 2024 16:12:49 +0100 Subject: [PATCH 1/2] Update 99_developer_guide.md Improve submodule docs --- docs/99_developer_guide.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/99_developer_guide.md b/docs/99_developer_guide.md index 1734b8d9..8aa62879 100644 --- a/docs/99_developer_guide.md +++ b/docs/99_developer_guide.md @@ -45,10 +45,13 @@ For ease of development and debugging, the menu ROM can run in the [Ares emulato * Add the required file to the correct folder on your SD card. -## Update Libdragon submodule -This repo currently uses the `preview` branch as a submodule at a specific commit. +## Update submodules To update to the latest version, use `git submodule update --remote` from the terminal. +### libdragon +This repo currently uses the `preview` branch as a submodule at a specific commit. +* To ensure your local instance is building against it, use `cd ./libdragon && make clobber -j && make libdragon tools -j && make install tools-install -j && cd ..` + ## Generate documentation Run `doxygen` from the dev container terminal. Make sure you fix the warnings before creating a PR! From 329ba270ff9a9698b918c7672fd8dec7d9c7f891 Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Wed, 23 Oct 2024 20:14:25 +0100 Subject: [PATCH 2/2] Improve flashcart info SC64 only. Other flashcarts may show wrong info (but they are not yet supported anyway). --- src/menu/views/flashcart_info.c | 38 +++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/menu/views/flashcart_info.c b/src/menu/views/flashcart_info.c index 41c1f443..fa1f6eb5 100644 --- a/src/menu/views/flashcart_info.c +++ b/src/menu/views/flashcart_info.c @@ -2,6 +2,10 @@ #include "../sound.h" +static inline const char *format_boolean_type (bool bool_value) { + return bool_value ? "Supported" : "Unsupported"; +} + static void process (menu_t *menu) { if (menu->actions.back) { menu->next_mode = MENU_MODE_BROWSER; @@ -18,10 +22,33 @@ static void draw (menu_t *menu, surface_t *d) { component_main_text_draw( ALIGN_CENTER, VALIGN_TOP, - "FLASHCART INFORMATION\n" + "FLASHCART INFORMATION" "\n" "\n" - "This feature is not yet supported.\n\n" + ); + + component_main_text_draw( + ALIGN_LEFT, VALIGN_TOP, + "\n" + "\n" + "Type:\n" + " %s\n\n" + "Firmware:\n" + " %s\n\n" + "Features:\n" + " Virtual 64DD: %s.\n" + " Real Time Clock: %s.\n" + " USB Debugging: %s.\n" + " CIC Detection: %s.\n" + " Region Detection: %s.\n" + "\n\n", + "SummerCart64", + "V?.?.?", + format_boolean_type(true), + format_boolean_type(true), + format_boolean_type(true), + format_boolean_type(true), + format_boolean_type(true) ); // FIXME: Display: @@ -30,13 +57,6 @@ static void draw (menu_t *menu, surface_t *d) { // * supported features (flashcart_features_t) - component_main_text_draw( - ALIGN_LEFT, VALIGN_TOP, - "\n" - "\n" - ); - - component_actions_bar_text_draw( ALIGN_LEFT, VALIGN_TOP, "\n"