Merge over into the trunk.

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

diff --git a/tos/sensorboards/mts300/SensorMts300C.nc b/tos/sensorboards/mts300/SensorMts300C.nc
index 26381448d54ebead7d8f3804b1a40d826855c475..df62369acdff387f5994b32d9ac6bd4dc169d794 100644 (file)
--- a/tos/sensorboards/mts300/SensorMts300C.nc
+++ b/tos/sensorboards/mts300/SensorMts300C.nc
@@ -23,6 +23,7 @@
  *  THE POSSIBILITY OF SUCH DAMAGE.\r
  *\r
  *  @author Martin Turon <mturon@xbow.com>\r
+ *  @author Miguel Freitas\r
  *\r
  *  $Id$\r
  */\r
@@ -32,17 +33,18 @@ configuration SensorMts300C
     provides {\r
        interface Init;                 //!< Standard Initialization\r
        interface StdControl;           //!< Start/Stop for Power Management\r
-       interface AcquireData as Temp;  //!< Thermister\r
-       interface AcquireData as Light; //!< Photo sensor\r
+       interface Read<uint16_t> as Temp;  //!< Thermister\r
+       interface Read<uint16_t> as Light; //!< Photo sensor\r
     }\r
 }\r
 implementation \r
 {\r
     components \r
        SensorMts300P,\r
-       HplGeneralIOC as IO,\r
-       new AdcChannelC(1) as SensorADC,\r
-       new OskiTimerMilliC() as WarmUpTimer\r
+       SensorMts300DeviceP,\r
+       HplAtm128GeneralIOC as IO,\r
+       new AdcReadClientC() as SensorADC,\r
+       new TimerMilliC() as WarmUpTimer\r
        ;\r
 \r
     Init       = SensorMts300P.Init;\r
@@ -50,6 +52,9 @@ implementation
     Temp       = SensorMts300P.Temp;\r
     Light      = SensorMts300P.Light;\r
 \r
+    SensorADC.Atm128AdcConfig -> SensorMts300DeviceP;\r
+    SensorADC.ResourceConfigure -> SensorMts300DeviceP;\r
+\r
     SensorMts300P.SensorADC -> SensorADC;\r
     SensorMts300P.TempPower -> IO.PortE6;\r
     SensorMts300P.LightPower -> IO.PortE5;\r