Added splash screen.

tgolla · Sep 14, 2021 · fc1d034 · fc1d034
1 parent 8176780
commit fc1d034
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/.vscode/arduino.json b/.vscode/arduino.json
@@ -1,5 +1,6 @@
 {
     "sketch": "SphereBot.ino",
-    "board": "arduino:avr:uno",
-    "port": "COM4"
+    "board": "arduino:avr:mega",
+    "port": "COM6",
+    "configuration": "cpu=atmega2560"
 }
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -40,14 +40,22 @@
             "intelliSenseMode": "gcc-x64",
             "includePath": [
                 "C:\\Program Files (x86)\\Arduino\\hardware\\arduino\\avr\\cores\\arduino",
-                "C:\\Program Files (x86)\\Arduino\\hardware\\arduino\\avr\\variants\\standard",
+                "C:\\Program Files (x86)\\Arduino\\hardware\\arduino\\avr\\variants\\mega",
                 "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\Adafruit_Motor_Shield_V2_Library",
                 "C:\\Program Files (x86)\\Arduino\\hardware\\arduino\\avr\\libraries\\Wire\\src",
                 "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\GCodeParser\\src",
                 "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\EEPROMTyped\\src",
                 "C:\\Program Files (x86)\\Arduino\\hardware\\arduino\\avr\\libraries\\EEPROM\\src",
                 "C:\\Program Files (x86)\\Arduino\\hardware\\arduino\\avr\\libraries\\SPI\\src",
+                "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\Adafruit_GFX_Library",
+                "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\Adafruit_ILI9341",
+                "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\arduino_705536\\src",
+                "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\Adafruit_FT6206_Library",
+                "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\Adafruit_ImageReader_Library",
+                "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\Adafruit_SPIFlash\\src",
                 "C:\\Program Files (x86)\\Arduino\\libraries\\Servo\\src",
+                "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\Adafruit_BusIO",
+                "C:\\Users\\tgoll\\Documents\\Arduino\\libraries\\Adafruit_EPD\\src",
                 "c:\\program files (x86)\\arduino\\hardware\\tools\\avr\\lib\\gcc\\avr\\7.3.0\\include",
                 "c:\\program files (x86)\\arduino\\hardware\\tools\\avr\\lib\\gcc\\avr\\7.3.0\\include-fixed",
                 "c:\\program files (x86)\\arduino\\hardware\\tools\\avr\\avr\\include"
@@ -60,7 +68,7 @@
             "defines": [
                 "F_CPU=16000000L",
                 "ARDUINO=10813",
-                "ARDUINO_AVR_UNO",
+                "ARDUINO_AVR_MEGA2560",
                 "ARDUINO_ARCH_AVR",
                 "__DBL_MIN_EXP__=(-125)",
                 "__HQ_FBIT__=15",
@@ -559,7 +567,8 @@
                 "__cpp_init_captures=201304",
                 "__ATOMIC_ACQ_REL=4",
                 "__ATOMIC_RELEASE=3",
-                "__BUILTIN_AVR_FMUL=1"
+                "__BUILTIN_AVR_FMUL=1",
+                "USBCON"
             ]
         }
     ]

diff --git a/Configuration.h b/Configuration.h
@@ -25,8 +25,12 @@
 
 // Set to true if you are using an Adafruit 2.8" TFT Touch Shield for 
 // Arduino w/Capacitive Touch with an Arduino Mega 2560 Note: A Mega
-// 2560 is required due to the memory requirements.  
-#define ADAFRUIT_TFT_TOUCH_SHIELD false
+// 2560 is required due to the memory requirements.  You will also
+// need to cut the traces between 11-13 and solder bridge the ICSP 
+// pins for the board to work with the Mega 2560 board.
+// REf: https://learn.adafruit.com/adafruit-2-8-tft-touch-shield-v2/connecting#using-with-a-mega-slash-leonardo
+
+#define ADAFRUIT_TFT_TOUCH_SHIELD true
 
 // Adafruit 2.8" TFT Touch Shield for Arduino w/Capacitive Touch
 // The display uses hardware SPI, plus #9 & #10.

diff --git a/SD/splash.bmp b/SD/splash.bmp
diff --git a/SphereBot.ino b/SphereBot.ino
@@ -274,14 +274,23 @@ void setup()
     {
       tft.begin();
       tft.setRotation(3);
-      tft.fillScreen(ILI9341_WHITE);
+      tft.fillScreen(ILI9341_BLACK);
 
       serialMode = false;
 
       // Display Splash Screen
       ImageReturnCode stat = reader.drawBMP("/splash.bmp", tft, 0, 0);
 
+      tft.setCursor(10, 20);
+      tft.setTextColor(ILI9341_WHITE);
+      tft.setTextSize(5);
+      tft.print("SphereBot ");
+      tft.setCursor(10, 20 + (8 * 5));
+      tft.setTextSize(1);
+      tft.print("v2.0");
+
       delay(SPLASH_SCREEN_DELAY);
+      tft.fillScreen(ILI9341_BLACK);
 
       // Prompt for operation mode (Serial/USB or SD Card)
     }