diff --git a/Cart_Reader/Cart_Reader.ino b/Cart_Reader/Cart_Reader.ino index 1437382..b470960 100644 --- a/Cart_Reader/Cart_Reader.ino +++ b/Cart_Reader/Cart_Reader.ino @@ -2,15 +2,15 @@ Cartridge Reader for Arduino Mega2560 Author: sanni - Date: 01-03-2019 - Version: 2.9 + Date: 22-03-2019 + Version: 3.0 SD lib: https://github.com/greiman/SdFat LCD lib: https://github.com/adafruit/Adafruit_SSD1306 Clockgen: https://github.com/etherkit/Si5351Arduino RGB Tools lib: https://github.com/joushx/Arduino-RGB-Tools - Compiled with Arduino 1.8.8 + Compiled with Arduino 1.8.9 Thanks to: MichlK - ROM-Reader for Super Nintendo @@ -37,7 +37,7 @@ vogelfreiheit - N64 flashram fix **********************************************************************************/ -char ver[5] = "2.9"; +char ver[5] = "3.0"; /****************************************** Define Starting Point @@ -89,12 +89,11 @@ boolean n64crc = 1; // Graphic I2C LCD #include #include -#define OLED_RESET 4 -Adafruit_SSD1306 display(OLED_RESET); -// Check if Adafruit_SSD1306.h was setup for 128x64 -#if (SSD1306_LCDHEIGHT != 64) -#error("Incorrect height defined in Adafruit_SSD1306.h"); -#endif +#define SCREEN_WIDTH 128 // OLED display width, in pixels +#define SCREEN_HEIGHT 64 // OLED display height, in pixels +// Declaration for an SSD1306 display connected to I2C (SDA, SCL pins) +#define OLED_RESET 4 // Reset pin # (or -1 if sharing Arduino reset pin) +Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET); // Adafruit Clock Generator #include diff --git a/libraries/Adafruit-GFX.zip b/libraries/Adafruit-GFX-Library.zip similarity index 72% rename from libraries/Adafruit-GFX.zip rename to libraries/Adafruit-GFX-Library.zip index 0865cf2..c083447 100644 Binary files a/libraries/Adafruit-GFX.zip and b/libraries/Adafruit-GFX-Library.zip differ diff --git a/libraries/Adafruit_SSD1306.zip b/libraries/Adafruit_SSD1306.zip index 70cdaed..3b1c140 100644 Binary files a/libraries/Adafruit_SSD1306.zip and b/libraries/Adafruit_SSD1306.zip differ diff --git a/libraries/RGBTools.zip b/libraries/Arduino-RGB-Tools.zip similarity index 82% rename from libraries/RGBTools.zip rename to libraries/Arduino-RGB-Tools.zip index 71f0738..dec3b3c 100644 Binary files a/libraries/RGBTools.zip and b/libraries/Arduino-RGB-Tools.zip differ diff --git a/libraries/README.md b/libraries/README.md index 71f5029..f8ff5d3 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -2,7 +2,7 @@ Unzip and copy those into your Arduino library folder e.g. C:\Users\sanni\Docume You can also get the latest versions from their respective github: SD lib: https://github.com/greiman/SdFat -LCD lib: https://github.com/adafruit/Adafruit_SSD1306 (change display size to SSD1306_128_64 in header file) +LCD lib: https://github.com/adafruit/Adafruit_SSD1306 GFX Lib: https://github.com/adafruit/Adafruit-GFX-Library RGB Tools lib: https://github.com/joushx/Arduino-RGB-Tools SI5351 lib: https://github.com/etherkit/Si5351Arduino diff --git a/libraries/SdFat.zip b/libraries/SdFat.zip index 6e19d41..2ac2ef1 100644 Binary files a/libraries/SdFat.zip and b/libraries/SdFat.zip differ diff --git a/libraries/Si5351Arduino.zip b/libraries/Si5351Arduino.zip index d702437..a78d2cb 100644 Binary files a/libraries/Si5351Arduino.zip and b/libraries/Si5351Arduino.zip differ