Add display test sketches

nseidle · nseidle · commit d78ba269f9b9 · 2020-12-02T20:34:37.000-07:00
diff --git a/Firmware/Display/Display.ino b/Firmware/Display/Display.ino
@@ -3,19 +3,14 @@
 
    Distributed as-is; no warranty is given.
 */
-#include <Wire.h>  // Include Wire if you're using I2C
-#include <SFE_MicroOLED.h>  // Include the SFE_MicroOLED library
+#include <Wire.h>
+#include <SFE_MicroOLED.h> //Click here to get the library: http://librarymanager/All#SparkFun_Micro_OLED
+#include "icons.h"
 
-#define PIN_RESET 9  // Connect RST to pin 9 (SPI & I2C)
-#define DC_JUMPER 1 // Set to either 0 (SPI, default) or 1 (I2C) based on jumper, matching the value of the DC Jumper
+#define PIN_RESET 9
+#define DC_JUMPER 1
 MicroOLED oled(PIN_RESET, DC_JUMPER);
 
-uint8_t Battery_0 [] = {
-0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01,
-0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B,
-0x0B, 0x0B, 0x08, 0x0F, 0x01, 0x01, 
-};
-
 bool displayDetected = false;
 
 void setup()
@@ -48,12 +43,47 @@ void loop()
 {
   if (displayDetected)
   {
-    oled.drawIcon(0, 0, 19, 16, Battery_0, sizeof(Battery_0), true);
+    //    oled.drawIcon(0, 0, Battery_3_Width, Battery_3_Height, Battery_3, sizeof(Battery_3), true);
+    //    oled.drawIcon(4, 4, Battery_1_Width, Battery_1_Height, Battery_1, sizeof(Battery_1), true);
+    //    oled.drawIcon(4, 4, Battery_0_Width, Battery_0_Height, Battery_0, sizeof(Battery_0), true);
+    //    oled.drawIcon(4, 4, Rover_Width, Rover_Height, Rover, sizeof(Rover), true);
+
+    oled.setFontType(1); //Set font to type 1: 8x16
+
+    //HPA
+//    oled.setCursor(0, 21); //x, y
+//    oled.print("HPA:");
+//    oled.print("125");
+
+    //3D Mean Accuracy
+    oled.setCursor(17, 19); //x, y: Squeeze against the colon
+    oled.print(":12.1");
+
+    //SIV
+    oled.setCursor(16, 35); //x, y
+    oled.print(":24");
+
+    //Bluetooth Address
+    oled.setFontType(0); //Set font to type 0: 
+    oled.setCursor(0, 4); //x, y
+    oled.print("BC5D");
+
+    oled.drawIcon(45, 0, Battery_2_Width, Battery_2_Height, Battery_2, sizeof(Battery_2), true);
+    oled.drawIcon(28, 0, Base_Width, Base_Height, Base, sizeof(Base), true);
+    oled.drawIcon(0, 18, CrossHair_Width, CrossHair_Height, CrossHair, sizeof(CrossHair), true);
+    oled.drawIcon(1, 35, Antenna_Width, Antenna_Height, Antenna, sizeof(Antenna), true);
     oled.display();
 
-    while(1);
+    while (1);
   }
 
+  //Fix type
+  //None
+  //3D
+  //RTK Fix
+  //RTK Float
+  //TIME - Base thing
+
   Serial.print(".");
   delay(100);
 }
diff --git a/Firmware/Display/DisplayHelper.ino b/Firmware/Display/DisplayHelper.ino
@@ -1,3 +1,4 @@
+
 bool isConnected(uint8_t deviceAddress)
 {
   Wire.beginTransmission(deviceAddress);
diff --git a/Firmware/Display/icons.h b/Firmware/Display/icons.h
@@ -0,0 +1,58 @@
+uint8_t CrossHair [] = {
+0x80, 0x80, 0xF0, 0x88, 0x84, 0x84, 0x84, 0x7F, 0x84, 0x84, 0x84, 0x88, 0xF0, 0x80, 0x80, 0x00,
+0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x7F, 0x10, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00, 
+};
+int CrossHair_Height = 15;
+int CrossHair_Width = 15;
+
+uint8_t Antenna [] = {
+0x7E, 0xC3, 0x03, 0x06, 0x04, 0x0C, 0x18, 0x38, 0x7C, 0xCE, 0x84, 0x00, 0x00, 0x01, 0x1F, 0x1E,
+0x1C, 0x0C, 0x08, 0x08, 0x0C, 0x04, 0x07, 0x07, 
+};
+int Antenna_Height = 13;
+int Antenna_Width = 12;
+
+uint8_t Rover [] = {
+0x3C, 0x24, 0x64, 0xF4, 0xF7, 0x61, 0x21, 0x21, 0x21, 0x61, 0xF7, 0xF4, 0x64, 0x3C, 0x18, 
+};
+int Rover_Height = 8;
+int Rover_Width = 15;
+
+uint8_t Base [] = {
+0x00, 0xFF, 0x23, 0x13, 0x08, 0x88, 0x88, 0x88, 0x88, 0x08, 0x10, 0x20, 0xC0, 0x00, 0x0E, 0x09,
+0x08, 0x08, 0x08, 0x0F, 0x00, 0x00, 0x0F, 0x08, 0x08, 0x08, 0x09, 0x0E, 
+};
+int Base_Height = 12;
+int Base_Width = 14;
+
+uint8_t Battery_3 [] = {
+0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01,
+0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B,
+0x0B, 0x0B, 0x08, 0x0F, 0x01, 0x01, 
+};
+int Battery_3_Height = 12;
+int Battery_3_Width = 19;
+
+uint8_t Battery_2 [] = {
+0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08,
+0x08, 0x08, 0x08, 0x0F, 0x01, 0x01, 
+};
+int Battery_2_Height = 12;
+int Battery_2_Width = 19;
+
+uint8_t Battery_1 [] = {
+0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+0x08, 0x08, 0x08, 0x0F, 0x01, 0x01, 
+};
+int Battery_1_Height = 12;
+int Battery_1_Width = 19;
+
+uint8_t Battery_0 [] = {
+0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+0x08, 0x08, 0x08, 0x0F, 0x01, 0x01, 
+};
+int Battery_0_Height = 12;
+int Battery_0_Width = 19;
diff --git a/Firmware/Display_Base/DisplayHelper.ino b/Firmware/Display_Base/DisplayHelper.ino
@@ -0,0 +1,8 @@
+
+bool isConnected(uint8_t deviceAddress)
+{
+  Wire.beginTransmission(deviceAddress);
+  if (Wire.endTransmission() == 0)
+    return true;
+  return false;
+}
diff --git a/Firmware/Display_Base/Display_Base.ino b/Firmware/Display_Base/Display_Base.ino
@@ -0,0 +1,89 @@
+/*
+   MicroOLED_Clock.ino
+
+   Distributed as-is; no warranty is given.
+*/
+#include <Wire.h>
+#include <SFE_MicroOLED.h> //Click here to get the library: http://librarymanager/All#SparkFun_Micro_OLED
+#include "icons.h"
+
+#define PIN_RESET 9
+#define DC_JUMPER 1
+MicroOLED oled(PIN_RESET, DC_JUMPER);
+
+bool displayDetected = false;
+
+void setup()
+{
+  Wire.begin();
+  Wire.setClock(400000);
+
+  Serial.begin(115200);
+  delay(100);
+  Serial.println("OLED example");
+
+  //0x3D is default on Qwiic board
+  if (isConnected(0x3D) == true || isConnected(0x3C) == true)
+  {
+    Serial.println("Display detected");
+    displayDetected = true;
+  }
+  else
+    Serial.println("No display detected");
+
+  if (displayDetected)
+  {
+    oled.begin();     // Initialize the OLED
+    oled.clear(PAGE); // Clear the display's internal memory
+    oled.clear(ALL);  // Clear the library's display buffer
+  }
+}
+
+void loop()
+{
+  if (displayDetected)
+  {
+    //    oled.drawIcon(0, 0, Battery_3_Width, Battery_3_Height, Battery_3, sizeof(Battery_3), true);
+    //    oled.drawIcon(4, 4, Battery_1_Width, Battery_1_Height, Battery_1, sizeof(Battery_1), true);
+    //    oled.drawIcon(4, 4, Battery_0_Width, Battery_0_Height, Battery_0, sizeof(Battery_0), true);
+    //    oled.drawIcon(4, 4, Rover_Width, Rover_Height, Rover, sizeof(Rover), true);
+
+    oled.setFontType(1); //Set font to type 1: 8x16
+
+    //HPA
+//    oled.setCursor(0, 21); //x, y
+//    oled.print("HPA:");
+//    oled.print("125");
+
+    //3D Mean Accuracy
+    oled.setCursor(17, 19); //x, y: Squeeze against the colon
+    oled.print(":12.1");
+
+    //SIV
+    oled.setCursor(16, 35); //x, y
+    oled.print(":24");
+
+    //Bluetooth Address
+    oled.setFontType(0); //Set font to type 0: 
+    oled.setCursor(0, 4); //x, y
+    oled.print("BC5D");
+
+    oled.drawIcon(45, 0, Battery_2_Width, Battery_2_Height, Battery_2, sizeof(Battery_2), true);
+    oled.drawIcon(28, 0, Base_Width, Base_Height, Base, sizeof(Base), true);
+    oled.drawIcon(0, 18, CrossHair_Width, CrossHair_Height, CrossHair, sizeof(CrossHair), true);
+    oled.drawIcon(1, 35, Antenna_Width, Antenna_Height, Antenna, sizeof(Antenna), true);
+    oled.display();
+
+    while (1);
+  }
+
+  //Fix type
+  //None
+  //3D
+  //RTK Fix
+  //RTK Float
+  //TIME - Base thing
+
+  Serial.print(".");
+  delay(100);
+}
diff --git a/Firmware/Display_Base/icons.h b/Firmware/Display_Base/icons.h
@@ -0,0 +1,58 @@
+uint8_t CrossHair [] = {
+0x80, 0x80, 0xF0, 0x88, 0x84, 0x84, 0x84, 0x7F, 0x84, 0x84, 0x84, 0x88, 0xF0, 0x80, 0x80, 0x00,
+0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x7F, 0x10, 0x10, 0x10, 0x08, 0x07, 0x00, 0x00, 
+};
+int CrossHair_Height = 15;
+int CrossHair_Width = 15;
+
+uint8_t Antenna [] = {
+0x7E, 0xC3, 0x03, 0x06, 0x04, 0x0C, 0x18, 0x38, 0x7C, 0xCE, 0x84, 0x00, 0x00, 0x01, 0x1F, 0x1E,
+0x1C, 0x0C, 0x08, 0x08, 0x0C, 0x04, 0x07, 0x07, 
+};
+int Antenna_Height = 13;
+int Antenna_Width = 12;
+
+uint8_t Rover [] = {
+0x3C, 0x24, 0x64, 0xF4, 0xF7, 0x61, 0x21, 0x21, 0x21, 0x61, 0xF7, 0xF4, 0x64, 0x3C, 0x18, 
+};
+int Rover_Height = 8;
+int Rover_Width = 15;
+
+uint8_t Base [] = {
+0x00, 0xFF, 0x23, 0x13, 0x08, 0x88, 0x88, 0x88, 0x88, 0x08, 0x10, 0x20, 0xC0, 0x00, 0x0E, 0x09,
+0x08, 0x08, 0x08, 0x0F, 0x00, 0x00, 0x0F, 0x08, 0x08, 0x08, 0x09, 0x0E, 
+};
+int Base_Height = 12;
+int Base_Width = 14;
+
+uint8_t Battery_3 [] = {
+0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01,
+0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B,
+0x0B, 0x0B, 0x08, 0x0F, 0x01, 0x01, 
+};
+int Battery_3_Height = 12;
+int Battery_3_Width = 19;
+
+uint8_t Battery_2 [] = {
+0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08,
+0x08, 0x08, 0x08, 0x0F, 0x01, 0x01, 
+};
+int Battery_2_Height = 12;
+int Battery_2_Width = 19;
+
+uint8_t Battery_1 [] = {
+0xFF, 0x01, 0xFD, 0xFD, 0xFD, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x0B, 0x0B, 0x0B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+0x08, 0x08, 0x08, 0x0F, 0x01, 0x01, 
+};
+int Battery_1_Height = 12;
+int Battery_1_Width = 19;
+
+uint8_t Battery_0 [] = {
+0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x0F, 0x08, 0xF8, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+0x08, 0x08, 0x08, 0x0F, 0x01, 0x01, 
+};
+int Battery_0_Height = 12;
+int Battery_0_Width = 19;
diff --git a/Firmware/Display_Icon/Display_Icon.ino b/Firmware/Display_Icon/Display_Icon.ino
@@ -32,7 +32,7 @@ uint8_t truck [] = {
 };
 
 int iconHeight = 17;
-int iconWidth = 20;
+int iconWidth = 19;
 
 bool displayDetected = false;
 
@@ -79,6 +79,8 @@ void loop()
     oled.drawIcon(iconX, iconY, iconWidth, iconHeight, truck, sizeof(truck), true);
     oled.display();
 
+    while(1);
+
     //Move the icon
     iconX += iconXChangeAmount;
     iconY += iconYChangeAmount;
diff --git a/Firmware/Display_Rover/DisplayHelper.ino b/Firmware/Display_Rover/DisplayHelper.ino
@@ -0,0 +1,8 @@
+
+bool isConnected(uint8_t deviceAddress)
+{
+  Wire.beginTransmission(deviceAddress);
+  if (Wire.endTransmission() == 0)
+    return true;
+  return false;
+}
diff --git a/Firmware/Display_Rover/Display_Rover.ino b/Firmware/Display_Rover/Display_Rover.ino
diff --git a/Firmware/Display_Rover/icons.h b/Firmware/Display_Rover/icons.h
diff --git a/Firmware/LEDs/LEDs.ino b/Firmware/LEDs/LEDs.ino

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`bool isConnected(uint8_t deviceAddress)`
`2`	`3`	`{`
`3`	`4`	`Wire.beginTransmission(deviceAddress);`