Use AverageAngleC in AeroVaneReadC.

[tinyos-2.x.git] / tos / platforms / tmirws / sensors / AeroVaneReadC.nc

diff --git a/tos/platforms/tmirws/sensors/AeroVaneReadC.nc b/tos/platforms/tmirws/sensors/AeroVaneReadC.nc
index 01fa7d50d65eb3133d9ba964626d51c29584a31c..8475bdac4fa19e3987fbd33a71d5e46e6212b833 100644 (file)
--- a/tos/platforms/tmirws/sensors/AeroVaneReadC.nc
+++ b/tos/platforms/tmirws/sensors/AeroVaneReadC.nc
@@ -40,27 +40,21 @@ configuration AeroVaneReadC {
   provides interface Notify<aerovector_t>;
 }
 implementation {
-#if 0
-  components new AeroVaneReadP(28800U);
-#else
-  components new AeroVaneReadP(900);
-#endif
+  components new AeroVaneReadP(900); /* 28800 clocks on 32768 Hz crystal */
   Notify = AeroVaneReadP;
 
-#if 0
-  components new Alarm32khz16C();
-  AeroVaneReadP.Alarm -> Alarm32khz16C;
-#else
   components new TimerMilliC();
   AeroVaneReadP.Timer -> TimerMilliC;
-#endif
 
   components WindVaneReadC;
   AeroVaneReadP.Read -> WindVaneReadC;
 
   components AnemometerReadC;
   AeroVaneReadP.AnemometerControl -> AnemometerReadC.StdControl;
-  AeroVaneReadP.Count -> AnemometerReadC;
+  AeroVaneReadP.Revolutions -> AnemometerReadC;
+
+  components new AverageAngleC();
+  AeroVaneReadP.Average -> AverageAngleC;
 
   components new StateC();
   AeroVaneReadP.State -> StateC;