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

Minor fixes

Browse Source
This commit is contained in:
sanni 2023-03-25 08:51:02 +01:00
parent 275638da41
commit 190d35293c
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Cart_Reader/Cart_Reader.ino
View File

@ -4,7 +4,7 @@
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: 08.03.2023 Date: 25.03.2023
Version: 12.4 Version: 12.4
SD lib: https://github.com/greiman/SdFat SD lib: https://github.com/greiman/SdFat
@ -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.0.3 Compiled with Arduino IDE 2.0.4
Thanks to: Thanks to:
MichlK - ROM Reader for Super Nintendo MichlK - ROM Reader for Super Nintendo
@ -200,9 +200,6 @@ char ver[5] = "12.4";
// Renames ROM if found in database // Renames ROM if found in database
#define nointro #define nointro
// Ignores errors that normally force a reset if button 2 is pressed
// #define debug_mode
// Setup RTC if installed. // Setup RTC if installed.
// #define RTC_installed // #define RTC_installed
@ -513,7 +510,7 @@ bool flashSwitchLastBits;
unsigned long writeErrors; unsigned long writeErrors;
// Operation mode // Operation mode
byte mode; byte mode = 0xFF;
//remember folder number to create a new folder for every game //remember folder number to create a new folder for every game
int foldern; int foldern;
@ -1603,8 +1600,8 @@ void selfTest() {
println_Msg(F("")); println_Msg(F(""));
print_STR(press_button_STR, 1); print_STR(press_button_STR, 1);
display_Update(); display_Update();
wait(); //wait();
resetArduino(); //resetArduino();
} }
println_Msg(F("Testing short to GND")); println_Msg(F("Testing short to GND"));
@ -1649,7 +1646,7 @@ void selfTest() {
pinMode(pinNumber, OUTPUT); pinMode(pinNumber, OUTPUT);
digitalWrite(pinNumber, LOW); digitalWrite(pinNumber, LOW);
for (byte pinNumber2 = 2; pinNumber2 <= 69; pinNumber2++) { for (byte pinNumber2 = 2; pinNumber2 <= 69; pinNumber2++) {
if (((2 <= pinNumber2) && (pinNumber2 <= 9)) || ((14 <= pinNumber2) && (pinNumber2 <= 17)) || ((22 <= pinNumber2) && (pinNumber2 <= 37)) || ((42 <= pinNumber2) && (pinNumber2 <= 49)) || ((54 <= pinNumber2) && (pinNumber2 <= 69)) && (pinNumber != pinNumber2)) { if ((((2 <= pinNumber2) && (pinNumber2 <= 9)) || ((14 <= pinNumber2) && (pinNumber2 <= 17)) || ((22 <= pinNumber2) && (pinNumber2 <= 37)) || ((42 <= pinNumber2) && (pinNumber2 <= 49)) || ((54 <= pinNumber2) && (pinNumber2 <= 69))) && (pinNumber != pinNumber2)) {
pinMode(pinNumber2, INPUT_PULLUP); pinMode(pinNumber2, INPUT_PULLUP);
if (!digitalRead(pinNumber2)) { if (!digitalRead(pinNumber2)) {
setColor_RGB(255, 0, 0); setColor_RGB(255, 0, 0);
@ -3083,10 +3080,6 @@ int checkButton() {
void wait_serial() { void wait_serial() {
if (errorLvl) { if (errorLvl) {
// Debug
#ifdef debug_mode
ignoreError = 1;
#endif
errorLvl = 0; errorLvl = 0;
} }
while (Serial.available() == 0) { while (Serial.available() == 0) {
@ -3278,10 +3271,6 @@ void wait_btn() {
// if the cart readers input button is pressed long // if the cart readers input button is pressed long
if (b == 3) { if (b == 3) {
if (errorLvl) { if (errorLvl) {
// Debug
#ifdef debug_mode
ignoreError = 1;
#endif
errorLvl = 0; errorLvl = 0;
} }
break; break;
@ -3360,10 +3349,6 @@ void wait_btn() {
// if the cart readers input button is pressed long // if the cart readers input button is pressed long
if (b == 3) { if (b == 3) {
if (errorLvl) { if (errorLvl) {
// Debug
#ifdef debug_mode
ignoreError = 1;
#endif
errorLvl = 0; errorLvl = 0;
} }
break; break;

4
Cart_Reader/WS.ino
View File

@ -464,7 +464,9 @@ void getDeveloperName(uint8_t id, char *buf, size_t length) {
// custom developerId // custom developerId
case 0x7a: devName = PSTR("7AC"); break; // witch case 0x7a: devName = PSTR("7AC"); break; // witch
case 0xff: devName = PSTR("WWGP"); break; // WWGP series (jss2, dknight) case 0xff:
devName = PSTR("WWGP");
break; // WWGP series (jss2, dknight)
// if not found, use id // if not found, use id
default: snprintf(buf, length, "%02X", id); return; default: snprintf(buf, length, "%02X", id); return;