Swapping HEAD and DEVEL branches

[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 0a576cba2ff170b2d631483fb8ee794ef68d0564..304386eb0ba127002472569e1fc780147f23833d 100644 (file)
--- a/tos/platforms/eyesIFX/sensors/RssiSensorVccC.nc
+++ b/tos/platforms/eyesIFX/sensors/RssiSensorVccC.nc
@@ -54,11 +54,9 @@ generic configuration RssiSensorVccC()
 implementation
 {
     components SensorSettingsC as Settings;
-    components RssiSensorVccP as RssiSensor;
-    components new Msp430Adc12ClientC() as AdcClient;
+    components new AdcReadNowClientC() as AdcReadNowClient;
     
-    ReadNow = RssiSensor;
-    ReadNowResource = RssiSensor;
-    RssiSensor.SubResource -> AdcClient;
-    RssiSensor.SingleChannel -> AdcClient;
+    ReadNow = AdcReadNowClient;
+    ReadNowResource = AdcReadNowClient;
+    AdcReadNowClient.AdcConfigure -> Settings.AdcConfigure[RSSI_SENSOR_VCC];
 }