From d2b2db151119e20d3711ff958d24dd93ac1c91d1 Mon Sep 17 00:00:00 2001 From: Mateusz Faderewski Date: Thu, 4 Jan 2024 11:14:29 +0100 Subject: [PATCH 1/3] Fixed PAL60 mode + updated libdragon --- src/menu/menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/menu/menu.c b/src/menu/menu.c index 3e695f0d..7cd3758a 100644 --- a/src/menu/menu.c +++ b/src/menu/menu.c @@ -20,8 +20,6 @@ #include "views/views.h" -#define TV_TYPE_RAM *((uint32_t *) (0x80000300)) - #define CACHE_DIRECTORY "sd:/menu/cache" #define BACKGROUND_CACHE "sd:/menu/cache/background.data" @@ -33,6 +31,8 @@ static menu_t *menu; static tv_type_t tv_type; static volatile int frame_counter = 0; +extern tv_type_t __boot_tvtype; + static void frame_counter_handler (void) { frame_counter += 1; @@ -99,7 +99,7 @@ static void menu_init (boot_params_t *boot_params) { tv_type = get_tv_type(); if ((tv_type == TV_PAL) && menu->settings.pal60_enabled) { // HACK: Set TV type to NTSC, so PAL console would output 60 Hz signal instead. - TV_TYPE_RAM = TV_NTSC; + __boot_tvtype = TV_NTSC; } display_init(RESOLUTION_640x480, DEPTH_16_BPP, 2, GAMMA_NONE, FILTERS_DISABLED); @@ -111,7 +111,7 @@ static void menu_deinit (menu_t *menu) { unregister_VI_handler(frame_counter_handler); // NOTE: Restore previous TV type so boot procedure wouldn't passthrough wrong value. - TV_TYPE_RAM = tv_type; + __boot_tvtype = tv_type; hdmi_send_game_id(menu->boot_params); From 661f89c87069358468a33db420e06ab0f31decd6 Mon Sep 17 00:00:00 2001 From: Mateusz Faderewski Date: Sun, 7 Jan 2024 05:24:26 +0100 Subject: [PATCH 2/3] Add CNAME to GitHub pages --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0d2703c..98730deb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -110,3 +110,4 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./output/docs + cname: menu.summercart64.dev From ff478bccc78cbcfd96d482aac03595dc20c26cd1 Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Wed, 10 Jan 2024 16:06:20 +0000 Subject: [PATCH 3/3] Update .gitignore Ignore whole tools folder, it might contain other flashcart tools such as UnfLoader --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2cfc2261..de80dacb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ /build /filesystem /output -/tools/sc64/* +/tools/* # There should never be ROMs uploaded, but just incase, make sure they are excluded. **/*.n64