mirror of
https://github.com/sanni/cartreader.git
synced 2024-11-26 22:44:15 +01:00
Fix compile errors for co-dependent modules
This commit is contained in:
parent
06243694d4
commit
ac6e606f0d
@ -5,7 +5,7 @@
|
|||||||
an easy to build and easy to modify cartridge dumper.
|
an easy to build and easy to modify cartridge dumper.
|
||||||
|
|
||||||
Date: 2024-08-16
|
Date: 2024-08-16
|
||||||
Version: 14.3
|
Version: 14.4
|
||||||
|
|
||||||
SD lib: https://github.com/greiman/SdFat
|
SD lib: https://github.com/greiman/SdFat
|
||||||
LCD lib: https://github.com/olikraus/u8g2
|
LCD lib: https://github.com/olikraus/u8g2
|
||||||
@ -3691,7 +3691,7 @@ void loop() {
|
|||||||
#ifdef ENABLE_SNES
|
#ifdef ENABLE_SNES
|
||||||
case CORE_SNES: return snesMenu();
|
case CORE_SNES: return snesMenu();
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_SFM
|
#if (defined(ENABLE_SFM) && defined(ENABLE_SNES))
|
||||||
case CORE_SFM: return sfmMenu();
|
case CORE_SFM: return sfmMenu();
|
||||||
#ifdef ENABLE_FLASH
|
#ifdef ENABLE_FLASH
|
||||||
case CORE_SFM_FLASH: return sfmFlashMenu();
|
case CORE_SFM_FLASH: return sfmFlashMenu();
|
||||||
@ -3722,7 +3722,7 @@ void loop() {
|
|||||||
#ifdef ENABLE_PCE
|
#ifdef ENABLE_PCE
|
||||||
case CORE_PCE: return pceMenu();
|
case CORE_PCE: return pceMenu();
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_SV
|
#if (defined(ENABLE_SV) && defined(ENABLE_SNES))
|
||||||
case CORE_SV: return svMenu();
|
case CORE_SV: return svMenu();
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_NES
|
#ifdef ENABLE_NES
|
||||||
@ -3794,10 +3794,10 @@ void loop() {
|
|||||||
#ifdef ENABLE_JAGUAR
|
#ifdef ENABLE_JAGUAR
|
||||||
case CORE_JAGUAR: return jagMenu();
|
case CORE_JAGUAR: return jagMenu();
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_ST
|
#if (defined(ENABLE_ST) && defined(ENABLE_SNES))
|
||||||
case CORE_ST: return stMenu();
|
case CORE_ST: return stMenu();
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_GPC
|
#if (defined(ENABLE_GPC) && defined(ENABLE_SNES))
|
||||||
case CORE_GPC: return gpcMenu();
|
case CORE_GPC: return gpcMenu();
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_ATARI8
|
#ifdef ENABLE_ATARI8
|
||||||
|
@ -282,7 +282,7 @@
|
|||||||
/* [ Super Famicom SF Memory Cassette ----------------------------- ]
|
/* [ Super Famicom SF Memory Cassette ----------------------------- ]
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define ENABLE_SFM
|
//#define ENABLE_SFM
|
||||||
|
|
||||||
/****/
|
/****/
|
||||||
|
|
||||||
|
@ -142,6 +142,19 @@ void flashMenu() {
|
|||||||
}
|
}
|
||||||
#endif
|
#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() {
|
void readOnlyMode() {
|
||||||
display_Clear();
|
display_Clear();
|
||||||
println_Msg(FS(FSTRING_EMPTY));
|
println_Msg(FS(FSTRING_EMPTY));
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
* String Constants
|
* String Constants
|
||||||
**/
|
**/
|
||||||
// Firmware Version
|
// Firmware Version
|
||||||
constexpr char PROGMEM FSTRING_VERSION[] = "V14.3";
|
constexpr char PROGMEM FSTRING_VERSION[] = "V14.4";
|
||||||
|
|
||||||
// Universal
|
// Universal
|
||||||
constexpr char PROGMEM FSTRING_RESET[] = "Reset";
|
constexpr char PROGMEM FSTRING_RESET[] = "Reset";
|
||||||
|
@ -124,7 +124,7 @@ enum CORES: uint8_t {
|
|||||||
# ifdef ENABLE_SNES
|
# ifdef ENABLE_SNES
|
||||||
CORE_SNES,
|
CORE_SNES,
|
||||||
# endif
|
# endif
|
||||||
# ifdef ENABLE_SFM
|
#if (defined(ENABLE_SFM) && defined(ENABLE_SNES))
|
||||||
CORE_SFM,
|
CORE_SFM,
|
||||||
# ifdef ENABLE_FLASH
|
# ifdef ENABLE_FLASH
|
||||||
CORE_SFM_FLASH,
|
CORE_SFM_FLASH,
|
||||||
@ -155,7 +155,7 @@ enum CORES: uint8_t {
|
|||||||
# ifdef ENABLE_PCE
|
# ifdef ENABLE_PCE
|
||||||
CORE_PCE,
|
CORE_PCE,
|
||||||
# endif
|
# endif
|
||||||
# ifdef ENABLE_SV
|
#if (defined(ENABLE_SV) && defined(ENABLE_SNES))
|
||||||
CORE_SV,
|
CORE_SV,
|
||||||
# endif
|
# endif
|
||||||
# ifdef ENABLE_NES
|
# ifdef ENABLE_NES
|
||||||
@ -227,10 +227,10 @@ enum CORES: uint8_t {
|
|||||||
# ifdef ENABLE_VECTREX
|
# ifdef ENABLE_VECTREX
|
||||||
CORE_VECTREX,
|
CORE_VECTREX,
|
||||||
# endif
|
# endif
|
||||||
# ifdef ENABLE_ST
|
#if (defined(ENABLE_ST) && defined(ENABLE_SNES))
|
||||||
CORE_ST,
|
CORE_ST,
|
||||||
# endif
|
# endif
|
||||||
# ifdef ENABLE_GPC
|
#if (defined(ENABLE_GPC) && defined(ENABLE_SNES))
|
||||||
CORE_GPC,
|
CORE_GPC,
|
||||||
# endif
|
# endif
|
||||||
# ifdef ENABLE_ATARI8
|
# ifdef ENABLE_ATARI8
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
//******************************************
|
//******************************************
|
||||||
// SF MEMORY MODULE
|
// SF MEMORY MODULE
|
||||||
//******************************************
|
//******************************************
|
||||||
#ifdef ENABLE_SFM
|
#if (defined(ENABLE_SFM) && defined(ENABLE_SNES))
|
||||||
|
|
||||||
/******************************************
|
/******************************************
|
||||||
SF Memory Clock Source
|
SF Memory Clock Source
|
||||||
|
@ -78,19 +78,6 @@ static const char reproEXItem2[] PROGMEM = "standard (ABCD)";
|
|||||||
static const char* const menuOptionsReproEX[] PROGMEM = { reproEXItem1, reproEXItem2, FSTRING_RESET };
|
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 reproEXMenu() {
|
||||||
boolean fileOrder = 0;
|
boolean fileOrder = 0;
|
||||||
// create menu with title and 3 options to choose from
|
// create menu with title and 3 options to choose from
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/******************************************
|
/******************************************
|
||||||
SUPER FAMICOM SUFAMI TURBO MODULE
|
SUPER FAMICOM SUFAMI TURBO MODULE
|
||||||
******************************************/
|
******************************************/
|
||||||
#ifdef ENABLE_ST
|
#if (defined(ENABLE_ST) && defined(ENABLE_SNES))
|
||||||
|
|
||||||
/******************************************
|
/******************************************
|
||||||
Menu
|
Menu
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
// Revision 1.0.0 October 22nd 2018
|
// Revision 1.0.0 October 22nd 2018
|
||||||
// Added BSX Sram, copied from skamans enhanced sketch //sanni
|
// Added BSX Sram, copied from skamans enhanced sketch //sanni
|
||||||
//******************************************
|
//******************************************
|
||||||
#ifdef ENABLE_SV
|
#if (defined(ENABLE_SV) && defined(ENABLE_SNES))
|
||||||
|
|
||||||
/******************************************
|
/******************************************
|
||||||
Satellaview 8M Memory Pack
|
Satellaview 8M Memory Pack
|
||||||
|
Loading…
Reference in New Issue
Block a user