From ac6e606f0d829dc2a967ab494d712b6612d6dfa1 Mon Sep 17 00:00:00 2001 From: sanni Date: Fri, 16 Aug 2024 19:04:37 +0200 Subject: [PATCH] Fix compile errors for co-dependent modules --- Cart_Reader/Cart_Reader.ino | 10 +++++----- Cart_Reader/Config.h | 2 +- Cart_Reader/FLASH.ino | 13 +++++++++++++ Cart_Reader/OSCR.cpp | 2 +- Cart_Reader/OSCR.h | 8 ++++---- Cart_Reader/SFM.ino | 2 +- Cart_Reader/SNES.ino | 13 ------------- Cart_Reader/ST.ino | 2 +- Cart_Reader/SV.ino | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cart_Reader/Cart_Reader.ino b/Cart_Reader/Cart_Reader.ino index edd93f1..c7ab43a 100644 --- a/Cart_Reader/Cart_Reader.ino +++ b/Cart_Reader/Cart_Reader.ino @@ -5,7 +5,7 @@ an easy to build and easy to modify cartridge dumper. Date: 2024-08-16 - Version: 14.3 + Version: 14.4 SD lib: https://github.com/greiman/SdFat LCD lib: https://github.com/olikraus/u8g2 @@ -3691,7 +3691,7 @@ void loop() { #ifdef ENABLE_SNES case CORE_SNES: return snesMenu(); #endif -#ifdef ENABLE_SFM +#if (defined(ENABLE_SFM) && defined(ENABLE_SNES)) case CORE_SFM: return sfmMenu(); #ifdef ENABLE_FLASH case CORE_SFM_FLASH: return sfmFlashMenu(); @@ -3722,7 +3722,7 @@ void loop() { #ifdef ENABLE_PCE case CORE_PCE: return pceMenu(); #endif -#ifdef ENABLE_SV + #if (defined(ENABLE_SV) && defined(ENABLE_SNES)) case CORE_SV: return svMenu(); #endif #ifdef ENABLE_NES @@ -3794,10 +3794,10 @@ void loop() { #ifdef ENABLE_JAGUAR case CORE_JAGUAR: return jagMenu(); #endif -#ifdef ENABLE_ST +#if (defined(ENABLE_ST) && defined(ENABLE_SNES)) case CORE_ST: return stMenu(); #endif -#ifdef ENABLE_GPC +#if (defined(ENABLE_GPC) && defined(ENABLE_SNES)) case CORE_GPC: return gpcMenu(); #endif #ifdef ENABLE_ATARI8 diff --git a/Cart_Reader/Config.h b/Cart_Reader/Config.h index 7e4e425..ae5ac08 100644 --- a/Cart_Reader/Config.h +++ b/Cart_Reader/Config.h @@ -282,7 +282,7 @@ /* [ Super Famicom SF Memory Cassette ----------------------------- ] */ -#define ENABLE_SFM +//#define ENABLE_SFM /****/ diff --git a/Cart_Reader/FLASH.ino b/Cart_Reader/FLASH.ino index b6ca00d..8328fbb 100644 --- a/Cart_Reader/FLASH.ino +++ b/Cart_Reader/FLASH.ino @@ -142,6 +142,19 @@ void flashMenu() { } #endif +void setupCFI() { + display_Clear(); + display_Update(); + filePath[0] = '\0'; + sd.chdir("/"); + fileBrowser(F("Select file")); + display_Clear(); + setup_Flash8(); + identifyCFI_Flash(); + sprintf(filePath, "%s/%s", filePath, fileName); + display_Clear(); +} + void readOnlyMode() { display_Clear(); println_Msg(FS(FSTRING_EMPTY)); diff --git a/Cart_Reader/OSCR.cpp b/Cart_Reader/OSCR.cpp index f0ac560..f9e2aaa 100644 --- a/Cart_Reader/OSCR.cpp +++ b/Cart_Reader/OSCR.cpp @@ -49,7 +49,7 @@ * String Constants **/ // Firmware Version -constexpr char PROGMEM FSTRING_VERSION[] = "V14.3"; +constexpr char PROGMEM FSTRING_VERSION[] = "V14.4"; // Universal constexpr char PROGMEM FSTRING_RESET[] = "Reset"; diff --git a/Cart_Reader/OSCR.h b/Cart_Reader/OSCR.h index cd0027b..f32d8bd 100644 --- a/Cart_Reader/OSCR.h +++ b/Cart_Reader/OSCR.h @@ -124,7 +124,7 @@ enum CORES: uint8_t { # ifdef ENABLE_SNES CORE_SNES, # endif -# ifdef ENABLE_SFM +#if (defined(ENABLE_SFM) && defined(ENABLE_SNES)) CORE_SFM, # ifdef ENABLE_FLASH CORE_SFM_FLASH, @@ -155,7 +155,7 @@ enum CORES: uint8_t { # ifdef ENABLE_PCE CORE_PCE, # endif -# ifdef ENABLE_SV + #if (defined(ENABLE_SV) && defined(ENABLE_SNES)) CORE_SV, # endif # ifdef ENABLE_NES @@ -227,10 +227,10 @@ enum CORES: uint8_t { # ifdef ENABLE_VECTREX CORE_VECTREX, # endif -# ifdef ENABLE_ST +#if (defined(ENABLE_ST) && defined(ENABLE_SNES)) CORE_ST, # endif -# ifdef ENABLE_GPC +#if (defined(ENABLE_GPC) && defined(ENABLE_SNES)) CORE_GPC, # endif # ifdef ENABLE_ATARI8 diff --git a/Cart_Reader/SFM.ino b/Cart_Reader/SFM.ino index 1b62bdb..6e4ac41 100644 --- a/Cart_Reader/SFM.ino +++ b/Cart_Reader/SFM.ino @@ -1,7 +1,7 @@ //****************************************** // SF MEMORY MODULE //****************************************** -#ifdef ENABLE_SFM +#if (defined(ENABLE_SFM) && defined(ENABLE_SNES)) /****************************************** SF Memory Clock Source diff --git a/Cart_Reader/SNES.ino b/Cart_Reader/SNES.ino index 7e11e98..2147217 100644 --- a/Cart_Reader/SNES.ino +++ b/Cart_Reader/SNES.ino @@ -78,19 +78,6 @@ static const char reproEXItem2[] PROGMEM = "standard (ABCD)"; static const char* const menuOptionsReproEX[] PROGMEM = { reproEXItem1, reproEXItem2, FSTRING_RESET }; */ -void setupCFI() { - display_Clear(); - display_Update(); - filePath[0] = '\0'; - sd.chdir("/"); - fileBrowser(F("Select file")); - display_Clear(); - setup_Flash8(); - identifyCFI_Flash(); - sprintf(filePath, "%s/%s", filePath, fileName); - display_Clear(); -} - /*boolean reproEXMenu() { boolean fileOrder = 0; // create menu with title and 3 options to choose from diff --git a/Cart_Reader/ST.ino b/Cart_Reader/ST.ino index 0dd5df7..4800115 100644 --- a/Cart_Reader/ST.ino +++ b/Cart_Reader/ST.ino @@ -1,7 +1,7 @@ /****************************************** SUPER FAMICOM SUFAMI TURBO MODULE ******************************************/ -#ifdef ENABLE_ST +#if (defined(ENABLE_ST) && defined(ENABLE_SNES)) /****************************************** Menu diff --git a/Cart_Reader/SV.ino b/Cart_Reader/SV.ino index bed6f5b..e09a7e3 100644 --- a/Cart_Reader/SV.ino +++ b/Cart_Reader/SV.ino @@ -3,7 +3,7 @@ // Revision 1.0.0 October 22nd 2018 // Added BSX Sram, copied from skamans enhanced sketch //sanni //****************************************** -#ifdef ENABLE_SV + #if (defined(ENABLE_SV) && defined(ENABLE_SNES)) /****************************************** Satellaview 8M Memory Pack