[Tinyos-2-commits] CVS: tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/lib/tunit/TestTwoNodeRf TestTunitC.nc, 1.1, 1.2 TestTunitP.nc, 1.1, 1.2 suite.properties, 1.1, 1.2

[David Moss]

Update of /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/lib/tunit/TestTwoNodeRf
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23956

Modified Files:
	TestTunitC.nc TestTunitP.nc suite.properties 
Log Message:
Updated the TestRxFifoReceive to reflect the change in the meaning of GDO2

Index: TestTunitC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/lib/tunit/TestTwoNodeRf/TestTunitC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestTunitC.nc	22 Jul 2007 05:32:34 -0000	1.1
--- TestTunitC.nc	8 Nov 2007 17:43:04 -0000	1.2
***************
*** 40,43 ****
--- 40,44 ----
        new TestCaseC() as TestRfC,
        ActiveMessageC,
+       CC2420ActiveMessageC,
        new AMSenderC(4),
        new AMReceiverC(4),
***************
*** 51,54 ****
--- 52,56 ----
    TestTunitP.Receive -> AMReceiverC;
    TestTunitP.Leds -> LedsC;
+   TestTunitP.LowPowerListening -> CC2420ActiveMessageC;
    
    TestTunitP.TearDownOneTime -> TestRfC.TearDownOneTime;

Index: TestTunitP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/lib/tunit/TestTwoNodeRf/TestTunitP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestTunitP.nc	22 Jul 2007 05:32:34 -0000	1.1
--- TestTunitP.nc	8 Nov 2007 17:43:04 -0000	1.2
***************
*** 45,48 ****
--- 45,49 ----
      interface Receive;
      interface Leds;
+     interface LowPowerListening;
    }
  }
***************
*** 59,62 ****
--- 60,64 ----
    /***************** SetUpOneTime Events ****************/
    event void SetUpOneTime.run() {
+    // call LowPowerListening.setRxSleepInterval(&myMsg, 1000);
      call SplitControl.start();
    }
***************
*** 74,78 ****
    
    event void SplitControl.stopDone(error_t error) {
-     call Leds.led2On();
      call TearDownOneTime.done();
    }
--- 76,79 ----
***************
*** 80,84 ****
    /***************** TestRf Events ****************/
    event void TestRf.run() {
-     call Leds.led0On();
      post sendMsg();
    }
--- 81,84 ----
***************
*** 86,92 ****
--- 86,94 ----
    /***************** AMSend Events ****************/
    event void AMSend.sendDone(message_t *msg, error_t error) {
+     call Leds.led2On();
    }
    
    event message_t *Receive.receive(message_t *msg, void *payload, error_t error) {
+     call Leds.led2On();
      assertSuccess();
      call TestRf.done();
***************
*** 96,100 ****
    /***************** Tasks *****************/
    task void sendMsg() {
!     if(call AMSend.send(1, &myMsg, 0) != SUCCESS) {
        post sendMsg();
      }
--- 98,102 ----
    /***************** Tasks *****************/
    task void sendMsg() {
!     if(call AMSend.send(1, &myMsg, 2) != SUCCESS) {
        post sendMsg();
      }

Index: suite.properties
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x-contrib/tunit/tests/tinyos-2.x/tos/lib/tunit/TestTwoNodeRf/suite.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** suite.properties	22 Jul 2007 05:32:34 -0000	1.1
--- suite.properties	8 Nov 2007 17:43:04 -0000	1.2
***************
*** 17,21 ****
--- 17,25 ----
  @testname Test TUnit Two Node Rf
  @author David Moss
+ 
+ @extra CFLAGS+=-DLOW_POWER_LISTENING
+ 
  @description Test the ability for one mote to start the test and the other to
               finish it.
  @exactnodes 2
+ @assertions 20
\ No newline at end of file