[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/rincon/apps/Blackbook5/apps/FlashBridgeViewer FlashBridgeViewerC.nc, 1.1, 1.2 FlashBridgeViewerM.nc, 1.1, 1.2

[dmm]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/apps/FlashBridgeViewer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28804/contrib/rincon/apps/Blackbook5/apps/FlashBridgeViewer

Modified Files:
	FlashBridgeViewerC.nc FlashBridgeViewerM.nc 
Log Message:
Updated Blackbook to v.5.1, fixed many bugs and increased reliability

Index: FlashBridgeViewerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/apps/FlashBridgeViewer/FlashBridgeViewerC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FlashBridgeViewerC.nc	18 May 2006 22:34:20 -0000	1.1
--- FlashBridgeViewerC.nc	6 Jun 2006 16:50:30 -0000	1.2
***************
*** 42,45 ****
--- 42,46 ----
    StdControl = FlashBridgeViewerM;
    StdControl = TransceiverC;
+ 
    StdControl = StateM;
    StdControl = FlashBridgeC;
***************
*** 49,77 ****
    FlashBridgeViewerM.State -> StateM.State[unique("State")];
    FlashBridgeViewerM.Transceiver -> TransceiverC.Transceiver[AM_VIEWERMSG];
- /*
-  * Copyright (c) 2004-2006 Rincon Research Corporation.  
-  * All rights reserved.
-  * 
-  * Rincon Research will permit distribution and use by others subject to
-  * the restrictions of a licensing agreement which contains (among other things)
-  * the following restrictions:
-  * 
-  *  1. No credit will be taken for the Work of others.
-  *  2. It will not be resold for a price in excess of reproduction and 
-  *      distribution costs.
-  *  3. Others are not restricted from copying it or using it except as 
-  *      set forward in the licensing agreement.
-  *  4. Commented source code of any modifications or additions will be 
-  *      made available to Rincon Research on the same terms.
-  *  5. This notice will remain intact and displayed prominently.
-  * 
-  * Copies of the complete licensing agreement may be obtained by contacting 
-  * Rincon Research, 101 N. Wilmot, Suite 101, Tucson, AZ 85711.
-  * 
-  * There is no warranty with this product, either expressed or implied.  
-  * Use at your own risk.  Rincon Research is not liable or responsible for 
-  * damage or loss incurred or resulting from the use or misuse of this software.
-  */
- 
  
  }
--- 50,53 ----

Index: FlashBridgeViewerM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/apps/Blackbook5/apps/FlashBridgeViewer/FlashBridgeViewerM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FlashBridgeViewerM.nc	18 May 2006 22:34:20 -0000	1.1
--- FlashBridgeViewerM.nc	6 Jun 2006 16:50:30 -0000	1.2
***************
*** 40,68 ****
      interface State;
      interface Transceiver;
- /*
-  * Copyright (c) 2004-2006 Rincon Research Corporation.  
-  * All rights reserved.
-  * 
-  * Rincon Research will permit distribution and use by others subject to
-  * the restrictions of a licensing agreement which contains (among other things)
-  * the following restrictions:
-  * 
-  *  1. No credit will be taken for the Work of others.
-  *  2. It will not be resold for a price in excess of reproduction and 
-  *      distribution costs.
-  *  3. Others are not restricted from copying it or using it except as 
-  *      set forward in the licensing agreement.
-  *  4. Commented source code of any modifications or additions will be 
-  *      made available to Rincon Research on the same terms.
-  *  5. This notice will remain intact and displayed prominently.
-  * 
-  * Copies of the complete licensing agreement may be obtained by contacting 
-  * Rincon Research, 101 N. Wilmot, Suite 101, Tucson, AZ 85711.
-  * 
-  * There is no warranty with this product, either expressed or implied.  
-  * Use at your own risk.  Rincon Research is not liable or responsible for 
-  * damage or loss incurred or resulting from the use or misuse of this software.
-  */
- 
      interface FlashBridge;
    }
--- 40,43 ----
***************
*** 107,111 ****
    /***************** StdControl ****************/
    command result_t StdControl.init() { 
!     call Leds.init(); 
      return SUCCESS;
    }
--- 82,86 ----
    /***************** StdControl ****************/
    command result_t StdControl.init() { 
!     call Leds.init();
      return SUCCESS;
    }