From: smckown Date: Mon, 9 Nov 2009 19:30:55 +0000 (+0000) Subject: AnemometerReadC changes X-Git-Tag: release/2.1.0-2~9 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=64777f67213b87476bbec08d4269e3e8c60007e5 AnemometerReadC changes * Replace interface AsyncGet with Get. * Change interface Count name to Revolutions. --- diff --git a/tos/platforms/tmirws/sensors/AnemometerReadC.nc b/tos/platforms/tmirws/sensors/AnemometerReadC.nc index e454adb1..22e291b2 100644 --- a/tos/platforms/tmirws/sensors/AnemometerReadC.nc +++ b/tos/platforms/tmirws/sensors/AnemometerReadC.nc @@ -28,7 +28,7 @@ */ /** - * Instantaneous anemometer read; depends upon prior call for correct timing. + * Returns the number of anemometer revolutions since the last read. * * @author R. Steve McKown */ @@ -38,16 +38,16 @@ configuration AnemometerReadC { provides { interface StdControl; - interface AsyncGet as Count; + interface Get as Revolutions; } } implementation { - components MainC; - MainC.SoftwareInit -> AnemometerReadP.Init; - components AnemometerReadP; StdControl = AnemometerReadP; - Count = AnemometerReadP; + Revolutions = AnemometerReadP; + + components MainC; + MainC.SoftwareInit -> AnemometerReadP.Init; components Msp430CounterMicroC; AnemometerReadP.SpinCounter -> Msp430CounterMicroC; diff --git a/tos/platforms/tmirws/sensors/AnemometerReadP.nc b/tos/platforms/tmirws/sensors/AnemometerReadP.nc index 3b4a5450..ef8a5e83 100644 --- a/tos/platforms/tmirws/sensors/AnemometerReadP.nc +++ b/tos/platforms/tmirws/sensors/AnemometerReadP.nc @@ -28,7 +28,7 @@ */ /** - * Instantaneous anemometer read; depends upon prior call for correct timing. + * Returns the number of anemometer revolutions since the last read. * * @author R. Steve McKown */ @@ -39,7 +39,7 @@ module AnemometerReadP { provides { interface Init; interface StdControl; - interface AsyncGet as Count; + interface Get as Revolutions; } uses interface Counter as SpinCounter; @@ -74,7 +74,7 @@ implementation { atomic TACTL &= ~(MC1|MC0); } - async command uint16_t Count.get() + command uint16_t Revolutions.get() { atomic { uint16_t newCount;