Swapping HEAD and DEVEL branches

[tinyos-2.x.git] / tos / platforms / eyesIFX / byte_radio / RssiFixedThresholdCMC.nc

diff --git a/tos/platforms/eyesIFX/byte_radio/RssiFixedThresholdCMC.nc b/tos/platforms/eyesIFX/byte_radio/RssiFixedThresholdCMC.nc
index f3b3add6ee4f0a33611525b5fec8ce48df7e607f..5b2384d4fd7c778c0cc62fe9f097b99e291d211b 100644 (file)
--- a/tos/platforms/eyesIFX/byte_radio/RssiFixedThresholdCMC.nc
+++ b/tos/platforms/eyesIFX/byte_radio/RssiFixedThresholdCMC.nc
@@ -32,6 +32,7 @@
  * Configuration for the fixed Rssi Threshold module.
  *
  * @author: Kevin Klues (klues@tkn.tu-berlin.de)
+ * @author: Andreas Koepke (koepke@tkn.tu-berlin.de)
  */
 configuration RssiFixedThresholdCMC
 {
@@ -41,6 +42,7 @@ configuration RssiFixedThresholdCMC
         interface ChannelMonitorControl;
         interface ChannelMonitorData;
         interface BatteryLevel;
+        interface Resource as RssiAdcResource;
     }    
 }
 implementation
@@ -48,22 +50,24 @@ implementation
     components RssiFixedThresholdCMP,
         new RssiSensorVccC() as Rssi,
         new BatteryLevelSensorC() as Voltage,
-        // PlatformLedsC,
         new TimerMilliC() as Timer,
         MainC;
 
     MainC.SoftwareInit -> RssiFixedThresholdCMP;
     StdControl = RssiFixedThresholdCMP;
-
+    RssiAdcResource = Rssi;
+    
     RssiFixedThresholdCMP.Rssi -> Rssi;
-    // RssiFixedThresholdCMP.RssiAdcResource -> Rssi;
-
     RssiFixedThresholdCMP.Voltage -> Voltage;
 
     ChannelMonitor = RssiFixedThresholdCMP;
     ChannelMonitorControl = RssiFixedThresholdCMP;
     ChannelMonitorData = RssiFixedThresholdCMP;
     BatteryLevel = RssiFixedThresholdCMP;
-    // RssiFixedThresholdCMP.Led3 -> PlatformLedsC.Led3;
+
+/*    components PlatformLedsC;
+    RssiFixedThresholdCMP.Led3 -> PlatformLedsC.Led3;
+    RssiFixedThresholdCMP.Led2 -> PlatformLedsC.Led2;
+*/
     RssiFixedThresholdCMP.Timer -> Timer;    
 }