From 49f18e3db10be7af7a1d20da1e9a658089c82ae9 Mon Sep 17 00:00:00 2001 From: JWS Date: Sun, 30 Mar 2025 18:59:12 -0500 Subject: [PATCH 1/4] add DFSC Penult --- Cart_Reader/2600.ino | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Cart_Reader/2600.ino b/Cart_Reader/2600.ino index 15c43eb..2d77db0 100644 --- a/Cart_Reader/2600.ino +++ b/Cart_Reader/2600.ino @@ -41,6 +41,7 @@ static const byte PROGMEM a2600mapsize[] = { 0x0A, 2, // "UA" UA Ltd 8K 0x3E, 5, // Tigervision 32K with 32K RAM 0x07, 6, // X07 64K ROM + 0xDF, 7, // "DFSC" Penult 128K }; byte a2600mapcount = (sizeof(a2600mapsize) / sizeof(a2600mapsize[0])) / 2; @@ -562,6 +563,17 @@ void readROM_2600() { readData_2600(0x080D | (x << 4)); readSegment_2600(0x1000, 0x2000); } + break; + + case 0xDF: // DFSC 128K + for (int x = 0; x < 0x20; x++) { + readData_2600(0x1FC0 + x); + readSegment_2600(0x1000, 0x1FBF); + } + break; + + default: + break; } myFile.close(); @@ -599,6 +611,8 @@ void println_Mapper2600(byte mapper) { println_Msg(F("TP")); else if (mapper == 0x07) println_Msg(F("X07")); + else if (mapper == 0xDF) + println_Msg(F("DFSC")); else println_Msg(mapper, HEX); #else @@ -622,6 +636,8 @@ void println_Mapper2600(byte mapper) { Serial.println(F("TP")); else if (mapper == 0x07) Serial.println(F("X07")); + else if (mapper == 0xDF) + Serial.println(F("DFSC")); else Serial.println(mapper, HEX); #endif @@ -713,6 +729,7 @@ setmapper: Serial.println(F("16 = TP [Time Pilot 8K]")); Serial.println(F("17 = UA [UA Ltd]")); Serial.println(F("18 = 3E [Tigervision 32K \w RAM]")); + Serial.println(F("19 = DFSC [Penult 128K]")); Serial.print(F("Enter Mapper [0-17]: ")); while (Serial.available() == 0) {} newmap = Serial.readStringUntil('\n'); From e6436ea8677982ee449a98b1b94ad3a5f8868157 Mon Sep 17 00:00:00 2001 From: JWS Date: Sun, 30 Mar 2025 19:03:09 -0500 Subject: [PATCH 2/4] fix merge --- sd/st.txt | 80 +++++++++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/sd/st.txt b/sd/st.txt index 9fe256e..d72ad3e 100644 --- a/sd/st.txt +++ b/sd/st.txt @@ -1,40 +1,40 @@ -Bishoujo Senshi Sailor Moon Sailor Stars - Fuwafuwa Panic 2 (Japan).st -BB5C4238 - -Crayon Shin-chan - Nagagutsu Dobon!! (Japan).st -8EB753F3 - -Gegege no Kitarou - Youkai Donjara (Japan).st -4296500D - -Gekisou Sentai Carranger - Zenkai! Racer Senshi (Japan).st -14C66FCA - -Poi Poi Ninja World (Japan).st -32B2B3DD - -SD Gundam Generation - Axis Senki (Japan).st -72B4235F - -SD Gundam Generation - Babylonia Kenkoku Senki (Japan).st -792D884C - -SD Gundam Generation - Colony Kakutouki (Japan).st -C5DFA8FD - -SD Gundam Generation - Gryps Senki (Japan).st -48ECAE44 - -SD Gundam Generation - Ichinen Sensouki (Japan).st -AFD74DCB - -SD Gundam Generation - Zanscare Senki (Japan).st -EFD3A865 - -SD Ultra Battle - Seven Densetsu (Japan).st -43AD5A45 - -SD Ultra Battle - Ultraman Densetsu (Japan).st -04939D14 - - +Bishoujo Senshi Sailor Moon Sailor Stars - Fuwafuwa Panic 2 (Japan).st +BB5C4238 + +Crayon Shin-chan - Nagagutsu Dobon!! (Japan).st +8EB753F3 + +Gegege no Kitarou - Youkai Donjara (Japan).st +4296500D + +Gekisou Sentai Carranger - Zenkai! Racer Senshi (Japan).st +14C66FCA + +Poi Poi Ninja World (Japan).st +32B2B3DD + +SD Gundam Generation - Axis Senki (Japan).st +72B4235F + +SD Gundam Generation - Babylonia Kenkoku Senki (Japan).st +792D884C + +SD Gundam Generation - Colony Kakutouki (Japan).st +C5DFA8FD + +SD Gundam Generation - Gryps Senki (Japan).st +48ECAE44 + +SD Gundam Generation - Ichinen Sensouki (Japan).st +AFD74DCB + +SD Gundam Generation - Zanscare Senki (Japan).st +EFD3A865 + +SD Ultra Battle - Seven Densetsu (Japan).st +43AD5A45 + +SD Ultra Battle - Ultraman Densetsu (Japan).st +04939D14 + + From b59557cf85295adaadd5fd46b8502ddbbac1ffcf Mon Sep 17 00:00:00 2001 From: JWS Date: Sun, 30 Mar 2025 20:05:22 -0500 Subject: [PATCH 3/4] fix rom size message --- Cart_Reader/2600.ino | 6 +++--- Cart_Reader/Config.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cart_Reader/2600.ino b/Cart_Reader/2600.ino index faa6e69..e0f911a 100644 --- a/Cart_Reader/2600.ino +++ b/Cart_Reader/2600.ino @@ -41,14 +41,14 @@ static const byte PROGMEM a2600mapsize[] = { 0x0A, 2, // "UA" UA Ltd 8K 0x3E, 5, // Tigervision 32K with 32K RAM 0x07, 6, // X07 64K ROM - 0xDF, 7, // "DFSC" Penult 128K + 0xDF, 7, // "DFSC" Penult 128K ROM with 32K RAM }; byte a2600mapcount = (sizeof(a2600mapsize) / sizeof(a2600mapsize[0])) / 2; byte a2600mapselect; int a2600index; -byte a2600[] = { 2, 4, 8, 12, 16, 32, 64 }; +byte a2600[] = { 2, 4, 8, 12, 16, 32, 64, 128 }; byte a2600mapper = 0; byte a2600size; @@ -602,7 +602,7 @@ void println_Mapper2600(byte mapper) { void checkStatus_2600() { EEPROM_readAnything(7, a2600mapper); EEPROM_readAnything(8, a2600size); - if (a2600size > 6) { + if (a2600size > 7) { a2600size = 1; // default 4KB EEPROM_writeAnything(8, a2600size); } diff --git a/Cart_Reader/Config.h b/Cart_Reader/Config.h index dddebe6..0b8b6aa 100644 --- a/Cart_Reader/Config.h +++ b/Cart_Reader/Config.h @@ -31,7 +31,7 @@ //#define HW5 //#define HW4 -//#define HW3 +#define HW3 //#define HW2 //#define HW1 //#define SERIAL_MONITOR @@ -70,7 +70,7 @@ /* [ Atari 2600 --------------------------------------------------- ] */ -//#define ENABLE_2600 +#define ENABLE_2600 /****/ From cdd1edb56017476ecc243572fa9ac656aac7dc2d Mon Sep 17 00:00:00 2001 From: JWS Date: Sun, 30 Mar 2025 20:19:51 -0500 Subject: [PATCH 4/4] remove my HW define so automatic pull request may work --- Cart_Reader/Config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cart_Reader/Config.h b/Cart_Reader/Config.h index 0b8b6aa..7b88178 100644 --- a/Cart_Reader/Config.h +++ b/Cart_Reader/Config.h @@ -31,7 +31,7 @@ //#define HW5 //#define HW4 -#define HW3 +//#define HW3 //#define HW2 //#define HW1 //#define SERIAL_MONITOR