V17C: Added changes by zzattack

This commit is contained in:
sanni 2016-07-29 21:33:19 +02:00 committed by GitHub
parent 8cee474a3f
commit ec1347fd8a
2 changed files with 28 additions and 12 deletions

View File

@ -2,8 +2,8 @@
Nintendo Cart Reader for Arduino Mega2560 Nintendo Cart Reader for Arduino Mega2560
Author: sanni Author: sanni
Date: 2016-07-13 Date: 2016-07-29
Version: V17B Version: V17C
SD lib: https://github.com/greiman/SdFat SD lib: https://github.com/greiman/SdFat
LCD lib: https://github.com/adafruit/Adafruit_SSD1306 LCD lib: https://github.com/adafruit/Adafruit_SSD1306
@ -29,7 +29,7 @@
Snes9x - SuperFX Sram Fix Snes9x - SuperFX Sram Fix
**********************************************************************************/ **********************************************************************************/
char ver[5] = "V17B"; char ver[5] = "V17C";
/****************************************** /******************************************
Choose Output Choose Output

View File

@ -30,8 +30,9 @@ const char SnesMenuItem1[] PROGMEM = "Read Rom";
const char SnesMenuItem2[] PROGMEM = "Read Save"; const char SnesMenuItem2[] PROGMEM = "Read Save";
const char SnesMenuItem3[] PROGMEM = "Write Save"; const char SnesMenuItem3[] PROGMEM = "Write Save";
const char SnesMenuItem4[] PROGMEM = "Test SRAM"; const char SnesMenuItem4[] PROGMEM = "Test SRAM";
const char SnesMenuItem5[] PROGMEM = "Reset"; const char SnesMenuItem5[] PROGMEM = "Cycle cart";
const char* const menuOptionsSNES[] PROGMEM = {SnesMenuItem1, SnesMenuItem2, SnesMenuItem3, SnesMenuItem4, SnesMenuItem5}; const char SnesMenuItem6[] PROGMEM = "Reset";
const char* const menuOptionsSNES[] PROGMEM = {SnesMenuItem1, SnesMenuItem2, SnesMenuItem3, SnesMenuItem4, SnesMenuItem5, SnesMenuItem6};
// Manual config menu items // Manual config menu items
const char confMenuItem1[] PROGMEM = "Use header info"; const char confMenuItem1[] PROGMEM = "Use header info";
@ -46,8 +47,8 @@ void snesMenu() {
// create menu with title and 7 options to choose from // create menu with title and 7 options to choose from
unsigned char mainMenu; unsigned char mainMenu;
// Copy menuOptions of of progmem // Copy menuOptions of of progmem
convertPgm(menuOptionsSNES, 5); convertPgm(menuOptionsSNES, 6);
mainMenu = question_box("SNES Cart Reader", menuOptions, 5, 0); mainMenu = question_box("SNES Cart Reader", menuOptions, 6, 0);
// wait for user choice to come back from the question box menu // wait for user choice to come back from the question box menu
switch (mainMenu) switch (mainMenu)
@ -108,6 +109,19 @@ void snesMenu() {
break; break;
case 4: case 4:
// For arcademaster1 (Markfrizb) multi-game carts
// Set reset pin to output (PH0)
DDRH |= (1 << 0);
// Switch RST(PH0) to LOW
PORTH &= ~(1 << 0);
display_Clear();
print_Msg("Resetting...");
display_Update();
delay(3000); // wait 3 secs to switch to next game
asm volatile (" jmp 0");
break;
case 5:
asm volatile (" jmp 0"); asm volatile (" jmp 0");
break; break;
} }
@ -404,11 +418,13 @@ void getCartInfo_SNES() {
display_Update(); display_Update();
// Wait for user input // Wait for user input
println_Msg(F(" ")); if (enable_OLED) {
println_Msg(F(" ")); println_Msg(F(" "));
println_Msg(F("Press Button...")); println_Msg(F(" "));
display_Update(); println_Msg(F("Press Button..."));
wait(); display_Update();
wait();
}
// Start manual config // Start manual config
if (manualConfig == 1) { if (manualConfig == 1) {