Diff: main.cpp

Revision:

19:61eaa5235ccf

Parent:

18:374c452e19db

Child:

20:ec528f0e63c5

diff -r 374c452e19db -r 61eaa5235ccf main.cpp
--- a/main.cpp	Wed Apr 29 12:50:00 2015 +0000
+++ b/main.cpp	Fri May 01 06:19:20 2015 +0000
@@ -118,8 +118,8 @@
     {0,"Date/Time",{1,4}},
     {1,"Units",{2,0}},
     {2,"Alerts",{3,1}},
-    {3,"Power",{4,2}},
-    {4,"Logger",{0,3}},
+    {3,"Power Saver",{4,2}},
+    {4,"Data Logger",{0,3}},
 };
 
 typedef struct State STyp3; // for the time/date settings
@@ -233,7 +233,7 @@
     currentTime = seconds ; // sets the current time to an integer for alarm clock check
     //serial.printf("current time :%i \n",currentTime);
     //serial.printf("Unix date :%i \n",UNIXdate);
-    strftime(bufferTime, 14 , "%I:%M", localtime(&seconds));
+    strftime(bufferTime, 14 , "%H:%M", localtime(&seconds));
     strftime(bufferDate, 14 , "%d/%m/%y", localtime(&seconds));
     if (alarmClockFlag == 1 ) { // if the the alarm clock flag is set by the user
         alarmClockCheck();
@@ -301,6 +301,17 @@
 }
 
 
+void writeToFile(char *data,char *data1)
+{
+    FILE* pFile = fopen("/local/textfile.txt","w"); // open file access
+
+    fprintf (pFile, "%s%s" , data,data1);
+    fclose (pFile);
+}
+
+
+
+
 void wakeUp ()  //Turns the LCD on after the mbed is interrupted
 {
 
@@ -1112,21 +1123,13 @@
         wakeUp();
         updateTime();
         loggerData();
-        stateminus1=fsmC[state].nextState[0];
-        stateminus2=fsmC[stateminus1].nextState[0];
-        stateplus1=fsmC[state].nextState[1];
-        stateplus2=fsmC[stateplus1].nextState[1];
-
-
-
 
         int display0 = sprintf (buffer0, " Back    Save");//convert integer to buffer str
-        int display1 = sprintf (buffer1, "%s %d", fsmC[stateminus2].title,fsmC[stateminus2].output);//convert integer to buffer str
-        int display2 = sprintf (buffer2, "%s %d", fsmC[stateminus1].title,fsmC[stateminus1].output);//convert integer to buffer str
+        int display1 = sprintf (buffer1, "");
+        int display2 = sprintf (buffer2, "");
         int display3 = sprintf (buffer3, ">>%s %d", fsmC[state].title,fsmC[state].output);//convert integer to buffer str
-        int display4 = sprintf (buffer4, "%s %d", fsmC[stateplus1].title,fsmC[stateplus1].output);//convert integer to buffer str
-        int display5 = sprintf (buffer5, "%s %d", fsmC[stateplus2].title,fsmC[stateplus2].output);//convert integer to buffer str
-
+        int display4 = sprintf (buffer4, "");
+        int display5 = sprintf (buffer5, "");
 
 
         display();
@@ -1178,21 +1181,16 @@
     powerSaverCheck();
     while(1) {
 
-        stateminus1=fsmB[state].nextState[0];
-        stateminus2=fsmB[stateminus1].nextState[0];
-        stateplus1=fsmB[state].nextState[1];
-        stateplus2=fsmB[stateplus1].nextState[1];
-
 
         wakeUp();
         updateTime();
         loggerData();
         strncpy(buffer0, bufferTime, 14);
-        int dispaly = sprintf (buffer1, "%s", fsmB[stateminus2].title);//convert integer to buffer str
-        int dispaly1 = sprintf (buffer2, "%s", fsmB[stateminus1].title);//convert integer to buffer str
+        int dispaly = sprintf (buffer1, "Settings");
+        int dispaly1 = sprintf (buffer2, "");
         int dispaly2 = sprintf (buffer3, ">>%s", fsmB[state].title);//convert integer to buffer str
-        int dispaly3 = sprintf (buffer4, "%s", fsmB[stateplus1].title);//convert integer to buffer str
-        int dispaly4 = sprintf (buffer5, "%s", fsmB[stateplus2].title);//convert integer to buffer str
+        int dispaly3 = sprintf (buffer4, "");
+        int dispaly4 = sprintf (buffer5, "");
 
         display();
 
@@ -1251,18 +1249,12 @@
 {
     wakeUp();
 
-    stateminus1=fsmA[state].nextState[1];
-    stateminus2=fsmA[stateminus1].nextState[1];
-    stateplus1=fsmA[state].nextState[0];
-    stateplus2=fsmA[stateplus1].nextState[0];
-
-
     strncpy(buffer0, bufferTime, 14);
-    int dispaly = sprintf (buffer1, "%s", fsmA[stateminus2].title);//convert integer to buffer str
-    int dispaly1 = sprintf (buffer2, "%s", fsmA[stateminus1].title);//convert integer to buffer str
+    int dispaly = sprintf (buffer1, "Main Menu");
+    int dispaly1 = sprintf (buffer2, "");
     int dispaly2 = sprintf (buffer3, ">>%s", fsmA[state].title);//convert integer to buffer str
-    int dispaly3 = sprintf (buffer4, "%s", fsmA[stateplus1].title);//convert integer to buffer str
-    int dispaly4 = sprintf (buffer5, "%s", fsmA[stateplus2].title);//convert integer to buffer str
+    int dispaly3 = sprintf (buffer4, "");
+    int dispaly4 = sprintf (buffer5, "");
 
 
 
@@ -1321,6 +1313,7 @@
     powerSaverCheck();
 
     while(1) {
+        
         updateTime();
         loggerData();
         startMenu();