Change to use driver which follow TEP 109 .

[tinyos-2.x.git] / apps / tests / mica2 / mts300 / TestMts300C.nc

diff --git a/apps/tests/mica2/mts300/TestMts300C.nc b/apps/tests/mica2/mts300/TestMts300C.nc
index c08f06f9cbad451955e043cef93fe5b8e0a69bba..f7da8d792cc78abb3f0151ad95149b9a037de82b 100644 (file)
--- a/apps/tests/mica2/mts300/TestMts300C.nc
+++ b/apps/tests/mica2/mts300/TestMts300C.nc
@@ -1,41 +1,3 @@
-// $Id$\r
-\r
-/*\r
- *  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.\r
- *  downloading, copying, installing or using the software you agree to\r
- *  this license.  If you do not agree to this license, do not download,\r
- *  install, copy or use the software.\r
- *\r
- *  Copyright (c) 2004-2006 Crossbow Technology, Inc.\r
- *  All rights reserved.\r
- *\r
- *  Permission to use, copy, modify, and distribute this software and its\r
- *  documentation for any purpose, without fee, and without written\r
- *  agreement is hereby granted, provided that the above copyright\r
- *  notice, the (updated) modification history and the author appear in\r
- *  all copies of this source code.\r
- *\r
- *  Permission is also granted to distribute this software under the\r
- *  standard BSD license as contained in the TinyOS distribution.\r
- *\r
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\r
- *  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\r
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\r
- *  PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE INTEL OR ITS\r
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\r
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\r
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\r
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\r
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\r
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
- */\r
-\r
-/**\r
- *  TinyOS 1.x to TinyOS 2.x translation layer.\r
- *\r
- *  @author Alif <rlchen@xbow.com.cn>  \r
- */\r
 \r
 #include "XMTS300.h"\r
 #include "mts300.h"\r
@@ -53,12 +15,11 @@ implementation
 \r
 // sensorboard devices\r
   components new SensorMts300C();\r
-  components SounderC;\r
 \r
   TestMts300P -> MainC.Boot;\r
 \r
   TestMts300P.MTS300Timer -> MTS300Timer;\r
-  TestMts300P.Leds -> NoLedsC;\r
+  TestMts300P.Leds -> LedsC;\r
 \r
   // communication\r
   TestMts300P.RadioControl -> Radio;\r
@@ -70,9 +31,9 @@ implementation
   TestMts300P.UartPacket -> Serial;\r
 \r
   // sensor components\r
-  MainC.SoftwareInit -> SensorMts300C;\r
-  TestMts300P.MTS300Control -> SensorMts300C.StdControl;\r
   TestMts300P.Vref -> SensorMts300C.Vref;\r
+  TestMts300P.Sounder -> SensorMts300C.Sounder;\r
+  \r
   TestMts300P.Light -> SensorMts300C.Light;\r
   TestMts300P.Temp -> SensorMts300C.Temp;\r
   TestMts300P.Microphone -> SensorMts300C.Microphone;\r
@@ -80,7 +41,4 @@ implementation
   TestMts300P.AccelY -> SensorMts300C.AccelY;\r
   TestMts300P.MagX -> SensorMts300C.MagX;\r
   TestMts300P.MagY -> SensorMts300C.MagY;\r
-\r
-  MainC.SoftwareInit -> SounderC;\r
-  TestMts300P.Sounder -> SounderC;\r
 }\r