[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestAMOnOff Makefile, 1.1.2.3, 1.1.2.4 README, 1.1.2.1, 1.1.2.2 TestAMOnOffC.nc, 1.1.2.6, 1.1.2.7

[David Gay]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile README TestAMOnOffC.nc 
Log Message:
A simpler procedure for building the master and slave


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestAMOnOff/Attic/Makefile,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Makefile	12 Jun 2006 16:08:09 -0000	1.1.2.3
--- Makefile	13 Jun 2006 17:28:46 -0000	1.1.2.4
***************
*** 1,5 ****
  COMPONENT=TestAMOnOffAppC
- PFLAGS += -DSERVICE_SLAVE
- 
  
  include $(MAKERULES)
--- 1,3 ----

Index: README
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestAMOnOff/Attic/README,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** README	10 Aug 2005 15:57:14 -0000	1.1.2.1
--- README	13 Jun 2006 17:28:46 -0000	1.1.2.2
***************
*** 2,17 ****
  
  This application has two different versions, slave and master. The
! version compiled is determined by a compile-time flag of either
! 
! -DSERVICE_MASTER 
  
! or 
  
! -DSERVICE_SLAVE
  
! in the Makefile. A master is always on. A master broadcasts a packet
! every second. Four of the five packets are data packets; every fifth
! packet is a control packet.  It toggles Led0 when it sends a data
! packet and Led1 when it sends a control packet.
  
  When a slave hears a data packet, it toggles Led0. When a slave
--- 2,18 ----
  
  This application has two different versions, slave and master. The
! version compiled is determined by a compile-time flag (SERVICE_MASTER
! or SERVICE_SLAVE). 
  
! To compile a master:
!   CFLAGS=-DSERVICE_MASTER make <platform> <other options>
  
! To compile a slave:
!   CFLAGS=-DSERVICE_SLAVE make <platform> <other options>
  
! A master is always on. A master broadcasts a packet every second. Four of
! the five packets are data packets; every fifth packet is a control packet.
! It toggles Led0 when it sends a data packet and Led1 when it sends a
! control packet.
  
  When a slave hears a data packet, it toggles Led0. When a slave

Index: TestAMOnOffC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestAMOnOff/Attic/TestAMOnOffC.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** TestAMOnOffC.nc	16 Feb 2006 16:48:09 -0000	1.1.2.6
--- TestAMOnOffC.nc	13 Jun 2006 17:28:46 -0000	1.1.2.7
***************
*** 46,49 ****
--- 46,53 ----
  #include "Timer.h"
  
+ #if !(defined(SERVICE_SLAVE) || defined(SERVICE_MASTER)) || (defined(SERVICE_SLAVE) && defined(SERVICE_MASTER))
+ #error "You must compile with either -DSERVICE_SLAVE or -DSERVICE_MASTER"
+ #endif
+ 
  module TestAMOnOffC {
    uses {