Today's changes

stevetrease · stevetrease · commit b051e32613e9 · 2013-05-06T15:07:23.000+01:00
diff --git a/mqtt/app.js b/mqtt/app.js
@@ -90,7 +90,7 @@ var client = mqtt.createClient(1883, 'localhost', function(err, client) {
 });
 // global variables for tracking cumulative power usage
 var powercumulative = 0;
-var powerlasttime = new Date().getTime(); // UNIX time in ms
+var powerlasttime = new Date(); // UNIX time in ms
 
 client.on('connect', function() {
 	client.subscribe('sensors/+/+');
@@ -99,7 +99,12 @@ client.on('connect', function() {
 		// console.log('topic: ' + topic + ' payload: ' + message);
   		io.sockets.emit('data', { topic: topic, value: message });
  		if (topic == "sensors/power/0") {
-			var powercurrenttime = new Date().getTime();
+			var powercurrenttime = new Date();
+			// Is it now a different day from the last time this block ran?
+			if (powerlasttime.getDate() != powercurrenttime.getDate()) {
+				powerlasttime = 0;
+			}
+			// caluclate cumlative power used in KWh
 			var duration = (powercurrenttime - powerlasttime) / 1000.0;
 			var powerused = parseInt(message, 10) * (duration / 3600.0) / 1000.0; // convert to KWh
 			powercumulative += powerused;
diff --git a/mqtt/index.html b/mqtt/index.html
@@ -1,31 +1,40 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>
 Charlestown Power
 </title>
+<style>
+body
+{
+background-color:AntiqueWhite;
+}
+table, th, td
+{
+border: 1px solid #CABFAF;
+}
+</style>
 </head>
-<body style="font-family:Verdana;">
-
-<table border="1"><tr>
-<td>
-<table id="myTablePower" border="1"><tr>
-<td id="sensors/power/0">Total power</td>
-<td id="sensors/power/0"></td>
+<body>
+Current total current power consumption <span id="sensors/power/0"></span>
+<table>
+<tr>
+<td><table id="myTablePower"><tr>
 </tr>
 </table>
 </td>
 <td>
-<table id="myTableTemp" border="1"></table>
+<table id="myTableTemp"></table>
 </td>
 <td>
-<table id="myTableHumidity" border="1"></table>
+<table id="myTableHumidity"></table>
 </td>
 </tr></table>
-<table id="myTableNO2" border="1"></table>
-<table id="myTablePressure" border="1"></table>
-<table id="myTableCO" border="1"></table>
+<table id="myTableNO2"></table>
+<table id="myTablePressure"></table>
+<table id="myTableCO"></table>
 <P>
-Total power consumed since start <div id="powercumulative"></div>
+Total power consumed since start <span id="powercumulative"></span>
 <P>
 <canvas id="mycanvas" width="500" height="100"></canvas>
 <P>
@@ -83,11 +92,11 @@
 
 			var row=table.insertRow(0);
 			var cell=row.insertCell(0);
+			cell.id = data.topic;
+			var cell=row.insertCell(0);
 			cell.id = data.topic + "name";
-			document.getElementById(data.topic + "name").style.textAlign="right";
+			document.getElementById(data.topic).style.textAlign="right";
 			document.getElementById(data.topic + "name").innerHTML= data.topic;
-			var cell=row.insertCell(0);
-			cell.id = data.topic;
 		}
 		// new we know there is a target, update it
 		// console.log("Setting target " + data.topic + " to " + data.value);
