Fix compiler error

sanni · Sep 13, 2024 · 405b735 · 405b735
1 parent e108d8d
commit 405b735
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Cart_Reader/Cart_Reader.ino b/Cart_Reader/Cart_Reader.ino
@@ -4,8 +4,8 @@
    This project represents a community-driven effort to provide
    an easy to build and easy to modify cartridge dumper.
 
-   Date:             2024-08-16
-   Version:          14.4
+   Date:             2024-09-13
+   Version:          14.5
 
    SD lib: https://github.com/greiman/SdFat
    LCD lib: https://github.com/olikraus/u8g2
@@ -15,7 +15,7 @@
    RTC lib: https://github.com/adafruit/RTClib
    Frequency lib: https://github.com/PaulStoffregen/FreqCount
 
-   Compiled with Arduino IDE 2.2.1
+   Compiled with Arduino IDE 2.3.2
 
    Thanks to:
    MichlK - ROM Reader for Super Nintendo
@@ -1574,7 +1574,7 @@ void mainMenu() {
       break;
 #endif
 
-#ifdef ENABLE_CPS3
+#if (defined(ENABLE_CPS3) && defined(ENABLE_FLASH8) && defined(ENABLE_FLASH16)) 
     case SYSTEM_MENU_CPS3:
       return cpsMenu();
 #endif
@@ -3842,7 +3842,7 @@ void loop() {
 #ifdef ENABLE_VSMILE
     case CORE_VSMILE: return vsmileMenu();
 #endif
-#ifdef ENABLE_CPS3
+#if (defined(ENABLE_CPS3) && defined(ENABLE_FLASH8) && defined(ENABLE_FLASH16)) 
     case CORE_CPS3_CART: return flashromCPS_Cartridge();
     case CORE_CPS3_128SIMM: return flashromCPS_SIMM2x8();
     case CORE_CPS3_64SIMM: return flashromCPS_SIMM4x8();

diff --git a/Cart_Reader/Config.h b/Cart_Reader/Config.h
@@ -391,9 +391,10 @@
 /****/
 
 /* [ CP System III ------------------------------------------------ ]
+also needs ENABLE_FLASH8 and ENABLE_FLASH16 to be enabled
 */
 
-#define ENABLE_CPS3
+//#define ENABLE_CPS3
 
 /****/
 

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

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

diff --git a/Cart_Reader/OSCR.h b/Cart_Reader/OSCR.h
@@ -269,7 +269,7 @@ enum CORES: uint8_t {
 # ifdef ENABLE_VSMILE
   CORE_VSMILE,
 # endif
-# ifdef ENABLE_CPS3
+#if (defined(ENABLE_CPS3) && defined(ENABLE_FLASH8) && defined(ENABLE_FLASH16)) 
   CORE_CPS3_CART,
   CORE_CPS3_64SIMM,
   CORE_CPS3_128SIMM,