Merge over into the trunk.

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

diff --git a/tos/platforms/eyesIFX/sensors/DemoSensorC.nc b/tos/platforms/eyesIFX/sensors/DemoSensorC.nc
index fc19335a01ea74625367cedfcac01ba3cebb9a10..ecb8c4ac2f422487e8d24a7aabdb9503b0c917a4 100644 (file)
--- a/tos/platforms/eyesIFX/sensors/DemoSensorC.nc
+++ b/tos/platforms/eyesIFX/sensors/DemoSensorC.nc
@@ -56,9 +56,7 @@ implementation
 {
   components SensorSettingsC as Settings;
   components new AdcReadClientC() as AdcReadClient;
-  components new ReadShiftC(4) as ReadShift;
 
-  Read = ReadShift;
-  ReadShift.ReadRaw -> AdcReadClient;
-  AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
+  Read =  AdcReadClient;
+  AdcReadClient.AdcConfigure -> Settings.AdcConfigure[PHOTO_SENSOR_DEFAULT];
 }