Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2024-11-22 20:49:16 +01:00
Code Issues Projects Releases Wiki Activity

Fix compile errors for co-dependent modules

Browse Source
This commit is contained in:
sanni 2024-08-16 19:04:37 +02:00
parent 06243694d4
commit ac6e606f0d
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cart_Reader/Cart_Reader.ino
View File

@ -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

2
Cart_Reader/Config.h
View File

@ -282,7 +282,7 @@
/* [ Super Famicom SF Memory Cassette ----------------------------- ]
*/
#define ENABLE_SFM
//#define ENABLE_SFM
/****/

13
Cart_Reader/FLASH.ino
View File

@ -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));

2
Cart_Reader/OSCR.cpp
View File

@ -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";

8
Cart_Reader/OSCR.h
View File

@ -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

2
Cart_Reader/SFM.ino
View File

@ -1,7 +1,7 @@
//******************************************
// SF MEMORY MODULE
//******************************************
#ifdef ENABLE_SFM
#if (defined(ENABLE_SFM) && defined(ENABLE_SNES))
/******************************************
SF Memory Clock Source

13
Cart_Reader/SNES.ino
View File

@ -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

2
Cart_Reader/ST.ino
View File

@ -1,7 +1,7 @@
/******************************************
SUPER FAMICOM SUFAMI TURBO MODULE
******************************************/
#ifdef ENABLE_ST
#if (defined(ENABLE_ST) && defined(ENABLE_SNES))
/******************************************
Menu

2
Cart_Reader/SV.ino
View File

@ -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