comparison core/VirtualClock.cpp @ 139:4e2dd3eb1d28 ClockSync

The reported offset is now meaningful. The whole thing is waaay too jittery.

 		startTime=currentTime;
 	} else {
 		period=movingAverage.add((currentTime-lastSync)/count); //TODO: replace with Kalman filter
 	}
 	lastSync=currentTime;
+//	printf("lastSync: %lld\n",lastSync-startTime);
 }
 
 double VirtualClock::getNow(){
-	myClock_t now=Clock::getTimeUs();
+	myClock_t currentSystemTime=Clock::getTimeUs();
 	if(period<=0){
-		return now;
+		return currentSystemTime;
 	}
 	//  double beginningOfPeriod=lastSync; // TODO: if sync() does not get called every time (but e.g. only every so often),
 													 // then this line (and the class) needs editing
-	myClock_t elapsed=(now-startTime);
-	double frac=elapsed/(double)period;
-	//  printf("now=%lld; beginningOfPeriod=%f; lastSync=%lld; period=%lld; frac=%f\n", now, beginningOfPeriod, lastSync, period, frac);
-	return frac;
+	myClock_t elapsed=(currentSystemTime-startTime);
+	double now=elapsed/(double)period;
+//	printf("elapsed=%lld;  sincelastSync=%lld; period=%f; now=%f\n", elapsed, currentSystemTime-lastSync, period, now);
+	return now;
 }
 
 double VirtualClock::getPeriod(){
 	return period;
 }