[Tinyos-2-commits] CVS: tinyos-2.x/apps/RadioCountToLeds Makefile, 1.1.2.5, 1.1.2.6 README.txt, 1.1.2.1, 1.1.2.2 RadioCountToLeds.h, 1.1.2.2, 1.1.2.3 RadioCountToLedsAppC.nc, 1.1.2.5, 1.1.2.6 RadioCountToLedsC.nc, 1.1.2.7, 1.1.2.8

Mon Oct 30 09:05:46 PST 2006

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile README.txt RadioCountToLeds.h RadioCountToLedsAppC.nc 
	RadioCountToLedsC.nc 
Log Message:
Updates of TestAM, RadioCountToLeds, RadioSenseToLeds, and TestArbiter files to contain README files and adhere to TEP3

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/RadioCountToLeds/Makefile,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** Makefile	19 Jan 2006 20:30:16 -0000	1.1.2.5
--- Makefile	30 Oct 2006 17:05:43 -0000	1.1.2.6
***************
*** 3,7 ****

  RadioCountMsg.py: RadioCountToLeds.h
! 	mig python -target=$(PLATFORM) $(CFLAGS) -python-classname=RadioCountMsg RadioCountToLeds.h RadioCountMsg -o $@

  RadioCountMsg.class: RadioCountMsg.java
--- 3,7 ----

  RadioCountMsg.py: RadioCountToLeds.h
! 	mig python -target=$(PLATFORM) $(CFLAGS) -python-classname=RadioCountMsg RadioCountToLeds.h radio_count_msg -o $@

  RadioCountMsg.class: RadioCountMsg.java
***************
*** 9,13 ****

  RadioCountMsg.java: RadioCountToLeds.h
! 	mig java -target=$(PLATFORM) $(CFLAGS) -java-classname=RadioCountMsg RadioCountToLeds.h RadioCountMsg -o $@

--- 9,13 ----

  RadioCountMsg.java: RadioCountToLeds.h
! 	mig java -target=$(PLATFORM) $(CFLAGS) -java-classname=RadioCountMsg RadioCountToLeds.h radio_count_msg -o $@

Index: README.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/RadioCountToLeds/README.txt,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.txt	29 Jan 2006 20:30:58 -0000	1.1.2.1
--- README.txt	30 Oct 2006 17:05:43 -0000	1.1.2.2
***************
*** 4,11 ****
  Description:

! RadioCountToLeds maintains a 4Hz counter and broadcsts its value. A 
! RadioCountToLeds node that hears a counter displays the bottom three bits
! on its LEDs. This application is a useful test to show that basic AM 
! communication and timers work.

  Tools:
--- 4,12 ----
  Description:

! RadioCountToLeds maintains a 4Hz counter, broadcasting its value in 
! an AM packet every time it gets updated. A RadioCountToLeds node that 
! hears a counter displays the bottom three bits on its LEDs. This 
! application is a useful test to show that basic AM communication and 
! timers work.

  Tools:

Index: RadioCountToLeds.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/RadioCountToLeds/RadioCountToLeds.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** RadioCountToLeds.h	21 Feb 2006 12:36:22 -0000	1.1.2.2
--- RadioCountToLeds.h	30 Oct 2006 17:05:43 -0000	1.1.2.3
***************
*** 2,11 ****
  #define RADIO_COUNT_TO_LEDS_H

! typedef nx_struct RadioCountMsg {
    nx_uint16_t counter;
! } RadioCountMsg;

  enum {
!   AM_RADIOCOUNTMSG = 6,
  };

--- 2,11 ----
  #define RADIO_COUNT_TO_LEDS_H

! typedef nx_struct radio_count_msg {
    nx_uint16_t counter;
! } radio_count_msg_t;

  enum {
!   AM_RADIO_COUNT_MSG = 6,
  };

Index: RadioCountToLedsAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/RadioCountToLeds/RadioCountToLedsAppC.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** RadioCountToLedsAppC.nc	16 Feb 2006 16:48:07 -0000	1.1.2.5
--- RadioCountToLedsAppC.nc	30 Oct 2006 17:05:43 -0000	1.1.2.6
***************
*** 21,25 ****
   * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
   *
!  * Copyright (c) 2002-2005 Intel Corporation
   * All rights reserved.
   *
--- 21,25 ----
   * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
   *
!  * Copyright (c) 2002-2003 Intel Corporation
   * All rights reserved.
   *
***************
*** 29,36 ****
   * 94704.  Attention:  Intel License Inquiry.
   */

  /**
!  * This application sends OSKI broadcasts at 1Hz and blinks LED 0 when
!  * it receives a broadcast.
   *
   * @author Philip Levis
--- 29,41 ----
   * 94704.  Attention:  Intel License Inquiry.
   */
+  
+ #include "RadioCountToLeds.h"

  /**
!  * Configuration for the RadioCountToLeds application. RadioCountToLeds 
!  * maintains a 4Hz counter, broadcasting its value in an AM packet 
!  * every time it gets updated. A RadioCountToLeds node that hears a counter 
!  * displays the bottom three bits on its LEDs. This application is a useful 
!  * test to show that basic AM communication and timers work.
   *
   * @author Philip Levis
***************
*** 38,53 ****
   */

- #include "RadioCountToLeds.h"
- 
  configuration RadioCountToLedsAppC {}
  implementation {
    components MainC, RadioCountToLedsC as App, LedsC;
!   components new AMSenderC(AM_RADIOCOUNTMSG);
!   components new AMReceiverC(AM_RADIOCOUNTMSG);
    components new TimerMilliC();
    components ActiveMessageC;

-   
-   
    App.Boot -> MainC.Boot;

--- 43,54 ----
   */

  configuration RadioCountToLedsAppC {}
  implementation {
    components MainC, RadioCountToLedsC as App, LedsC;
!   components new AMSenderC(AM_RADIO_COUNT_MSG);
!   components new AMReceiverC(AM_RADIO_COUNT_MSG);
    components new TimerMilliC();
    components ActiveMessageC;

    App.Boot -> MainC.Boot;

Index: RadioCountToLedsC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/RadioCountToLeds/RadioCountToLedsC.nc,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** RadioCountToLedsC.nc	16 Feb 2006 16:48:07 -0000	1.1.2.7
--- RadioCountToLedsC.nc	30 Oct 2006 17:05:43 -0000	1.1.2.8
***************
*** 29,45 ****
   * 94704.  Attention:  Intel License Inquiry.
   */
! 
! /**
!  *  Implementation of the OSKI RadioCountToLeds application. This
!  *  application periodically broadcasts a 16-bit counter, and displays
!  *  broadcasts it hears on its LEDs.
!  *
!  *  @author Philip Levis
!  *  @date   June 6 2005
!  *
!  **/
! 
  #include "Timer.h"
  #include "RadioCountToLeds.h"

  module RadioCountToLedsC {
--- 29,46 ----
   * 94704.  Attention:  Intel License Inquiry.
   */
!  
  #include "Timer.h"
  #include "RadioCountToLeds.h"
+  
+ /**
+  * Implementation of the RadioCountToLeds application. RadioCountToLeds 
+  * maintains a 4Hz counter, broadcasting its value in an AM packet 
+  * every time it gets updated. A RadioCountToLeds node that hears a counter 
+  * displays the bottom three bits on its LEDs. This application is a useful 
+  * test to show that basic AM communication and timers work.
+  *
+  * @author Philip Levis
+  * @date   June 6 2005
+  */

  module RadioCountToLedsC {
***************
*** 67,71 ****
    event void AMControl.startDone(error_t err) {
      if (err == SUCCESS) {
!       call MilliTimer.startPeriodic(1000);
      }
      else {
--- 68,72 ----
    event void AMControl.startDone(error_t err) {
      if (err == SUCCESS) {
!       call MilliTimer.startPeriodic(250);
      }
      else {
***************
*** 85,95 ****
      }
      else {
!       RadioCountMsg* rcm = (RadioCountMsg*)call Packet.getPayload(&packet, NULL);
!       if (call Packet.maxPayloadLength() < sizeof(RadioCountMsg)) {
  	return;
        }

        rcm->counter = counter;
!       if (call AMSend.send(AM_BROADCAST_ADDR, &packet, sizeof(RadioCountMsg)) == SUCCESS) {
  	dbg("RadioCountToLedsC", "RadioCountToLedsC: packet sent.\n", counter);	
  	locked = TRUE;
--- 86,96 ----
      }
      else {
!       radio_count_msg_t* rcm = (radio_count_msg_t*)call Packet.getPayload(&packet, NULL);
!       if (call Packet.maxPayloadLength() < sizeof(radio_count_msg_t)) {
  	return;
        }

        rcm->counter = counter;
!       if (call AMSend.send(AM_BROADCAST_ADDR, &packet, sizeof(radio_count_msg_t)) == SUCCESS) {
  	dbg("RadioCountToLedsC", "RadioCountToLedsC: packet sent.\n", counter);	
  	locked = TRUE;
***************
*** 101,107 ****
  				   void* payload, uint8_t len) {
      dbg("RadioCountToLedsC", "Received packet of length %hhu.\n", len);
!     if (len != sizeof(RadioCountMsg)) {return bufPtr;}
      else {
!       RadioCountMsg* rcm = (RadioCountMsg*)payload;
        if (rcm->counter & 0x1) {
  	call Leds.led0On();
--- 102,108 ----
  				   void* payload, uint8_t len) {
      dbg("RadioCountToLedsC", "Received packet of length %hhu.\n", len);
!     if (len != sizeof(radio_count_msg_t)) {return bufPtr;}
      else {
!       radio_count_msg_t* rcm = (radio_count_msg_t*)payload;
        if (rcm->counter & 0x1) {
  	call Leds.led0On();