Change to follow TEP 109 .

[tinyos-2.x.git] / tos / sensorboards / mts300 / SensorMts300C.nc

diff --git a/tos/sensorboards/mts300/SensorMts300C.nc b/tos/sensorboards/mts300/SensorMts300C.nc
index 12e093b2edef72a2e4f35412fdb74332a5bcaa2e..8cd1f2535e100b31c59df5cd103abf0c62f42885 100644 (file)
--- a/tos/sensorboards/mts300/SensorMts300C.nc
+++ b/tos/sensorboards/mts300/SensorMts300C.nc
@@ -33,13 +33,12 @@ generic configuration SensorMts300C()
 {\r
   provides\r
   {\r
-       interface Init;                 //!< Standard Initialization\r
-       interface StdControl;           //!< Start/Stop for Power Management\r
+       interface Mts300Sounder as Sounder; //!< sounder\r
        interface Read<uint16_t> as Vref; //!< voltage\r
        interface Read<uint16_t> as Temp; //!< Thermister\r
        interface Read<uint16_t> as Light; //!< Photo sensor\r
        interface Read<uint16_t> as Microphone; //!< Mic sensor\r
-       interface Read<uint16_t> as AccelX; //!< Accelerometer sensor\r
+       interface Read<uint16_t> as AccelX; //!< Accelerometer sensor\r
        interface Read<uint16_t> as AccelY; //!< Accelerometer sensor\r
        interface Read<uint16_t> as MagX; //!< magnetometer sensor\r
        interface Read<uint16_t> as MagY; //!< magnetometer sensor\r
@@ -47,48 +46,23 @@ generic configuration SensorMts300C()
 }\r
 implementation\r
 {\r
-    components         SensorMts300P,  HplAtm128GeneralIOC as IO,\r
+    components SounderC,\r
     new VoltageC(),\r
+    new AccelXC(),\r
+    new AccelYC(),\r
     new PhotoC(),\r
     new TempC(),\r
     new MicC(),\r
-    new MagC(),\r
-    new AccelC(),\r
-         new TimerMilliC() as WarmUpTimer;\r
+    new MagXC(),\r
+    new MagYC();\r
 \r
-    Init       = SensorMts300P.Init;\r
-    Init       = PhotoC.Init;\r
-    Init       = MicC.Init;\r
-    StdControl = SensorMts300P.StdControl;\r
-    Vref       = SensorMts300P.Vref;\r
-    Temp       = SensorMts300P.Temp;\r
-    Light      = SensorMts300P.Light;\r
-    Microphone = SensorMts300P.Microphone;\r
-    AccelX     = SensorMts300P.AccelX;\r
-    AccelY     = SensorMts300P.AccelY;\r
-    MagX       = SensorMts300P.MagX;\r
-    MagY       = SensorMts300P.MagY;\r
-\r
-    SensorMts300P.WarmUpTimer -> WarmUpTimer;\r
-\r
-    SensorMts300P.VrefRead -> VoltageC.Read;\r
-    SensorMts300P.PhotoControl -> PhotoC.StdControl;\r
-    SensorMts300P.TempRead -> TempC.Read;\r
-    SensorMts300P.LightRead -> PhotoC.Read;\r
-    SensorMts300P.LightPower -> IO.PortE5;\r
-    SensorMts300P.TempPower -> IO.PortE6;\r
-\r
-    SensorMts300P.MicControl -> MicC.StdControl;\r
-    SensorMts300P.Mic -> MicC.Mic;\r
-    SensorMts300P.MicRead -> MicC.Read;\r
-\r
-    SensorMts300P.MagControl -> MagC.StdControl;\r
-    SensorMts300P.Mag -> MagC.Mag;\r
-    SensorMts300P.MagXRead -> MagC.MagX;\r
-    SensorMts300P.MagYRead -> MagC.MagY;\r
-\r
-    SensorMts300P.AccelControl -> AccelC.StdControl;\r
-    SensorMts300P.AccelXRead -> AccelC.AccelX;\r
-    SensorMts300P.AccelYRead -> AccelC.AccelY;\r
-    \r
+    Sounder    = SounderC;\r
+    Vref       = VoltageC;\r
+    Temp       = TempC;\r
+    Light      = PhotoC;\r
+    Microphone = MicC;\r
+    AccelX     = AccelXC;\r
+    AccelY     = AccelYC;\r
+    MagX       = MagXC;\r
+    MagY       = MagYC;\r
 }\r