diff options
| author | tigoe <tom.igoe@gmail.com> | 2013-07-06 08:10:13 -0400 |
|---|---|---|
| committer | tigoe <tom.igoe@gmail.com> | 2013-07-06 08:10:13 -0400 |
| commit | 2a3701bcc10b044dd82d1b02a4441e66e82ac869 (patch) | |
| tree | 77671a7a264bb89a8f856551e1bc6531068ba229 /libraries/Bridge/examples | |
| parent | f8bf2ff9242624d8aeb6460065c892e543921eac (diff) | |
Updated TemperatureWebPanel
Diffstat (limited to 'libraries/Bridge/examples')
| -rw-r--r-- | libraries/Bridge/examples/TemperatureWebPanel/TemperatureWebPanel.ino | 32 | ||||
| -rwxr-xr-x | libraries/Bridge/examples/TemperatureWebPanel/index.html | 4 |
2 files changed, 30 insertions, 6 deletions
diff --git a/libraries/Bridge/examples/TemperatureWebPanel/TemperatureWebPanel.ino b/libraries/Bridge/examples/TemperatureWebPanel/TemperatureWebPanel.ino index 48414ac..0621174 100644 --- a/libraries/Bridge/examples/TemperatureWebPanel/TemperatureWebPanel.ino +++ b/libraries/Bridge/examples/TemperatureWebPanel/TemperatureWebPanel.ino @@ -2,7 +2,7 @@ Temperature web interface This example shows how to serve data from an analog input -via the Arduino Yún's built-in webserver using the Bridge library. + via the Arduino Yún's built-in webserver using the Bridge library. The circuit: * TMP36 temperature sensor on analog pin A1 @@ -26,7 +26,7 @@ via the Arduino Yún's built-in webserver using the Bridge library. created 6 July 2013 by Tom Igoe - + This example code is in the public domain. @@ -37,6 +37,7 @@ via the Arduino Yún's built-in webserver using the Bridge library. // Listen on default port 5555, the webserver on the Yun // will forward there all the HTTP requests for us. YunServer server; +String startString; void setup() { Serial.begin(9600); @@ -57,6 +58,14 @@ void setup() { // (no one from the external network could connect) server.listenOnLocalhost(); server.begin(); + + // get the time that this sketch started: + Process startTime; + startTime.runShellCommand("date"); + while(startTime.available()) { + char c = startTime.read(); + startString += c; + } } void loop() { @@ -71,16 +80,29 @@ void loop() { Serial.println(command); // is "temperature" command? if (command == "temperature") { + + // get the time from the server: + Process time; + time.runShellCommand("date"); + String timeString = ""; + while(time.available()) { + char c = time.read(); + timeString += c; + } + Serial.println(timeString); int sensorValue = analogRead(A1); // convert the reading to millivolts: float voltage = sensorValue * (5000/ 1024); // convert the millivolts to temperature celsius: float temperature = (voltage - 500)/10; // print the temperature: - client.print("Current temperature: "); + client.print("Current time on the Yún: "); + client.println(timeString); + client.print("<br>Current temperature: "); client.print(temperature); client.print(" degrees C"); - + client.print("<br>This sketch has been running since "); + client.print(startString); } // Close connection and free resources. @@ -90,3 +112,5 @@ void loop() { delay(50); // Poll every 50ms } + + diff --git a/libraries/Bridge/examples/TemperatureWebPanel/index.html b/libraries/Bridge/examples/TemperatureWebPanel/index.html index 0724191..29c2704 100755 --- a/libraries/Bridge/examples/TemperatureWebPanel/index.html +++ b/libraries/Bridge/examples/TemperatureWebPanel/index.html @@ -4,13 +4,13 @@ <script type="text/javascript" src="zepto.min.js"></script> <script type="text/javascript"> function refresh() { - $('#content').load('/arduino/avr/temperature'); + $('#content').load('/arduino/temperature'); } </script> </head> <body onload="setInterval(refresh, 1000);"> - Analog 0: <span id="content">0</span> + <span id="content">0</span> </body> </html> |