Fix Clock Gen Calibration Menu

Function didn't display negative calibration factors correctly.

Also added option to use the calibration factor without enabling the calibration menu to save some space.

2 files changed, 68 insertions, 70 deletions

diff --git a/Cart_Reader/Cart_Reader.ino b/Cart_Reader/Cart_Reader.ino
index d96fede..c146368 100644
--- a/Cart_Reader/Cart_Reader.ino
+++ b/Cart_Reader/Cart_Reader.ino
@@ -4,7 +4,7 @@
    This project represents a community-driven effort to provide

    an easy to build and easy to modify cartridge dumper.

 

-   Date:             2023-09-22

+   Date:             2023-10-17

    Version:          12.9

 

    SD lib: https://github.com/greiman/SdFat

@@ -39,7 +39,7 @@
    jiyunomegami, splash5, Kreeblah, ramapcsx2, PsyK0p4T, Dakkaron, majorpbx, Pickle, sdhizumi,

    Uzlopak, sakman55, Tombo89, scrap-a, borti4938, vogelfreiheit, CaitSith2, Modman,

    philenotfound, karimhadjsalem, nsx0r, ducky92, niklasweber, Lesserkuma, BacteriaMage,

-   vpelletier, Ancyker, mattiacci, RWeick, joshman196, partlyhuman, ButThouMust, hxlnt, 

+   vpelletier, Ancyker, mattiacci, RWeick, joshman196, partlyhuman, ButThouMust, hxlnt,

    breyell

 

    And to nocash for figuring out the secrets of the SFC Nintendo Power cartridge.

@@ -143,7 +143,7 @@ void print_FatalError(const __FlashStringHelper* errorMessage) __attribute__((no
 void print_FatalError(byte errorMessage) __attribute__((noreturn));

 

 /******************************************

- End of inclusions and forward declarations

+  End of inclusions and forward declarations

  *****************************************/

 

 template<class T> int EEPROM_writeAnything(int ee, const T& value) {

@@ -396,49 +396,49 @@ byte iNES_HEADER[16];
 //******************************************

 // CRC32 lookup table // 256 entries

 static const uint32_t crc_32_tab[] PROGMEM = { /* CRC polynomial 0xedb88320 */

-                                               0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,

-                                               0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,

-                                               0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,

-                                               0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,

-                                               0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,

-                                               0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,

-                                               0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,

-                                               0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,

-                                               0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,

-                                               0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,

-                                               0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,

-                                               0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,

-                                               0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,

-                                               0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,

-                                               0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,

-                                               0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,

-                                               0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,

-                                               0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,

-                                               0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,

-                                               0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,

-                                               0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,

-                                               0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,

-                                               0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,

-                                               0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,

-                                               0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,

-                                               0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,

-                                               0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,

-                                               0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,

-                                               0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,

-                                               0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,

-                                               0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,

-                                               0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,

-                                               0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,

-                                               0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,

-                                               0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,

-                                               0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,

-                                               0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,

-                                               0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,

-                                               0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,

-                                               0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,

-                                               0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,

-                                               0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,

-                                               0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d

+  0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,

+  0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,

+  0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,

+  0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,

+  0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,

+  0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,

+  0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,

+  0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,

+  0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,

+  0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,

+  0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,

+  0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,

+  0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,

+  0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,

+  0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,

+  0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,

+  0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,

+  0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,

+  0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,

+  0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,

+  0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,

+  0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,

+  0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,

+  0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,

+  0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,

+  0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,

+  0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,

+  0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,

+  0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,

+  0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,

+  0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,

+  0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,

+  0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,

+  0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,

+  0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,

+  0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,

+  0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,

+  0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,

+  0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,

+  0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,

+  0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,

+  0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,

+  0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d

 };

 

 // Defined as a macros, as compiler disregards inlining requests and these are

@@ -1467,28 +1467,28 @@ void mainMenu() {
 

 #ifdef enable_C64

     case 22:

-      setup_C64(); 

+      setup_C64();

       c64Menu();

       break;

 #endif

 

 #ifdef enable_5200

     case 23:

-      setup_5200(); 

+      setup_5200();

       a5200Menu();

       break;

 #endif

 

 #ifdef enable_7800

     case 24:

-      setup_7800(); 

+      setup_7800();

       a7800Menu();

       break;

 #endif

 

 #ifdef enable_VECTREX

     case 25:

-      setup_VECTREX(); 

+      setup_VECTREX();

       vectrexMenu();

       break;

 #endif

@@ -1774,7 +1774,7 @@ void RTCStart() {
     abort();

   }

 

-// RTC_DS1307 does not have lostPower()

+  // RTC_DS1307 does not have lostPower()

 #if defined(DS3231)

   // Set RTC Date/Time of Sketch Build if it lost battery power

   // After initial setup it would have lost battery power ;)

@@ -1831,11 +1831,10 @@ void clkcal() {
   // last number is the clock correction factor which is custom for each clock generator

   cal_factor = readClockOffset();

 

-  display.clearDisplay();

-  display.setCursor(0, 0);

-  display.print("Read correction: ");

-  display.println(cal_factor);

-  display.updateDisplay();

+  display_Clear();

+  print_Msg(F("Read correction: "));

+  println_Msg(String(cal_factor));

+  display_Update();

   delay(500);

 

   if (cal_factor > INT32_MIN) {

@@ -1868,11 +1867,7 @@ void clkcal() {
   while (1) {

     if (old_cal != cal_factor) {

       display_Clear();

-      println_Msg(F(""));

-      println_Msg(F(""));

-      println_Msg(F(""));

-      println_Msg(F(""));

-      println_Msg(F("     Adjusting"));

+      println_Msg(F("Adjusting..."));

       display_Update();

       clockgen.set_correction(cal_factor, SI5351_PLL_INPUT_XO);

       clockgen.set_pll(SI5351_PLL_FIXED, SI5351_PLLA);

@@ -1893,21 +1888,23 @@ void clkcal() {
         float count = FreqCount.read();

         display_Clear();

         println_Msg(F("Clock Calibration"));

-        println_Msg(F(""));

         print_Msg(F("Freq:   "));

         print_Msg(count);

         println_Msg(F("Hz"));

         print_Msg(F("Correction:"));

-        print_right(cal_factor);

-        print_Msg(F("Adjustment:"));

+        println_Msg(String(cal_factor));

+        print_Msg(F("Step:"));

         print_right(cal_offset);

+        println_Msg(F(""));

 #ifdef enable_Button2

         println_Msg(F("(Hold button to save)"));

         println_Msg(F(""));

         println_Msg(F("Decrease     Increase"));

 #else

 #ifdef enable_rotary

-        println_Msg(F("Rotate to adjust"));

+        println_Msg(F("Rotate to adjust Frequency"));

+        println_Msg(F("Press to change step width"));

+        println_Msg(F("Hold to save"));

 #else

         println_Msg(F("Click/dbl to adjust"));

 #endif

@@ -1998,7 +1995,7 @@ void print_right(int32_t number) {
 void savetofile() {

   display_Clear();

   println_Msg(F("Saving..."));

-  println_Msg(cal_factor);

+  println_Msg(String(cal_factor));

   display_Update();

   delay(2000);

 

@@ -2017,7 +2014,7 @@ void savetofile() {
 }

 #endif

 

-#ifdef clockgen_calibration

+#if defined(clockgen_calibration) || defined(use_clockgen_calibration)

 int32_t atoi32_signed(const char* input_string) {

   if (input_string == NULL) {

     return 0;

@@ -2093,7 +2090,7 @@ int32_t readClockOffset() {
 #endif

 

 int32_t initializeClockOffset() {

-#ifdef clockgen_calibration

+#ifdef use_clockgen_calibration

   FsFile clock_file;

   const char zero_char_arr[] = { '0' };

   int32_t clock_offset = readClockOffset();

@@ -2164,7 +2161,7 @@ void setup() {
   pixels.setPixelColor(2, pixels.Color(0, 0, 100));

   pixels.show();

 

-// Set TX0 LED Pin(PE1) to Output for status indication during flashing for HW4

+  // Set TX0 LED Pin(PE1) to Output for status indication during flashing for HW4

 #if !(defined(enable_serial) || defined(HW5))

   DDRE |= (1 << 1);

 #endif

diff --git a/Cart_Reader/Config.h b/Cart_Reader/Config.h
index f3556cd..a41c49c 100644
--- a/Cart_Reader/Config.h
+++ b/Cart_Reader/Config.h
@@ -335,10 +335,11 @@
 /****/
 
 /* [ SNES Core/CLOCKGEN: Read Clock Generator Calibration Data ---- ]
-    Toggle to use calibration data from snes_clk.txt
+    Toggle clock calibration menu and whether or not to use calibration data from snes_clk.txt
 */
 
 //#define clockgen_calibration
+//#define use_clockgen_calibration
 
 /****/