[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestSimComm TestCommAppC.nc, 1.1, 1.2 TestCommC.nc, 1.2, 1.3

[Phil Levis]

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

Modified Files:
	TestCommAppC.nc TestCommC.nc 
Log Message:
Incorporated patches and bug fixes from community (tweaked slightly).
  - Added support for getting RSSI of packets (Razvan Musaliou-E. from
    JHU). Added interface TossimPacket for getting this value without
    needing to know metadata layout. This required changing 
    TossimActiveMessageP to TossimActiveMessageC as applications may need
    to wire to it.
  - Tweaked noise simulation so output values are not quantized.
    Tal Rusak from Cornell observed that quantization made borderline
    links behave badly.
  - Modified apps/tests/TestSimComm so that it prints out the RSSI
    of packets.



Index: TestCommAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestSimComm/TestCommAppC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCommAppC.nc	17 May 2007 22:06:10 -0000	1.1
--- TestCommAppC.nc	4 Sep 2007 17:19:23 -0000	1.2
***************
*** 53,57 ****
    };
    
!   components MainC, TestCommC as App, RandomC, ActiveMessageC;
    components new TimerMilliC(), new AMSenderC(AM_TEST), new AMReceiverC(AM_TEST);
    
--- 53,57 ----
    };
    
!   components MainC, TestCommC as App, RandomC, ActiveMessageC, TossimActiveMessageC;
    components new TimerMilliC(), new AMSenderC(AM_TEST), new AMReceiverC(AM_TEST);
    
***************
*** 64,67 ****
--- 64,68 ----
    App.AMPacket -> AMSenderC;
    App.PacketAcknowledgements -> AMSenderC;
+   App.TossimPacket -> TossimActiveMessageC;
  }
  

Index: TestCommC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestSimComm/TestCommC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestCommC.nc	4 Jul 2007 15:53:56 -0000	1.2
--- TestCommC.nc	4 Sep 2007 17:19:23 -0000	1.3
***************
*** 48,51 ****
--- 48,52 ----
      interface AMPacket;
      interface PacketAcknowledgements;
+     interface TossimPacket;
    }
  }
***************
*** 94,98 ****
  
    event message_t* Receive.receive(message_t* msg, void* p, uint8_t l) {
!     dbg("TestComm", "Received message from %hu @ %s\n", call AMPacket.source(msg), sim_time_string());
      return msg;
    }
--- 95,99 ----
  
    event message_t* Receive.receive(message_t* msg, void* p, uint8_t l) {
!     dbg("TestComm", "Received message from %hu @ %s with strength %hhi\n", call AMPacket.source(msg), sim_time_string(), call TossimPacket.strength(msg));
      return msg;
    }