 
 TinyGPSPlus gps; // This is the GPS object that will pretty much do all the grunt work with the NMEA data
 SoftwareSerial GPSModule(10, 11); // RX, TX
+// Initializes class variables and defines the I2C address of the LCD
 LiquidCrystal_I2C lcd(I2C_ADDR, En_pin, Rw_pin, Rs_pin, D4_pin, D5_pin, D6_pin, D7_pin);
-// Initializes class variables and defines the I2C address of the LCD
 
 // The setup (runs once at start up)
 void setup()
 {
-  pinMode(BACKLIGHT_SW, INPUT);
-
-#ifdef _16x2
-  // Selects either speed or heading to be displayed
-  pinMode(SPEED_ALTITUDE_SW, INPUT);
-#else
+  pinMode (BACKLIGHT_SW, INPUT);
   // Selects either altitude or the date/time to be displayed
-  pinMode(ALTITUDE_DATE_TIME_SW, INPUT);
+  pinMode (ALTITUDE_DATE_TIME_SW, INPUT);
   // Select switches
-  pinMode(DISPLAY_12_HOUR_SW, INPUT);
-  pinMode(CONVERT_TO_LOCAL_SW, INPUT);
-  pinMode(DISPLAY_HDOP_SW, INPUT);
-  pinMode(CARDINAL_SW, INPUT);
-  pinMode(LOW_SPEED_OVERRIDE, INPUT);
-#endif
+  pinMode (DISPLAY_12_HOUR_SW, INPUT);
+  pinMode (CONVERT_TO_LOCAL_SW, INPUT);
+  pinMode (DISPLAY_HDOP_SW, INPUT);
+  pinMode (CARDINAL_SW, INPUT);
+  pinMode (LOW_SPEED_OVERRIDE, INPUT);
   pinMode (ON_BOARD_LED, OUTPUT); // Turn off on-board LED
   digitalWrite (ON_BOARD_LED, LOW); //       "
 


  Check to see if it's Daylight Savings Time (DST)
*/
bool IsDST(uint8_t day, uint8_t month , uint8_t DOW)
{
  // Make Day of Week (DOW) match with what Stackoverflow suggests
  // for DOW (Sunday = 0 to Saturday = 6)

    GPSData.hour       = 23; // 7pm my local time
    GPSData.minute     = 10;
    GPSData.second     = 25;
#endif // #ifndef DATA_VALID_OVERRIDE

    // Clear the screen once when leaving initialization
    if (!leftInitialization) {
      leftInitialization = true;
      lcd.clear(); // Clear the LCD
    }
    
    // Display the latest info from the gps object
    // which it derived from the data sent by the GPS unit
    // Send data to the LCD
    lcd.home(); // Go to 1st line
    lcd.print ("Lat: ");
    lcd.print (GPSData.lat);
    lcd.setCursor (15, 0);
    lcd.print ("SV:");
    if ((pastSatellites != GPSData.satellites) || (GPSData.satellites == 0)) {
      pastSatellites = GPSData.satellites;
      if (GPSData.satellites == 0) {
