[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain/TestDrain TestDrain.nc, 1.1, 1.2 TestDrainM.nc, 1.1, 1.2

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drain/TestDrain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25624/TestDrain

Modified Files:
	TestDrain.nc TestDrainM.nc 
Log Message:
Took out the partially-complete system for routing down the tree. I'll add it back in later when it works. Improved the UI and display for Drain and DrainConnector. Made TestDrain work again.

Index: TestDrain.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/TestDrain/TestDrain.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestDrain.nc	14 Feb 2005 23:16:37 -0000	1.1
--- TestDrain.nc	27 Apr 2005 00:21:27 -0000	1.2
***************
*** 20,23 ****
--- 20,24 ----
  
    TestDrainM.Send -> DrainC.Send[AM_TESTDRAINMSG];
+   TestDrainM.SendMsg -> DrainC.SendMsg[AM_TESTDRAINMSG];
    TestDrainM.Timer -> TimerC.Timer[unique("Timer")];
    TestDrainM.Random -> RandomLFSR;

Index: TestDrainM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/TestDrain/TestDrainM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestDrainM.nc	14 Feb 2005 23:16:37 -0000	1.1
--- TestDrainM.nc	27 Apr 2005 00:21:27 -0000	1.2
***************
*** 1,2 ****
--- 1,4 ----
+ includes Drain;
+ 
  module TestDrainM {
    provides interface StdControl;
***************
*** 6,9 ****
--- 8,13 ----
  
      interface Send;
+     interface SendMsg;
+ 
      interface Timer;
      interface Random;
***************
*** 53,65 ****
      testMHMsg->data = counter;
  
!     if (call Send.send(&msgBuf, sizeof(TestDrainMsg)) == FAIL) {
        call Leds.yellowToggle();
        msgBufBusy = FALSE;
      }
! 
      return SUCCESS;
    }
  
!   event result_t Send.sendDone(TOS_MsgPtr msg, result_t success) {
  
      dbg(DBG_USR1, "sendDone(msg=0x%x,success=%d)\n",
--- 57,70 ----
      testMHMsg->data = counter;
  
!     if (call SendMsg.send(TOS_DEFAULT_ADDR, sizeof(TestDrainMsg), &msgBuf)
! 	== FAIL) {
        call Leds.yellowToggle();
        msgBufBusy = FALSE;
      }
!     
      return SUCCESS;
    }
  
!   event result_t SendMsg.sendDone(TOS_MsgPtr msg, result_t success) {
  
      dbg(DBG_USR1, "sendDone(msg=0x%x,success=%d)\n",
***************
*** 78,80 ****
--- 83,89 ----
      return SUCCESS;
    }
+ 
+   event result_t Send.sendDone(TOS_MsgPtr msg, result_t success) {
+     return SUCCESS;
+   }
  }