[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/vu/apps/TestTimeSync TimeSyncDebuggerC.nc, 1.5, 1.6 TimeSyncDebuggerM.nc, 1.6, 1.7

[Brano Kusy]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/vu/apps/TestTimeSync
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4822

Modified Files:
	TimeSyncDebuggerC.nc TimeSyncDebuggerM.nc 
Log Message:


Index: TimeSyncDebuggerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/vu/apps/TestTimeSync/TimeSyncDebuggerC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TimeSyncDebuggerC.nc	28 Feb 2006 08:12:25 -0000	1.5
--- TimeSyncDebuggerC.nc	27 Jun 2006 14:33:38 -0000	1.6
***************
*** 37,43 ****
  #endif
          TimerC, NoLeds as LedsC,
! #ifdef PLATFORM_TELOS
!     TimeStampingC;
! #elif TIMESYNC_SYSTIME
          SysTimeStampingC as TimeStampingC;
  #else
--- 37,43 ----
  #endif
          TimerC, NoLeds as LedsC,
! #if defined(PLATFORM_TELOS) || defined(PLATFORM_TELOSB)
!         TimeStampingC;
! #elif TIMESYNC_SYSTIME
          SysTimeStampingC as TimeStampingC;
  #else

Index: TimeSyncDebuggerM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/vu/apps/TestTimeSync/TimeSyncDebuggerM.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TimeSyncDebuggerM.nc	28 Feb 2006 08:12:25 -0000	1.6
--- TimeSyncDebuggerM.nc	27 Jun 2006 14:33:38 -0000	1.7
***************
*** 56,60 ****
          float       skew;
          uint8_t     is_synced;
!         uint8_t     dumb_padding;
          uint16_t    rootID;
          uint8_t     seqNum;
--- 56,60 ----
          float       skew;
          uint8_t     is_synced;
!         uint8_t     dumb_padding;
          uint16_t    rootID;
          uint8_t     seqNum;
***************
*** 71,75 ****
  
      command result_t StdControl.start() {
!         return call Timer.start(TIMER_REPEAT, 3000);    // every three seconds
      }
  
--- 71,75 ----
  
      command result_t StdControl.start() {
!         return call Timer.start(TIMER_REPEAT, 3000);
      }
  
***************
*** 131,135 ****
              d.msgID = ((TimeSyncPoll*)(p->data))->msgID;
  
!             d.localClock = call TimeStamping.getStamp();
              d.globalClock = d.localClock;
              d.is_synced = call GlobalTime.local2Global(&d.globalClock);
--- 131,135 ----
              d.msgID = ((TimeSyncPoll*)(p->data))->msgID;
  
!             d.localClock = call TimeStamping.getStamp2(p);
              d.globalClock = d.localClock;
              d.is_synced = call GlobalTime.local2Global(&d.globalClock);