Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2025-01-23 02:11:11 +01:00
Code Issues Projects Releases Wiki Activity

Make clockgen calibration optional

Browse Source
This commit is contained in:
sanni 2021-10-14 09:53:07 +02:00
parent 0c42af0941
commit a981bb0c3e
9 changed files with 116 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cart_Reader/Cart_Reader.ino
View File

@ -4,8 +4,8 @@
This project represents a community-driven effort to provide
an easy to build and easy to modify cartridge dumper.
Date: 02.10.2021
Version: 6.7
Date: 14.10.2021
Version: 6.8
SD lib: https://github.com/greiman/SdFat
LCD lib: https://github.com/adafruit/Adafruit_SSD1306
@ -40,7 +40,7 @@
**********************************************************************************/
char ver[5] = "6.7";
char ver[5] = "6.8";
/******************************************
Libraries

48
Cart_Reader/MD.ino
View File

@ -663,7 +663,7 @@ void getCartInfo_MD() {
sdBuffer[c] = hiByte;
sdBuffer[c + 1] = loByte;
}
for(int i=0; i<14; i++){
for (int i = 0; i < 14; i++) {
id[i] = char(sdBuffer[i]);
}
@ -681,7 +681,7 @@ void getCartInfo_MD() {
sdBuffer[c] = hiByte;
sdBuffer[c + 1] = loByte;
}
for(int i=0; i<16; i++){
for (int i = 0; i < 16; i++) {
labelLockon[i] = char(sdBuffer[i]);
}
@ -704,29 +704,29 @@ void getCartInfo_MD() {
sdBuffer[c] = hiByte;
sdBuffer[c + 1] = loByte;
}
for(int i=0; i<14; i++){
for (int i = 0; i < 14; i++) {
idLockon[i] = char(sdBuffer[i]);
}
if (!(strncmp("GM 00001009-0", idLockon,13) & strncmp("GM 00004049-0", idLockon,13) )) {
if (!(strncmp("GM 00001009-0", idLockon, 13) & strncmp("GM 00004049-0", idLockon, 13) )) {
//Sonic1 ID:GM 00001009-0? or GM 00004049-0?
SnKmode = 2;
}else if (!(strcmp("GM 00001051-00", idLockon) & strcmp("GM 00001051-01", idLockon) & strcmp("GM 00001051-02", idLockon))) {
} else if (!(strcmp("GM 00001051-00", idLockon) & strcmp("GM 00001051-01", idLockon) & strcmp("GM 00001051-02", idLockon))) {
//Sonic2 ID:GM 00001051-00 or GM 00001051-01 or GM 00001051-02
SnKmode = 3;
// Prepare Sonic2 Banks
writeSSF2Map(0x509878, 1); // 0xA130F1
}else if (!strcmp("GM MK-1079 -00", idLockon)) {
} else if (!strcmp("GM MK-1079 -00", idLockon)) {
//Sonic3 ID:GM MK-1079 -00
SnKmode = 4;
}else{
} else {
//Other game
SnKmode = 5;
}
}else{
} else {
SnKmode = 1;
}
}
@ -926,10 +926,10 @@ void getCartInfo_MD() {
}
//Get Lock-on cart name
if(SnKmode>=2){
if (SnKmode >= 2) {
//Change romName
strcpy(romName,"SnK_");
strcpy(romName, "SnK_");
for (byte c = 0; c < 48; c += 2) {
// split word
@ -949,11 +949,11 @@ void getCartInfo_MD() {
}
}
switch(SnKmode){
case 2: strcat(romName,"SONIC1"); break;
case 3: strcat(romName,"SONIC2"); break;
case 4: strcat(romName,"SONIC3"); break;
case 5: strcat(romName,romNameLockon); break;
switch (SnKmode) {
case 2: strcat(romName, "SONIC1"); break;
case 3: strcat(romName, "SONIC2"); break;
case 4: strcat(romName, "SONIC3"); break;
case 5: strcat(romName, romNameLockon); break;
}
}
@ -983,7 +983,7 @@ void getCartInfo_MD() {
}
print_Msg(F("Size: "));
print_Msg(cartSize * 8 / 1024 / 1024 );
switch(SnKmode){
switch (SnKmode) {
case 2:
case 4:
case 5:
@ -1001,7 +1001,7 @@ void getCartInfo_MD() {
print_Msg(F("ChkS: "));
print_Msg_PaddedHexByte((chksum >> 8));
print_Msg_PaddedHexByte((chksum & 0x00ff));
switch(SnKmode){
switch (SnKmode) {
case 2:
case 4:
case 5:
@ -1128,8 +1128,8 @@ void readROM_MD() {
//Initialize progress bar
uint32_t processedProgressBar = 0;
uint32_t totalProgressBar = (uint32_t)(cartSize);
if(SnKmode>=2) totalProgressBar += (uint32_t) cartSizeLockon;
if(SnKmode==3) totalProgressBar += (uint32_t) cartSizeSonic2;
if (SnKmode >= 2) totalProgressBar += (uint32_t) cartSizeLockon;
if (SnKmode == 3) totalProgressBar += (uint32_t) cartSizeSonic2;
draw_progressbar(0, totalProgressBar);
for (unsigned long currBuffer = 0; currBuffer < cartSize / 2; currBuffer += 512) {
@ -1184,7 +1184,7 @@ void readROM_MD() {
processedProgressBar += 1024;
draw_progressbar(processedProgressBar, totalProgressBar);
}
if(SnKmode >= 2){
if (SnKmode >= 2) {
for (unsigned long currBuffer = 0; currBuffer < cartSizeLockon / 2; currBuffer += 512) {
// Blink led
if (currBuffer % 16384 == 0)
@ -1229,7 +1229,7 @@ void readROM_MD() {
draw_progressbar(processedProgressBar, totalProgressBar);
}
}
if(SnKmode == 3){
if (SnKmode == 3) {
for (unsigned long currBuffer = 0; currBuffer < cartSizeSonic2 / 2; currBuffer += 512) {
// Blink led
if (currBuffer % 16384 == 0)
@ -1238,7 +1238,7 @@ void readROM_MD() {
d = 0;
for (int currWord = 0; currWord < 512; currWord++) {
unsigned long myAddress = currBuffer + currWord + (cartSize+cartSizeLockon) / 2;
unsigned long myAddress = currBuffer + currWord + (cartSize + cartSizeLockon) / 2;
PORTF = myAddress & 0xFF;
PORTK = (myAddress >> 8) & 0xFF;
PORTL = (myAddress >> 16) & 0xFF;
@ -1299,7 +1299,7 @@ void readROM_MD() {
print_Error(F(""), false);
display_Update();
}
if(SnKmode >= 2){
if (SnKmode >= 2) {
if (chksumLockon == calcCKSLockon) {
println_Msg(F("Checksum2 OK"));
display_Update();
@ -1313,7 +1313,7 @@ void readROM_MD() {
display_Update();
}
}
if(SnKmode == 3){
if (SnKmode == 3) {
if (chksumSonic2 == calcCKSSonic2) {
println_Msg(F("Checksum3 OK"));
display_Update();

27
Cart_Reader/N64.ino
View File

@ -421,13 +421,18 @@ void setup_N64_Cart() {
#ifdef clockgen_installed
// Adafruit Clock Generator
// last number is the clock correction factor which is custom for each clock generator
#ifdef clockgen_calibration
int32_t clock_offset = readClockOffset();
if (clock_offset > INT32_MIN) {
clockgen.init(SI5351_CRYSTAL_LOAD_8PF, 0, clock_offset);
} else {
clockgen.init(SI5351_CRYSTAL_LOAD_8PF, 0, 0);
}
#else
// last number is the clock correction factor which is custom for each clock generator
clockgen.init(SI5351_CRYSTAL_LOAD_8PF, 0, 0);
#endif
// Set Eeprom clock to 2Mhz
clockgen.set_freq(200000000ULL, SI5351_CLK1);
@ -1713,7 +1718,7 @@ int strcicmp(char const * a, char const * b)
}
}
#ifdef slowcrc
#ifndef fastcrc
// Calculate dumped rom's CRC32
inline uint32_t updateCRC64(uint8_t ch, uint32_t crc) {
uint32_t idx = ((crc) ^ (ch)) & 0xff;
@ -1889,21 +1894,21 @@ void idCart() {
}
}
// Get CRC1
for (int i = 0; i < 4; i++) {
// Get CRC1
for (int i = 0; i < 4; i++) {
if (sdBuffer[0x10 + i] < 0x10) {
CRC1 += '0';
}
CRC1 += String(sdBuffer[0x10 + i], HEX);
}
}
// Get CRC2
for (int i = 0; i < 4; i++) {
// Get CRC2
for (int i = 0; i < 4; i++) {
if (sdBuffer[0x14 + i] < 0x10) {
CRC2 += '0';
}
CRC2 += String(sdBuffer[0x14 + i], HEX);
}
}
}
/******************************************
@ -2908,7 +2913,7 @@ redumpsamefolder:
}
// dumping rom slow
#ifdef slowcrc
#ifndef fastcrc
// get current time
unsigned long startTime = millis();
@ -3175,10 +3180,10 @@ void savesummary_N64(boolean checkfound, char crcStr[9], unsigned long timeElaps
myFile.print(F("Saved To: "));
myFile.println(folder);
#ifdef RTC_installed
#ifdef RTC_installed
myFile.print(F("Dumped\t: "));
myFile.println(RTCStamp());
#endif
#endif
myFile.print(F("CRC\t: "));
myFile.print(crcStr);

20
Cart_Reader/NGP.ino
View File

@ -125,7 +125,7 @@ bool getCartInfo_NGP() {
snprintf(cartID, 5, "%02X%02X", readByte_NGP(0x21), readByte_NGP(0x20));
// force rom size to 32 Mbits for few titles
if (strcmp(cartID,"0060") == 0 || strcmp(cartID,"0061") == 0 || strcmp(cartID,"0069") == 0 )
if (strcmp(cartID, "0060") == 0 || strcmp(cartID, "0061") == 0 || strcmp(cartID, "0069") == 0 )
cartSize = 4194304;
// get app version
@ -249,7 +249,7 @@ void scanChip_NGP() {
uint32_t block_addr = 0;
// generate name of report file
snprintf(fileName, FILENAME_LENGTH, "%s.txt",romName);
snprintf(fileName, FILENAME_LENGTH, "%s.txt", romName);
// create a new folder to save report file
EEPROM_readAnything(0, foldern);
@ -277,11 +277,11 @@ void scanChip_NGP() {
myFile.println("");
// write chip info to report file
myFile.println("Chip manufacturer ID : 0x" + String(manufacturerID,HEX));
myFile.println("Chip device ID : 0x" + String(deviceID,HEX));
myFile.println("Chip manufacturer ID : 0x" + String(manufacturerID, HEX));
myFile.println("Chip device ID : 0x" + String(deviceID, HEX));
myFile.println("");
if(cartSize == 0)
if (cartSize == 0)
myFile.println("Cart size unknown");
else {
// enter autoselect mode
@ -295,7 +295,7 @@ void scanChip_NGP() {
uint8_t sectorID = 0;
// skip the 2nd 16Mbits chip
if (cartSize == 4194304){
if (cartSize == 4194304) {
myFile.println("Warning: this cart is 32Mbits. Only the first 16Mbits chip will be scanned.");
myFile.println("");
addrMax = 2097152;
@ -306,14 +306,14 @@ void scanChip_NGP() {
myFile.println("Sector | Start address | Status");
// browse sectors
for(uint32_t addr = 0; addr < addrMax; addr+= 0x1000) {
for (uint32_t addr = 0; addr < addrMax; addr += 0x1000) {
if( (addr%0x10000 == 0) || (addr == addrMax-0x8000) || (addr == addrMax-0x6000) || (addr == addrMax-0x4000)){
if ( (addr % 0x10000 == 0) || (addr == addrMax - 0x8000) || (addr == addrMax - 0x6000) || (addr == addrMax - 0x4000)) {
myFile.print("#" + String(sectorID) + " | 0x" + String(addr,HEX) + " | ");
myFile.print("#" + String(sectorID) + " | 0x" + String(addr, HEX) + " | ");
// check the protection status
if(readByte_NGP(addr + 0x2) == 0)
if (readByte_NGP(addr + 0x2) == 0)
myFile.println("unprotected");
else
myFile.println("protected");

5
Cart_Reader/NP.ino
View File

@ -606,12 +606,17 @@ void setup_SFM() {
//PORTH &= ~(1 << 1);
// Adafruit Clock Generator
#ifdef clockgen_calibration
int32_t clock_offset = readClockOffset();
if (clock_offset > INT32_MIN) {
clockgen.init(SI5351_CRYSTAL_LOAD_8PF, 0, clock_offset);
} else {
clockgen.init(SI5351_CRYSTAL_LOAD_8PF, 0, 0);
}
#else
clockgen.init(SI5351_CRYSTAL_LOAD_8PF, 0, 0);
#endif
clockgen.set_pll(SI5351_PLL_FIXED, SI5351_PLLA);
clockgen.set_pll(SI5351_PLL_FIXED, SI5351_PLLB);
clockgen.set_freq(2147727200ULL, SI5351_CLK0);

6
Cart_Reader/SNES.ino
View File

@ -436,13 +436,17 @@ void setup_Snes() {
//PORTJ &= ~(1 << 0);
// Adafruit Clock Generator
// last number is the clock correction factor which is custom for each clock generator
#ifdef clockgen_calibration
int32_t clock_offset = readClockOffset();
if (clock_offset > INT32_MIN) {
clockgen.init(SI5351_CRYSTAL_LOAD_8PF, 0, clock_offset);
} else {
clockgen.init(SI5351_CRYSTAL_LOAD_8PF, 0, 0);
}
#else
// last number is the clock correction factor which is custom for each clock generator
clockgen.init(SI5351_CRYSTAL_LOAD_8PF, 0, 0);
#endif
// Set clocks to 4Mhz/1Mhz for better SA-1 unlocking
clockgen.set_freq(100000000ULL, SI5351_CLK1); // CPU

22
Cart_Reader/options.h
View File

@ -9,10 +9,18 @@
// be sure to change the Arduino Serial Monitor to no line ending
#define enable_OLED
// Skip OLED start-up animation
//#define fast_start
// #define fast_start
// Enable the second button
#define enable_Button2
// Setup RTC if installed.
// remove // if you have an RTC installed
// #define RTC_installed
// Use calibration data from snes_clk.txt
// #define clockgen_calibration
//******************************************
// ENABLED MODULES
//******************************************
@ -35,14 +43,10 @@
//******************************************
// Read N64 Eeprom with Adadruit clockgen, CLK1 switch needs to be switch to ON
// add // and disable CLK1 switch if you don't have the clockgen installed or if you want to read a repros save
#define clockgen_installed
// #define clockgen_installed
// Define CRC method for dumping N64 ROMs, slow seems to be more compatible with some SD cards
#define slowcrc // crc will be calculated after dumping from SD card instead of during dumping from memory
// The CRC for N64 Roms will be calculated during dumping from memory instead of after dumping from SD card, not compatible to all Cart Readers
// #define fastcrc
// saves a n64log.txt file with rom info in /N64/ROM
#define savesummarytotxt
// Setup RTC if installed.
// remove // if you have an RTC installed
// #define RTC_installed
// #define savesummarytotxt

2
Cart_Reader/snes_clk.h
View File

@ -3,7 +3,5 @@
#include "SdFat.h"
#include "atoi32.h"
int32_t readClockOffset();
#endif