[Tinyos-2-commits] CVS: tinyos-2.x/apps/MultihopOscilloscope MultihopOscilloscope.h, 1.1.2.1, 1.1.2.2 MultihopOscilloscopeC.nc, 1.1.2.3, 1.1.2.4

[Rodrigo Fonseca]

Update of /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11810

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	MultihopOscilloscope.h MultihopOscilloscopeC.nc 
Log Message:
Changed the timer from Periodic to OneShot


Index: MultihopOscilloscope.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope/MultihopOscilloscope.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** MultihopOscilloscope.h	26 Jun 2006 17:33:44 -0000	1.1.2.1
--- MultihopOscilloscope.h	31 Oct 2006 23:00:53 -0000	1.1.2.2
***************
*** 22,26 ****
    NREADINGS = 5,
    /* Default sampling period. */
!   DEFAULT_INTERVAL = 256,
    AM_OSCILLOSCOPE = 0x93
  };
--- 22,26 ----
    NREADINGS = 5,
    /* Default sampling period. */
!   DEFAULT_INTERVAL = 1024,
    AM_OSCILLOSCOPE = 0x93
  };

Index: MultihopOscilloscopeC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope/MultihopOscilloscopeC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** MultihopOscilloscopeC.nc	29 Jun 2006 19:12:49 -0000	1.1.2.3
--- MultihopOscilloscopeC.nc	31 Oct 2006 23:00:53 -0000	1.1.2.4
***************
*** 107,111 ****
  
    static void startTimer() {
!     call Timer.startPeriodic(local.interval);
      reading = 0;
    }
--- 107,112 ----
  
    static void startTimer() {
!     if (call Timer.isRunning()) call Timer.stop();
!     call Timer.startOneShot(local.interval);
      reading = 0;
    }
***************
*** 174,177 ****
--- 175,179 ----
    */
    event void Timer.fired() {
+     call Timer.startOneShot(local.interval);
      if (reading == NREADINGS) {
        if (!sendbusy) {