Make clockgen calibration optional

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:             02.10.2021
+   Date:             14.10.2021
-   Version:          6.7
+   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

Cart_Reader/N64.ino

@@ -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;
@@ -2908,7 +2913,7 @@ redumpsamefolder:
   }
 
   // dumping rom slow
-#ifdef slowcrc
+#ifndef fastcrc
   // get current time
   unsigned long startTime = millis();
 

Cart_Reader/NP.ino

@@ -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);

Cart_Reader/SNES.ino

@@ -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

Cart_Reader/options.h

@@ -10,9 +10,17 @@
 #define enable_OLED
 // Skip OLED start-up animation
 // #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
+// 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 slowcrc // crc will be calculated after dumping from SD card instead of during dumping from memory
+// #define fastcrc 
 
 // saves a n64log.txt file with rom info in /N64/ROM
-#define savesummarytotxt
+// #define savesummarytotxt
-
-// Setup RTC if installed.
-// remove // if you have an RTC installed
-// #define RTC_installed

Cart_Reader/snes_clk.h

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