[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork Driver.c, 1.1.2.2, 1.1.2.3 TestNetworkC.nc, 1.1.2.7, 1.1.2.8 test.py, 1.1.2.3, 1.1.2.4

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Driver.c TestNetworkC.nc test.py 
Log Message:
Send at 1Hz.


Index: Driver.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/Driver.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** Driver.c	9 Jun 2006 01:46:57 -0000	1.1.2.2
--- Driver.c	10 Jun 2006 21:19:50 -0000	1.1.2.3
***************
*** 2,5 ****
--- 2,6 ----
  #include <tossim.h>
  #include <radio.h>
+ #include <math.h>
  
  int main() {
***************
*** 7,36 ****
   t-> init();
  
!  for (int i = 0; i < 3; i++) {
!    Mote* m = t->getNode(i);
!    m->bootAtTime((i + 1) * (t->ticksPerSecond() / 5  + 14332));
   }
  
  
   // t->addChannel("Gain", stdout);
!  t->addChannel("AMQueue", stdout);
   //t->addChannel("LITest", stdout);
   //t->addChannel("AM", stdout);
!  t->addChannel("Traffic", stdout);
  
   Radio* r = t->radio();
  
!  r->add(0, 1, -84.15);
!  r->add(1, 0, -88.55);
!  r->add(0, 2, -91.60);
!  r->add(2, 0, -97.71);
!  r->add(1, 2, -75.10);
!  r->add(2, 1, -76.81);
! 
!  r->setNoise(0, -106.71, 4.00);
!  r->setNoise(1, -104.30, 4.00);
!  r->setNoise(2, -104.09, 4.00);
! 
!  while(t->time() < 60 * t->ticksPerSecond()) {
     t->runNextEvent();
   }
--- 8,36 ----
   t-> init();
  
!  for (int i = 0; i < 10; i++) {
!    Mote* m = t->getNode(i * 5);
!    m->bootAtTime(rand() % t->ticksPerSecond());
   }
  
  
   // t->addChannel("Gain", stdout);
!  t->addChannel("Forwarder", stdout);
!  t->addChannel("PointerBug", stdout);
!  t->addChannel("QueueC", stdout);
!  t->addChannel("PoolP", stdout);
   //t->addChannel("LITest", stdout);
   //t->addChannel("AM", stdout);
!  t->addChannel("Route", stdout);
  
   Radio* r = t->radio();
+  for (int i = 0; i < 10; i++) {
+     r->setNoise(i * 5, -105.0, 1.0);
+    for (int j = 0; j < 10; j++) {
+       r->add(i * 5, j * 5, -96.0 - (double)abs(i - j));
+       r->add(j * 5, i * 5, -96.0 - (double)abs(i - j));
+    }
+  }
  
!  while(t->time() < 600 * t->ticksPerSecond()) {
     t->runNextEvent();
   }

Index: TestNetworkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/TestNetworkC.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
*** TestNetworkC.nc	9 Jun 2006 01:46:57 -0000	1.1.2.7
--- TestNetworkC.nc	10 Jun 2006 21:19:50 -0000	1.1.2.8
***************
*** 52,56 ****
  	call RootControl.setRoot();
        }
!       call Timer.startPeriodic(128);
      }
    }
--- 52,56 ----
  	call RootControl.setRoot();
        }
!       call Timer.startPeriodic(1024);
      }
    }
***************
*** 83,87 ****
        failedSend();
        call Leds.led0On();
!       dbg("TestNetworkC", "Transmission failed.\n");
      }
    }
--- 83,91 ----
        failedSend();
        call Leds.led0On();
!       dbg("TestNetworkC", "%s: Transmission failed.\n", __FUNCTION__);
!     }
!     else {
!       dbg("TestNetworkC", "%s: Transmission succeeded.\n", __FUNCTION__);
! 
      }
    }
***************
*** 105,109 ****
    event message_t* 
    Receive.receive(message_t* msg, void* payload, uint8_t len) {
!     dbg("TestNetworkC,Traffic", "Received packet at %s from node %hu.\n", sim_time_string(), call CollectionPacket.getOrigin(msg));
      call Leds.led1Toggle();    
      if (!uartbusy) {
--- 109,113 ----
    event message_t* 
    Receive.receive(message_t* msg, void* payload, uint8_t len) {
!     dbg("TestNetworkC,Traffic,Route", "Received packet at %s from node %hhu.\n", sim_time_string(), call CollectionPacket.getOrigin(msg));
      call Leds.led1Toggle();    
      if (!uartbusy) {

Index: test.py
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/test.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** test.py	9 Jun 2006 01:46:57 -0000	1.1.2.3
--- test.py	10 Jun 2006 21:19:50 -0000	1.1.2.4
***************
*** 9,24 ****
  r = t.radio()
  
! f = open("kaisen-topo.txt", "r")
  lines = f.readlines()
  for line in lines:
    s = line.split()
    if (len(s) > 0):
!     if s[0] == "gain":
        r.add(int(s[1]), int(s[2]), float(s[3]))
      elif s[0] == "noise":
        r.setNoise(int(s[1]), float(s[2]), float(s[3]))
  
! for i in range(0, 6):
!   m = t.getNode(i);
    time = randint(t.ticksPerSecond(), 10 * t.ticksPerSecond())
    m.bootAtTime(time)
--- 9,24 ----
  r = t.radio()
  
! f = open("topo-50.txt", "r")
  lines = f.readlines()
  for line in lines:
    s = line.split()
    if (len(s) > 0):
!     if s[0] == "gain" and int(s[1]) % 5 == 0 and int(s[2]) % 5 == 0:
        r.add(int(s[1]), int(s[2]), float(s[3]))
      elif s[0] == "noise":
        r.setNoise(int(s[1]), float(s[2]), float(s[3]))
  
! for i in range(0, 10):
!   m = t.getNode(i * 5);
    time = randint(t.ticksPerSecond(), 10 * t.ticksPerSecond())
    m.bootAtTime(time)
***************
*** 31,37 ****
  #t.addChannel("TestNetworkC", sys.stdout)
  #t.addChannel("TestNetworkC", sys.stdout)
! t.addChannel("Traffic", sys.stdout)
! #t.addChannel("LI", sys.stdout)
! #t.addChannel("LITest", sys.stdout)
  
  while (t.time() < 300 * t.ticksPerSecond()):
--- 31,40 ----
  #t.addChannel("TestNetworkC", sys.stdout)
  #t.addChannel("TestNetworkC", sys.stdout)
! t.addChannel("Route", sys.stdout)
! t.addChannel("PointerBug", sys.stdout)
! t.addChannel("QueueC", sys.stdout)
! #t.addChannel("Gain", sys.stdout)
! t.addChannel("Forwarder", sys.stdout)
! t.addChannel("Acks", sys.stdout)
  
  while (t.time() < 300 * t.ticksPerSecond()):