[Tinyos-commits] CVS: tinyos-1.x/apps/GlowRadio GlowRadioC.nc, 1.2, 1.3 GlowRadioM.nc, 1.3, 1.4

[Joe Polastre]

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

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


Index: GlowRadioC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/GlowRadio/GlowRadioC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GlowRadioC.nc	30 May 2004 20:50:58 -0000	1.2
--- GlowRadioC.nc	29 Jul 2005 22:37:49 -0000	1.3
***************
*** 36,40 ****
  
    GlowRadioM.LedsIntensity -> LedsIntensityC;
!   GlowRadioM.TimerMilli -> TimerC.TimerMilli[unique("TimerMilli")];
    GlowRadioM.SendMsg -> GenericComm.SendMsg[5];
    GlowRadioM.ReceiveMsg -> GenericComm.ReceiveMsg[5];
--- 36,40 ----
  
    GlowRadioM.LedsIntensity -> LedsIntensityC;
!   GlowRadioM.Timer -> TimerC.Timer[unique("Timer")];
    GlowRadioM.SendMsg -> GenericComm.SendMsg[5];
    GlowRadioM.ReceiveMsg -> GenericComm.ReceiveMsg[5];

Index: GlowRadioM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/apps/GlowRadio/GlowRadioM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GlowRadioM.nc	30 May 2004 20:50:58 -0000	1.3
--- GlowRadioM.nc	29 Jul 2005 22:37:49 -0000	1.4
***************
*** 26,30 ****
  {
    provides interface StdControl;
!   uses interface TimerMilli;
    uses interface LedsIntensity;
    uses interface SendMsg;
--- 26,30 ----
  {
    provides interface StdControl;
!   uses interface Timer;
    uses interface LedsIntensity;
    uses interface SendMsg;
***************
*** 81,85 ****
    command result_t StdControl.start()
    {
!     call TimerMilli.setPeriodic( 20 );
      return SUCCESS;
    }
--- 81,85 ----
    command result_t StdControl.start()
    {
!     call Timer.start( TIMER_REPEAT, 20 );
      return SUCCESS;
    }
***************
*** 87,91 ****
    command result_t StdControl.stop()
    {
!     call TimerMilli.stop();
      return SUCCESS;
    }
--- 87,91 ----
    command result_t StdControl.stop()
    {
!     call Timer.stop();
      return SUCCESS;
    }
***************
*** 144,148 ****
    }
  
!   event result_t TimerMilli.fired()
    {
      if( TOS_LOCAL_ADDRESS == 1 )
--- 144,148 ----
    }
  
!   event result_t Timer.fired()
    {
      if( TOS_LOCAL_ADDRESS == 1 )