Removing OLED functions

We thought about OLEDs for a bit, now committed to 16x2 and 20x4 LCDs.

Author: nseidle

firmware/OpenLCD/OpenLCD.ino

@@ -23,6 +23,10 @@
   -Change baud rate: 124/12 to go to 4800bps, power cycle, send characters at 4800
 */
 
+//Firmware version. This is sent when requested. Helpful for tech support.
+const byte firmwareVersionMajor = 1;
+const byte firmwareVersionMinor = 1;
+
 #include <Wire.h> //For I2C functions
 #include <SPI.h> //For SPI functions
 #include <LiquidCrystalFast.h> //Faster LCD commands. From PJRC https://www.pjrc.com/teensy/td_libs_LiquidCrystal.html
@@ -37,11 +41,6 @@
 
 LiquidCrystalFast SerLCD(LCD_RS, LCD_RW, LCD_EN, LCD_D4, LCD_D5, LCD_D6, LCD_D7);
 
-#define OLED 0
-#define LCD 1
-//#define DISPLAY_TYPE OLED
-#define DISPLAY_TYPE LCD
-
 byte characterCount = 0;
 char currentFrame[DISPLAY_BUFFER_SIZE]; //Max of 4 x 20 LCD
 
@@ -82,8 +81,7 @@ void setup()
   //for(int x = 0 ; x < 200 ; x++)
   //  EEPROM.write(x, 0xFF);
 
-  if (DISPLAY_TYPE == LCD) setupLCD(); //Initialize the LCD
-  else if (DISPLAY_TYPE == OLED) setupOLED(); //Initialize the OLED
+  setupLCD(); //Initialize the LCD
 
   setupContrast(); //Set contrast
 

firmware/OpenLCD/Setting_Control.ino

@@ -40,16 +40,7 @@ void changeContrast(byte contrast)
   EEPROM.write(LOCATION_CONTRAST, contrast); //Store this new contrast
 
   //Go to this new contrast
-  if (DISPLAY_TYPE == LCD) analogWrite(LCD_CONTRAST, contrast);
-  else if (DISPLAY_TYPE == OLED)
-  {
-    SerLCD.command(0x2A); //Command: Function Set, set extension register (RE)
-    SerLCD.command(0x79); //Command: OLED Characterization, OLED command set is enabled
-    SerLCD.command(0x81); //Set Contrast Control
-    SerLCD.command(contrast); //Set Contrast Control: 0 to 255
-    SerLCD.command(0x78); //Command: OLED Characterization, OLED command set is disabled
-    SerLCD.command(0x28); //Command: Function Set, clear extension register (RE)
-  }
+  analogWrite(LCD_CONTRAST, contrast);
 
   //Display the new contrast
   SerLCD.clear();

firmware/OpenLCD/System_Functions.ino

@@ -153,27 +153,14 @@ void setupContrast()
   byte settingContrast = EEPROM.read(LOCATION_CONTRAST);
   if (settingContrast == 255) //Check to see if the contrast has ever been set
   {
-    if (DISPLAY_TYPE == LCD) settingContrast = DEFAULT_CONTRAST_LCD; //Default
-    else if (DISPLAY_TYPE == OLED) settingContrast = DEFAULT_CONTRAST_OLED; //Default
+    settingContrast = DEFAULT_CONTRAST_LCD; //Default
     EEPROM.write(LOCATION_CONTRAST, settingContrast);
   }
 
   //Change contrast without notification message
-  if (DISPLAY_TYPE == LCD)
-  {
-    setPwmFrequency(LCD_CONTRAST, 1); //Set the freq of this pin so that it doesn't cause LCD to ripple
-    pinMode(LCD_CONTRAST, OUTPUT);
-    analogWrite(LCD_CONTRAST, settingContrast);
-  }
-  else if (DISPLAY_TYPE == OLED)
-  {
-    SerLCD.command(0x2A); //Command: Function Set, set extension register (RE)
-    SerLCD.command(0x79); //Command: OLED Characterization, OLED command set is enabled
-    SerLCD.command(0x81); //Set Contrast Control
-    SerLCD.command(settingContrast); //Set Contrast Control: 0 to 255
-    SerLCD.command(0x78); //Command: OLED Characterization, OLED command set is disabled
-    SerLCD.command(0x28); //Command: Function Set, clear extension register (RE)
-  }
+  setPwmFrequency(LCD_CONTRAST, 1); //Set the freq of this pin so that it doesn't cause LCD to ripple
+  pinMode(LCD_CONTRAST, OUTPUT);
+  analogWrite(LCD_CONTRAST, settingContrast);
 }
 
 //Look up and initialize the LCD with the lines and width
@@ -211,103 +198,21 @@ void setupLCD()
   clearFrameBuffer();
 }
 
-//Initialize the OLED
-void setupOLED()
-{
-  //Look up display lines and width
-  settingLCDlines = EEPROM.read(LOCATION_LINES);
-  if (settingLCDlines > 4)
-  {
-    settingLCDlines = DEFAULT_LINES;
-    EEPROM.write(LOCATION_LINES, settingLCDlines);
-  }
-
-  settingLCDwidth = EEPROM.read(LOCATION_WIDTH);
-  if (settingLCDwidth > 20)
-  {
-    settingLCDwidth = DEFAULT_WIDTH;
-    EEPROM.write(LOCATION_WIDTH, settingLCDwidth);
-  }
-
-  //Reset the OLED display
-  pinMode(7, OUTPUT); //Pin 7 = RES#
-  analogWrite(7, 0);
-  delay(10);
-  analogWrite(7, 255);
-  delay(10);
-
-  SerLCD.begin(settingLCDwidth, settingLCDlines); //Setup the width and lines for this LCD
-
-  //Configure the OLED display - comes from mfg
-
-  //Turn on internal v-reg
-  SerLCD.command(0x2A); //Command: Function Set, set extension register (RE)
-  SerLCD.command(0x71); //Command: Function Selection A
-  SerLCD.write(0x5C); //original: Enable internal Vdd regulator (5V I/O)
-  SerLCD.command(0x28); //Command: Function Set, clear extension register (RE)
-
-  SerLCD.command(0x08); //Command: Display ON/OFF Control. Display off, cursor off, blink off
-
-  //Set Oscillator frequency
-  SerLCD.command(0x2A); //Command: Function Set, set extension register (RE)
-  SerLCD.command(0x79); //Command: OLED Characterization, OLED command set is enabled
-  SerLCD.command(0xD5); //OLED Command: Set Display Clock Divide Ratio/Oscillator Frequency
-  SerLCD.command(0x70); //(POR) Default oscillator freq, set divide ratio to 1
-  SerLCD.command(0x78); //Command: OLED Characterization, OLED command set is disabled
-  SerLCD.command(0x28); //Command: Function Set, clear extension register (RE)
-
-  //Set ROM and CHRAM settings
-  SerLCD.command(0x2A); //Command: Function Set, set extension register (RE)
-  SerLCD.command(0x08); //Extended Function Set: NW = 0 for 2-lines
-  SerLCD.command(0x06); //COM SEG direction - this command doesn't make sense
-  SerLCD.command(0x72); //Function Selection B - Selecting ROM and CGROM
-  SerLCD.write(0x08); //ROM and CGROM Selection: ROM 'C' with 240 CGROM
-  SerLCD.command(0x28); //Command: Function Set, clear extension register (RE)
-
-  //Setup contrast, external VSL, etc
-  SerLCD.command(0x2A); //Command: Function Set, set extension register (RE)
-  SerLCD.command(0x79); //Command: OLED Characterization, OLED command set is enabled
-  SerLCD.command(0xDA); //Set SEG Pins Hardware Configuration
-  SerLCD.command(0x10); //Set SEG Pins Hardware Configuration: Disable SEG left/right, Alternative SEG pin config
-  SerLCD.command(0xDC); //Set VSL/GPIO: function selection C
-  SerLCD.command(0x00); //Function Select C: Disable external VSL, disable GPIOs
-  //Contrast is set later during setup
-  //SerLCD.command(0x81); //Set Contrast Control
-  //SerLCD.command(0xFF); //Set Contrast Control: 0 to 255
-  SerLCD.command(0xD9); //Set Phase Length
-  SerLCD.command(0xF1); //Set Phase Length: Phase 2 = 15, Phase 1 = 1
-  SerLCD.command(0xDB); //Set VCOMH Deselect Level
-  SerLCD.command(0x00); //Set VCOMH Deselect Level: 0.65 x VCC
-  SerLCD.command(0x78); //Command: OLED Characterization, OLED command set is disabled
-  SerLCD.command(0x28); //Command: Function Set, clear extension register (RE)
-
-  SerLCD.command(0x01); //clear display
-  SerLCD.command(0x0C); //Command: Display ON/OFF Control. Display on, cursor off, blink off
-
-  SerLCD.setCursor(0, 0); //First spot
-
-  //Clear any characters in the frame buffer
-  clearFrameBuffer();
-}
-
 //Look up and start the 3 backlight pins in analog mode
 void setupBacklight()
 {
-  if (DISPLAY_TYPE == LCD)
-  {
-    pinMode(BL_RW, OUTPUT);
-    pinMode(BL_G, OUTPUT);
-    pinMode(BL_B, OUTPUT);
-
-    //By default EEPROM is 255 or 100% brightness
-    //Because there's a PNP transistor we need to invert the logic (or subtract the user value from 255)
-    analogWrite(BL_RW, 255 - EEPROM.read(LOCATION_RED_BRIGHTNESS));
-    analogWrite(BL_G, 255 - EEPROM.read(LOCATION_GREEN_BRIGHTNESS));
-
-    SoftPWMBegin(); //Start PWM
-    SoftPWMSet(BL_B, 255 - EEPROM.read(LOCATION_BLUE_BRIGHTNESS)); //Setup this pin to be controlled with SoftPWM. Initialize to EEPROM value
-    SoftPWMSetFadeTime(BL_B, 0, 0); //Don't fade - go immediately to this set PWM brightness
-  }
+  pinMode(BL_RW, OUTPUT);
+  pinMode(BL_G, OUTPUT);
+  pinMode(BL_B, OUTPUT);
+
+  //By default EEPROM is 255 or 100% brightness
+  //Because there's a PNP transistor we need to invert the logic (or subtract the user value from 255)
+  analogWrite(BL_RW, 255 - EEPROM.read(LOCATION_RED_BRIGHTNESS));
+  analogWrite(BL_G, 255 - EEPROM.read(LOCATION_GREEN_BRIGHTNESS));
+
+  SoftPWMBegin(); //Start PWM
+  SoftPWMSet(BL_B, 255 - EEPROM.read(LOCATION_BLUE_BRIGHTNESS)); //Setup this pin to be controlled with SoftPWM. Initialize to EEPROM value
+  SoftPWMSetFadeTime(BL_B, 0, 0); //Don't fade - go immediately to this set PWM brightness
 }
 
 void setupSplash()
@@ -446,16 +351,7 @@ void checkEmergencyReset(void)
 
 
   //Change contrast without notification message
-  if (DISPLAY_TYPE == LCD) analogWrite(LCD_CONTRAST, 40); //Set contrast to default
-  else if (DISPLAY_TYPE == OLED)
-  {
-    SerLCD.command(0x2A); //Command: Function Set, set extension register (RE)
-    SerLCD.command(0x79); //Command: OLED Characterization, OLED command set is enabled
-    SerLCD.command(0x81); //Set Contrast Control
-    SerLCD.command(255); //Set Contrast Control: 0 to 255
-    SerLCD.command(0x78); //Command: OLED Characterization, OLED command set is disabled
-    SerLCD.command(0x28); //Command: Function Set, clear extension register (RE)
-  }
+  analogWrite(LCD_CONTRAST, 40); //Set contrast to default
 
   SerLCD.clear();
   SerLCD.print("System reset");

firmware/OpenLCD/settings.h

@@ -58,7 +58,6 @@ const byte DEFAULT_LINES = 2;
 const byte DEFAULT_WIDTH = 16;
 const byte DEFAULT_SPLASH = true; //Default on
 const byte DEFAULT_CONTRAST_LCD = 5;
-const byte DEFAULT_CONTRAST_OLED = 254;
 
 //Internal EEPROM locations for the user settings
 #define LOCATION_BAUD 0