Adding display firmware version

Author: nseidle

firmware/OpenLCD/OpenLCD.ino

@@ -16,11 +16,6 @@
   Todo:
   Check how splash screen works on 16 vs 20 width displays
   Establish and cut down on boot time
-
-  Tests:
-  -Change LCD width to 20, then back to 16 (124/3, then 124/4) then send 18 characters and check for wrap
-  -Enable/Disable splash screen, send 124 then 9 to toggle, then power cycle
-  -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.
@@ -207,8 +202,16 @@ void updateDisplay()
     {
       changeIgnore();
     }
+    //Set Backlight RGB in one command to eliminate flicker
+    else if (incoming == '+') {
+      currentMode = MODE_SET_RGB; //Go to new mode
+    }
+    //Display current firmware version
+    else if (incoming == '\'') {
+      displayFirmwareVersion();
+    }
     //Clear screen and buffer
-    else if (incoming == 45) //'-'
+    else if (incoming == '-')
     {
       SerLCD.clear();
       SerLCD.setCursor(0, 0);
@@ -255,10 +258,6 @@ void updateDisplay()
       currentFrame[characterCount++] = incoming; //Record this character to the display buffer
       if (characterCount == settingLCDwidth * settingLCDlines) characterCount = 0; //Wrap condition
     }
-    //Set Backlight RGB in one command to eliminate flicker
-    else if (incoming == 43) {
-      currentMode = MODE_SET_RGB; //Go to new mode
-    }
   }
   else if (currentMode == MODE_TWI)
   {

firmware/OpenLCD/Setting_Control.ino

@@ -25,11 +25,27 @@ void changeIgnore()
     settingIgnoreRX = true;
     SerLCD.print(F("N"));
   }
-  petSafeDelay(SYSTEM_MESSAGE_DELAY);
-
   //Record this new setting
   EEPROM.write(LOCATION_IGNORE_RX, settingIgnoreRX);
 
+  petSafeDelay(SYSTEM_MESSAGE_DELAY);
+
+  displayFrameBuffer(); //Return the contents of the display
+}
+
+//Display the current firmware version for a set amount of time
+void displayFirmwareVersion()
+{
+  SerLCD.clear();
+  SerLCD.setCursor(0, 0);
+
+  SerLCD.print(F("Firmware v"));
+  SerLCD.print(firmwareVersionMajor);
+  SerLCD.print(F("."));
+  SerLCD.print(firmwareVersionMinor);
+
+  petSafeDelay(SYSTEM_MESSAGE_DELAY);
+
   displayFrameBuffer(); //Return the contents of the display
 }
 
@@ -147,13 +163,8 @@ void changeBacklightRGB(byte red, byte green, byte blue) {
   EEPROM.write(LOCATION_BLUE_BRIGHTNESS, blue); //Record new setting
   //analogWrite(BL_B, 255 - brightness); //Controlled by PNP so reverse the brightness value
   SoftPWMSet(BL_B, 255 - blue); //Controlled by software PWM
-
-  petSafeDelay(SYSTEM_MESSAGE_DELAY);
-
-  displayFrameBuffer(); //Display what was there before
 }
 
-
 //Changes the baud rate setting
 //Assumes caller is passing a number 0 to 12
 void changeUARTSpeed(byte setting)

firmware/OpenLCD/System_Functions.ino

@@ -236,13 +236,13 @@ void setupSplash()
       //This should work with both 16 and 20 character displays
       SerLCD.clear();
       SerLCD.setCursor(0, 0); //First position, 1st row
-      SerLCD.print("SparkFun OpenLCD");
+      SerLCD.print(F("SparkFun OpenLCD"));
       SerLCD.setCursor(0, 1); //First position, 2nd row
-      SerLCD.print("v");
+      SerLCD.print(F("v"));
       SerLCD.print(firmwareVersionMajor);
-      SerLCD.print(".");
+      SerLCD.print(F("."));
       SerLCD.print(firmwareVersionMinor);
-      SerLCD.print(" Baud: ");
+      SerLCD.print(F(" Baud: "));
 
       //Read what the current UART speed is from EEPROM memory
       //Default is 9600

firmware/OpenLCD/settings.h

@@ -1,6 +1,5 @@
 //Hardware pin definitions
 
-//v2 Xiamen protos
 #define LCD_RS A0
 #define LCD_RW A1
 #define LCD_EN A2