Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2025-01-13 05:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix compiler error

Browse Source
This commit is contained in:
sanni 2024-09-13 09:32:13 +02:00
parent e108d8d63d
commit 405b73577a
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cart_Reader/Cart_Reader.ino
View File

@ -4,8 +4,8 @@
This project represents a community-driven effort to provide This project represents a community-driven effort to provide
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-09-13
Version: 14.4 Version: 14.5
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
@ -15,7 +15,7 @@
RTC lib: https://github.com/adafruit/RTClib RTC lib: https://github.com/adafruit/RTClib
Frequency lib: https://github.com/PaulStoffregen/FreqCount Frequency lib: https://github.com/PaulStoffregen/FreqCount
Compiled with Arduino IDE 2.2.1 Compiled with Arduino IDE 2.3.2
Thanks to: Thanks to:
MichlK - ROM Reader for Super Nintendo MichlK - ROM Reader for Super Nintendo
@ -1574,7 +1574,7 @@ void mainMenu() {
break; break;
#endif #endif
#ifdef ENABLE_CPS3 #if (defined(ENABLE_CPS3) && defined(ENABLE_FLASH8) && defined(ENABLE_FLASH16))
case SYSTEM_MENU_CPS3: case SYSTEM_MENU_CPS3:
return cpsMenu(); return cpsMenu();
#endif #endif
@ -3842,7 +3842,7 @@ void loop() {
#ifdef ENABLE_VSMILE #ifdef ENABLE_VSMILE
case CORE_VSMILE: return vsmileMenu(); case CORE_VSMILE: return vsmileMenu();
#endif #endif
#ifdef ENABLE_CPS3 #if (defined(ENABLE_CPS3) && defined(ENABLE_FLASH8) && defined(ENABLE_FLASH16))
case CORE_CPS3_CART: return flashromCPS_Cartridge(); case CORE_CPS3_CART: return flashromCPS_Cartridge();
case CORE_CPS3_128SIMM: return flashromCPS_SIMM2x8(); case CORE_CPS3_128SIMM: return flashromCPS_SIMM2x8();
case CORE_CPS3_64SIMM: return flashromCPS_SIMM4x8(); case CORE_CPS3_64SIMM: return flashromCPS_SIMM4x8();

3
Cart_Reader/Config.h
View File

@ -391,9 +391,10 @@
/****/ /****/
/* [ CP System III ------------------------------------------------ ] /* [ CP System III ------------------------------------------------ ]
also needs ENABLE_FLASH8 and ENABLE_FLASH16 to be enabled
*/ */
#define ENABLE_CPS3 //#define ENABLE_CPS3
/****/ /****/

2
Cart_Reader/FLASH_CPS3.ino
View File

@ -5,7 +5,7 @@
// Tested with HW5 // Tested with HW5
// https://github.com/herzmx/CPS3-OSCR-Adapter // https://github.com/herzmx/CPS3-OSCR-Adapter
//****************************************** //******************************************
#ifdef ENABLE_CPS3 #if (defined(ENABLE_CPS3) && defined(ENABLE_FLASH8) && defined(ENABLE_FLASH16))
/****************************************** /******************************************
Variables Variables
*****************************************/ *****************************************/

2
Cart_Reader/OSCR.cpp
View File

@ -49,7 +49,7 @@
* String Constants * String Constants
**/ **/
// Firmware Version // Firmware Version
constexpr char PROGMEM FSTRING_VERSION[] = "V14.4"; constexpr char PROGMEM FSTRING_VERSION[] = "V14.5";
// Universal // Universal
constexpr char PROGMEM FSTRING_RESET[] = "Reset"; constexpr char PROGMEM FSTRING_RESET[] = "Reset";

2
Cart_Reader/OSCR.h
View File

@ -269,7 +269,7 @@ enum CORES: uint8_t {
# ifdef ENABLE_VSMILE # ifdef ENABLE_VSMILE
CORE_VSMILE, CORE_VSMILE,
# endif # endif
# ifdef ENABLE_CPS3 #if (defined(ENABLE_CPS3) && defined(ENABLE_FLASH8) && defined(ENABLE_FLASH16))
CORE_CPS3_CART, CORE_CPS3_CART,
CORE_CPS3_64SIMM, CORE_CPS3_64SIMM,
CORE_CPS3_128SIMM, CORE_CPS3_128SIMM,