From fd0b1fd4e2bceb292f23244e9f6139f458341d5b Mon Sep 17 00:00:00 2001
From: Ricardo <ricardo@luke>
Date: Thu, 19 Oct 2017 00:40:57 +0000
Subject: [PATCH] Working on the menu, batt icon fixed.

---
 firmware/v01/v01.ino | 151 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 125 insertions(+), 26 deletions(-)
 mode change 100755 => 100644 firmware/v01/v01.ino

diff --git a/firmware/v01/v01.ino b/firmware/v01/v01.ino
old mode 100755
new mode 100644
index 835e687..c117617
--- a/firmware/v01/v01.ino
+++ b/firmware/v01/v01.ino
@@ -95,14 +95,14 @@ void setup() {    // BEGIN SETUP ------------------------------------
   display.clearDisplay();
   display.display();
   
-//  display.setTextSize(2);
-//  display.setTextColor(WHITE);
-//  display.setCursor(36,12);
-//  display.println("NMM-1");
-//  display.display();
-//  delay(2000);
-//  display.clearDisplay();
-//  display.display();
+  display.setTextSize(2);
+  display.setTextColor(WHITE);
+  display.setCursor(36,12);
+  display.println("NMM-1");
+  display.display();
+  delay(3000);
+  display.clearDisplay();
+  display.display();
 
   
 }   // END SETUP --------------------------------------------------------------------
@@ -114,14 +114,40 @@ ISR(TIMER1_COMPA_vect) // Here we chose between the blinker sequence
 {                      // or to show the temperature on the LEDs
 
   
-  if (!rUP && menuState < 2)  {
-    menuState++;
+  if (!rUP && menuState == 1) {
+    menuState = 1;
   }
-  if (!rDOWN && menuState > 1) {
-    menuState--;
+  if (!rUP && menuState == 2) {
+    menuState = 1;
+  }
+  if (!rUP && menuState == 3) {
+    menuState = 4;
+  }
+  if (!rUP && menuState == 4) {
+    menuState = 1;
   }
 
   
+  if (!rDOWN && menuState == 1) {
+    menuState = 2;
+  }
+  if (!rDOWN && menuState == 2) {
+    menuState = 3;
+  }
+  if (!rDOWN && menuState == 3) {
+    menuState = 3;
+  }
+  
+  
+  if (!rOK && menuState == 1) {
+    menuState = 10;
+  }
+  if (!rOK && menuState == 2) {
+    menuState = 11;
+  }
+  if (!rCANCEL) {
+    menuState = 1;
+  }
  
 }
 // -------------------------------------------------------------------
@@ -130,14 +156,25 @@ ISR(TIMER1_COMPA_vect) // Here we chose between the blinker sequence
 
 void loop() {
   //digitalWrite(led2, !digitalRead(led2));  // toggle state
-  batt_icon();
-
+  
   if (menuState == 1) {
     one();
   }
   else if (menuState == 2) {
     two();
   }
+  else if (menuState == 3) {
+    three();
+  }
+  else if (menuState == 4) {
+    four();
+  }
+  else if (menuState == 10) {
+    read_serial();
+  }
+  else if (menuState == 11) {
+    write_serial();
+  }
   else {
     zero();
   }
@@ -156,7 +193,6 @@ void batt_icon (void) {
   display.drawPixel(109, 4, WHITE);
   display.drawPixel(108, 3, WHITE);
   display.drawPixel(108, 4, WHITE);
-  display.display();
 }
 
 void zero (void) {
@@ -165,10 +201,11 @@ void zero (void) {
   display.display();
   display.setTextSize(1);
   display.setTextColor(WHITE);
-  display.setCursor(0,12);
+  display.setCursor(1,12);
   display.println("Read NMEA0183");
-  display.setCursor(0,22);
+  display.setCursor(1,22);
   display.println("Write NMEA0183");
+  batt_icon();
   display.display();
 
 }
@@ -180,10 +217,11 @@ void one (void) {
   display.clearDisplay();
   display.setTextSize(1);
   display.setTextColor(WHITE);
-  display.setCursor(0,12);
-  display.println("Read NMEA0183");
-  display.setCursor(0,22);
-  display.println("Write NMEA0183 <--");
+  display.setCursor(1,12);
+  display.println("Read NMEA0183  <--");
+  display.setCursor(1,22);
+  display.println("Write NMEA0183");
+  batt_icon();
   display.display();
 
 }
@@ -195,10 +233,71 @@ void two (void) {
   display.clearDisplay();
   display.setTextSize(1);
   display.setTextColor(WHITE);
-  display.setCursor(0,12);
-  display.println("Read NMEA0183  <--");
-  display.setCursor(0,22);
-  display.println("Write NMEA0183");
+  display.setCursor(1,12);
+  display.println("Read NMEA0183");
+  display.setCursor(1,22);
+  display.println("Write NMEA0183  <--");
+  batt_icon();
   display.display();
 
-}
+}
+
+void three (void) {
+
+  display.drawRect(0, 8, 168, 24, BLACK);
+  display.display();
+  display.clearDisplay();
+  display.setTextSize(1);
+  display.setTextColor(WHITE);
+  display.setCursor(1,12);
+  display.println("Write NMEA0183");
+  display.setCursor(1,22);
+  display.println("Config NMEA0183  <--");
+  batt_icon();
+  display.display();
+
+}
+
+void four (void) {
+
+  display.drawRect(0, 8, 168, 24, BLACK);
+  display.display();
+  display.clearDisplay();
+  display.setTextSize(1);
+  display.setTextColor(WHITE);
+  display.setCursor(1,12);
+  display.println("Write NMEA0183  <--");
+  display.setCursor(1,22);
+  display.println("Config NMEA0183");
+  batt_icon();
+  display.display();
+
+}
+
+void read_serial (void) {
+
+  display.drawRect(0, 8, 168, 24, BLACK);
+  display.display();
+  display.clearDisplay();
+  display.setTextSize(1);
+  display.setTextColor(WHITE);
+  display.setCursor(1,17);
+  display.println("Lets Read :)");
+  batt_icon();
+  display.display();
+
+}
+
+void write_serial (void) {
+
+  display.drawRect(0, 8, 168, 24, BLACK);
+  display.display();
+  display.clearDisplay();
+  display.setTextSize(1);
+  display.setTextColor(WHITE);
+  display.setCursor(1,17);
+  display.println("Lets Write :)");
+  batt_icon();
+  display.display();
+
+}