Diff: main.cpp

Revision:

8:e68f8edaa71f

Parent:

7:eee53c450d3d

Child:

9:2259b8443931

--- a/main.cpp	Fri Mar 10 00:02:53 2017 +0000
+++ b/main.cpp	Fri Mar 10 00:14:39 2017 +0000
@@ -132,7 +132,7 @@
             // get new values
             gettime();
             // send new values
-            sprintf(cmdbuff, "rangecount,time,alarm=%d,\"%s\",\"%d\"\r\n",rangecount,timebuf,alarm);
+            sprintf(cmdbuff, "rangecount,alarm=%d,\"%d\"\r\n",alarm_cnt,alarm);
             SendCMD();
             getreply();
             update=0;   
@@ -179,13 +179,7 @@
     getreply();
     
     pc.printf("\n++++++++++ Starting Server ++++++++++\r\n> ");
-/*
-    // initial values
-    sprintf(cmdbuff, "count,time,analog1,analog2=0,\"%s\",\"%s\",\"%s\"\r\n",timebuf,Temp,Vcc);
-    SendCMD();
-    getreply();
-    wait(0.5);
-*/
+
     //create server
     sprintf(cmdbuff, "srv=net.createServer(net.TCP,%d)\r\n",SERVtimeout);
     SendCMD();
@@ -211,7 +205,7 @@
         SendCMD();
         getreply();
         wait(0.4);
-        strcpy(cmdbuff,"conn:send('Alarm Count: '..alarm_cnt..')\r\n");
+        strcpy(cmdbuff,"conn:send('Total Alarm Trips: '..rangecount..'<br><hr>')\r\n");
         SendCMD();
         getreply();
         wait(0.2);
@@ -223,7 +217,7 @@
         SendCMD();
         getreply();
         wait(0.3);
-        strcpy(cmdbuff, "conn:send('<p><input type=\"checkbox\" name=\"check\" value=\"led1v\"> Arm/Disarm (LED1)')\r\n");
+        strcpy(cmdbuff, "conn:send('<p><input type=\"checkbox\" name=\"check\" value=\"led1v\"> Arm/Disarm (LED2)')\r\n");
         SendCMD();
         getreply();
         wait(0.3);
@@ -231,7 +225,7 @@
         SendCMD();
         getreply();
         wait(0.3);
-        strcpy(cmdbuff, "conn:send('<p><input type=\"checkbox\" name=\"check\" value=\"led3v\"> Alarm on/off')\r\n");
+        strcpy(cmdbuff, "conn:send('<p><input type=\"checkbox\" name=\"check\" value=\"led3v\"> Alarm Off')\r\n");
         SendCMD();
         getreply();
         wait(0.3);