X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fsensorboards%2Fmts300%2FSensorMts300C.nc;h=df62369acdff387f5994b32d9ac6bd4dc169d794;hb=1a329382c4f4556fd52d85f4e3f4a67e54911682;hp=26381448d54ebead7d8f3804b1a40d826855c475;hpb=1ba974b83d19fc41bf80acd52726f36f7f1df297;p=tinyos-2.x.git diff --git a/tos/sensorboards/mts300/SensorMts300C.nc b/tos/sensorboards/mts300/SensorMts300C.nc index 26381448..df62369a 100644 --- a/tos/sensorboards/mts300/SensorMts300C.nc +++ b/tos/sensorboards/mts300/SensorMts300C.nc @@ -23,6 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * @author Martin Turon + * @author Miguel Freitas * * $Id$ */ @@ -32,17 +33,18 @@ configuration SensorMts300C provides { interface Init; //!< Standard Initialization interface StdControl; //!< Start/Stop for Power Management - interface AcquireData as Temp; //!< Thermister - interface AcquireData as Light; //!< Photo sensor + interface Read as Temp; //!< Thermister + interface Read as Light; //!< Photo sensor } } implementation { components SensorMts300P, - HplGeneralIOC as IO, - new AdcChannelC(1) as SensorADC, - new OskiTimerMilliC() as WarmUpTimer + SensorMts300DeviceP, + HplAtm128GeneralIOC as IO, + new AdcReadClientC() as SensorADC, + new TimerMilliC() as WarmUpTimer ; Init = SensorMts300P.Init; @@ -50,6 +52,9 @@ implementation Temp = SensorMts300P.Temp; Light = SensorMts300P.Light; + SensorADC.Atm128AdcConfig -> SensorMts300DeviceP; + SensorADC.ResourceConfigure -> SensorMts300DeviceP; + SensorMts300P.SensorADC -> SensorADC; SensorMts300P.TempPower -> IO.PortE6; SensorMts300P.LightPower -> IO.PortE5;