diff nodescore.js @ 53:a0ae699ac444

chronometer no long increments but now compares start time with current time
author root <root@beaglebone.(none)>
date Sun, 14 Oct 2012 00:26:42 +0000
parents ddb09f0a67fd
children 66bf613fb818
line wrap: on
line diff
--- a/nodescore.js	Sun Oct 14 00:25:26 2012 +0000
+++ b/nodescore.js	Sun Oct 14 00:26:42 2012 +0000
@@ -10,13 +10,13 @@
 
 var sio = require('socket.io')
 , http = require('http')
-, ch = require('./chronometer')
+, ch = require('chronometer')
 , fs = require('fs')
 , static = require('node-static');
 
 // run webserver serving static html
 ////////////////////////////////////////////
-var clientFiles = new static.Server('./www');
+var clientFiles = new static.Server('/usr/share/nodescore/www');
 var httpServer = http.createServer(
     function(request, response) {
 	request.addListener('end', function () {
@@ -128,13 +128,22 @@
     function chronCtrl (state,interval){
 	console.log("=========================== chronstate=" + chronstate)
 	if (state==1){
+	    var date = new Date()
+	    var starttime = new Date().getTime() / 1000;
+	    //var interval = 1020 - date.getMilliseconds();
 	    xstopwatch =  setInterval(function () {
-		c =  ch.chronometer(interval/100)
-		//cz =  ch.chronometer(interval/100)
-		socket.broadcast.emit('chronFromServer', c)
-		socket.emit('chronFromServer', c)
-	    }, interval)
+		    var nowtime = new Date().getTime() / 1000;
+		    now = nowtime-starttime
+		    hours = parseInt( now / 3600 ) % 24;
+		    minutes = parseInt( now / 60 ) % 60;
+		    seconds = parseInt(now  % 60);
+		    milliseconds = Math.floor((now-seconds)*10)%60;
 
+		    time = (hours < 10 ? "0" + hours : hours) + ":" + (minutes < 10 ? "0" + minutes : minutes) + ":" + (seconds  < 10 ? "0" + seconds : seconds) + "."+milliseconds;
+		    console.log(time)
+		socket.broadcast.emit('chronFromServer', time)
+		socket.emit('chronFromServer', time)
+	    }, 200)
     }
 	if (state==0) {
 	    clearInterval(xstopwatch);
@@ -167,7 +176,7 @@
     // magic square sequencer
     ////////////////////////////////////////////
 //    var score = require('./score');
-//    var c = require('./chronometer');
+//    var c = require('/usr/share/nodescore/www/m/js/chronometer');
 
 //    var mm = score.mm
     var sequencerState = 0;