[Tinyos-commits] CVS: tinyos-1.x/apps/GlowLeds GlowLedsC.nc, 1.4, 1.5 GlowLedsM.nc, 1.5, 1.6

[Joe Polastre]

Update of /cvsroot/tinyos/tinyos-1.x/apps/GlowLeds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15179

Modified Files:
	GlowLedsC.nc GlowLedsM.nc 
Log Message:
fixes to GlowLeds to work on AVR* platforms (use Timer instead
of TimerMilli)


Index: GlowLedsC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/GlowLeds/GlowLedsC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GlowLedsC.nc	8 Nov 2004 18:25:31 -0000	1.4
--- GlowLedsC.nc	29 Jul 2005 22:35:43 -0000	1.5
***************
*** 35,39 ****
  
    GlowLedsM.LedsIntensity -> LedsIntensityC;
!   GlowLedsM.TimerMilli -> TimerC.TimerMilli[unique("TimerMilli")];
  }
  
--- 35,39 ----
  
    GlowLedsM.LedsIntensity -> LedsIntensityC;
!   GlowLedsM.Timer -> TimerC.Timer[unique("Timer")];
  }
  

Index: GlowLedsM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/GlowLeds/GlowLedsM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GlowLedsM.nc	8 Nov 2004 18:25:31 -0000	1.5
--- GlowLedsM.nc	29 Jul 2005 22:35:43 -0000	1.6
***************
*** 26,30 ****
  {
    provides interface StdControl;
!   uses interface TimerMilli;
    uses interface LedsIntensity;
  }
--- 26,30 ----
  {
    provides interface StdControl;
!   uses interface Timer;
    uses interface LedsIntensity;
  }
***************
*** 70,74 ****
    command result_t StdControl.start()
    {
!     call TimerMilli.setPeriodic( 20 );
      return SUCCESS;
    }
--- 70,74 ----
    command result_t StdControl.start()
    {
!     call Timer.start( TIMER_REPEAT, 20 );
      return SUCCESS;
    }
***************
*** 76,80 ****
    command result_t StdControl.stop()
    {
!     call TimerMilli.stop();
      return SUCCESS;
    }
--- 76,80 ----
    command result_t StdControl.stop()
    {
!     call Timer.stop();
      return SUCCESS;
    }
***************
*** 109,113 ****
    }
  
!   event result_t TimerMilli.fired()
    {
      if( ++m_delay_count >= MAX_DELAY_COUNT )
--- 109,113 ----
    }
  
!   event result_t Timer.fired()
    {
      if( ++m_delay_count >= MAX_DELAY_COUNT )