Merge over into the trunk.

[tinyos-2.x.git] / tos / platforms / eyesIFX / sensors / RssiSensorVccC.nc

diff --git a/tos/platforms/eyesIFX/sensors/RssiSensorVccC.nc b/tos/platforms/eyesIFX/sensors/RssiSensorVccC.nc
index d4baa1b35232db5b1ceaa2f743f55df37a786c9a..0a576cba2ff170b2d631483fb8ee794ef68d0564 100644 (file)
--- a/tos/platforms/eyesIFX/sensors/RssiSensorVccC.nc
+++ b/tos/platforms/eyesIFX/sensors/RssiSensorVccC.nc
@@ -47,7 +47,6 @@
 generic configuration RssiSensorVccC()
 {
     provides {
-        interface Read<uint16_t> as Read;
         interface ReadNow<uint16_t> as ReadNow;
         interface Resource as ReadNowResource;
     }
@@ -55,13 +54,11 @@ generic configuration RssiSensorVccC()
 implementation
 {
     components SensorSettingsC as Settings;
-             
-    components new AdcReadClientC() as AdcReadClient;
-    Read = AdcReadClient;
-    AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[RSSI_SENSOR_VCC];
-  
-    components new AdcReadNowClientC() as AdcReadNowClient;
-    ReadNow = AdcReadNowClient;
-    ReadNowResource = AdcReadNowClient;
-    AdcReadNowClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[RSSI_SENSOR_VCC];
+    components RssiSensorVccP as RssiSensor;
+    components new Msp430Adc12ClientC() as AdcClient;
+    
+    ReadNow = RssiSensor;
+    ReadNowResource = RssiSensor;
+    RssiSensor.SubResource -> AdcClient;
+    RssiSensor.SingleChannel -> AdcClient;
 }