Diff: emmaCode.cpp

Revision:

29:4d94a03d38e0

Parent:

28:7561035e3df5

Child:

30:08d290158fa7

--- a/emmaCode.cpp	Fri Jul 31 06:16:46 2015 +0000
+++ b/emmaCode.cpp	Tue Aug 04 03:26:35 2015 +0000
@@ -66,7 +66,8 @@
     int yTL;
     int xBR;    //BottomRight
     int yBR;
-    string text;    
+    string text;
+    string name;
 };
 
 //ade7758 variables
@@ -158,42 +159,48 @@
     menu[MODE_WIFI_CONFIG].yTL = 25;
     menu[MODE_WIFI_CONFIG].xBR = 110;
     menu[MODE_WIFI_CONFIG].yBR = 90;
-    menu[MODE_WIFI_CONFIG].text = "wifi config";
+    menu[MODE_WIFI_CONFIG].text = "1.wifi config";
+    menu[MODE_WIFI_CONFIG].name = "wifi config";
     
     //setting mode
-    menu[MODE_SETTINGS].xTL = 120;
-    menu[MODE_SETTINGS].yTL = 25;
-    menu[MODE_SETTINGS].xBR = 205;
-    menu[MODE_SETTINGS].yBR = 90;
-    menu[MODE_SETTINGS].text = "settings";
+    menu[MODE_SETTINGS].xTL = 25;
+    menu[MODE_SETTINGS].yTL = 100;
+    menu[MODE_SETTINGS].xBR = 110;
+    menu[MODE_SETTINGS].yBR = 165;
+    menu[MODE_SETTINGS].text = "2.settings   ";
+    menu[MODE_SETTINGS].name = "settings";
     
     //register mode
-    menu[MODE_REGISTER].xTL = 25;
-    menu[MODE_REGISTER].yTL = 100;
-    menu[MODE_REGISTER].xBR = 110;
-    menu[MODE_REGISTER].yBR = 165;
-    menu[MODE_REGISTER].text = "register";
+    menu[MODE_REGISTER].xTL = 120;
+    menu[MODE_REGISTER].yTL = 25;
+    menu[MODE_REGISTER].xBR = 205;
+    menu[MODE_REGISTER].yBR = 90;
+    menu[MODE_REGISTER].text = "3.register   ";
+    menu[MODE_REGISTER].name = "register";
     
     //operational mode
     menu[MODE_OPERATION].xTL = 120;
     menu[MODE_OPERATION].yTL = 100;
     menu[MODE_OPERATION].xBR = 205;
     menu[MODE_OPERATION].yBR = 165;
-    menu[MODE_OPERATION].text = "operation";
+    menu[MODE_OPERATION].text = "4.operation  ";
+    menu[MODE_OPERATION].name = "operation";
     
     //firmware download mode
     menu[MODE_FIRMWARE_DOWNLOAD].xTL = 215;
     menu[MODE_FIRMWARE_DOWNLOAD].yTL = 25;
     menu[MODE_FIRMWARE_DOWNLOAD].xBR = 300;
     menu[MODE_FIRMWARE_DOWNLOAD].yBR = 90;
-    menu[MODE_FIRMWARE_DOWNLOAD].text = "fw dwld";
+    menu[MODE_FIRMWARE_DOWNLOAD].text = "5.fw dwld  ";
+    menu[MODE_FIRMWARE_DOWNLOAD].name = "fw dwld";
     
     //reserved mode
     menu[5].xTL = 215;
     menu[5].yTL = 100;
     menu[5].xBR = 300;
     menu[5].yBR = 165;
-    menu[5].text = "reserved";
+    menu[5].text = "6.reserved  ";
+    menu[5].name = "reserved";
     
     //draw main menu
     for(int i=0; i<6; i++) {
@@ -236,7 +243,7 @@
     TFT.locate(25,170);
     TFT.printf("                         ");
     TFT.locate(25,170);
-    TFT.printf("mode: %s is selected",menu[md].text.c_str());
+    TFT.printf("mode: %s is selected",menu[md].name.c_str());
     wait(2);
     TFT.cls();
     
@@ -1046,6 +1053,11 @@
         }
     } else if(wifiConnected) {
         DBG.printf("emmaModeOperation - wifi\r\n");
+        
+        //start new log indicator
+        seconds = time(NULL);
+        strftime(q, 32, "%Y-%m-%d %H:%M:%S",localtime(&seconds));
+        DBG.printf("newLog:%d\r\n",writeLog(q,"++++++++++++++++++++"));
     
         //do not delete code below - indicator that esp need to MODE=B and esp.ready() to work
         //_ESP.printf("MODE=B");
@@ -2475,6 +2487,7 @@
     string str;
     Timer t;
     
+    /*
     esp.enable();
     wait(1);
     esp.reset();
@@ -2506,6 +2519,7 @@
     t.reset();
     TFT.locate(0,20);
     TFT.printf("                                        ");
+    */
     
     if(wifiAvailable) {
         _ESP.printf("MODE=B");