Added cummulative power consumption for each browser

stevetrease · stevetrease · commit 8c56b0164028 · 2013-05-04T19:18:15.000+01:00
diff --git a/mqtt/app.js b/mqtt/app.js
@@ -3,13 +3,13 @@ var io = require('socket.io').listen(app, {
 	'log level': 1
 });
 var fs = require('fs');
-
+	
 app.listen(8500);
-
+console.log('listening on port 8500');
 
 // server web pages
 function handler (req, res) {
-	console.log('Connection from %j', req.connection.remoteAddress);
+	console.log('connection %j %s %s',  req.connection.remoteAddress, req.method, req.url);
 	fs.readFile(__dirname + '/index.html',
   		function (err, data) {
     		if (err) {
@@ -24,21 +24,31 @@ function handler (req, res) {
 
 // for each client connection, subscribe to mqtt and push updates
 io.sockets.on('connection', function (socket) {
-
 	var mqtt = require('mqtt');
 	var client = mqtt.createClient(1883, 'localhost', function(err, client) {
   		keepalive: 1000
 	});
+	// set of per client local variables
+	var powercumulative = 0;
+	var powerlasttime = new Date().getTime(); // UNIX time in ms
 
 	client.on('connect', function() {
   		client.subscribe('sensors/+/+');
 
 	  	client.on('message', function(topic, message) {
-    			console.log('topic: ' + topic + ' payload: ' + message);
-  			socket.broadcast.emit('data', { topic: topic, value: message });
+    			// console.log('topic: ' + topic + ' payload: ' + message);
+  			socket.emit('data', { topic: topic, value: message });
+	 		if (topic == "sensors/power/0") {
+				var powercurrenttime = new Date().getTime();
+				var duration = (powercurrenttime - powerlasttime) / 1000.0;
+				var powerused = parseInt(message, 10) * (duration / 3600.0);
+				powercumulative += powerused;
+				// console.log("duration ", duration, "powerused ", powerused, "cumulative ", powercumulative);
+  				socket.emit('data', { topic: "powercumulative", value: powercumulative.toFixed(3) });
+				powerlasttime = powercurrenttime;
+			}
   		});
 	});
-
 });
 
 
diff --git a/mqtt/index.html b/mqtt/index.html
@@ -18,9 +18,12 @@
 <table id="myTableTemp" border="1"></table>
 </td>
 </tr></table>
+<P>
+Total power consumed since start <div id="powercumulative"></div>
+<P>
 <canvas id="mycanvas" width="500" height="100"></canvas>
 <P>
-<div id="time"></div>
+<div id="time" style="font-size:x-small"></div>
 
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
 <script src="http://www.trease.eu:8500/socket.io/socket.io.js"></script>
@@ -64,6 +67,13 @@
 			}
 		} 
 
+		var topictag = "powercumulative";
+		if (data.topic.substring(0,topictag.length) == topictag) {
+			console.log("Powercumulative - " + data.value);
+			document.getElementById("powercumulative").innerHTML= data.value;
+			
+		}
+
 		var topictag = "sensors/temperature/";
 		if (data.topic.substring(0,topictag.length) == topictag) {
 			console.log("Temperature match - " + data.topic + "   " + typeof(data.topic));
