looks like Cory's continous DcoCalib fix also fixes our problem

[tinyos-2.x.git] / tos / chips / tda5250 / mac / RedMacC.nc

diff --git a/tos/chips/tda5250/mac/RedMacC.nc b/tos/chips/tda5250/mac/RedMacC.nc
index f3beede09938aec5b3d34a213d0097b533b68058..0a03aa56da9ab7a6d0d72520b638909147912e82 100644 (file)
--- a/tos/chips/tda5250/mac/RedMacC.nc
+++ b/tos/chips/tda5250/mac/RedMacC.nc
@@ -57,11 +57,10 @@ implementation {
     components  MainC,
         RedMacP,
         RssiFixedThresholdCMC as Cca,
-        new Alarm32khzC() as Timer,
-        new Alarm32khzC() as SampleTimer,
+        new Alarm32khz16C() as Timer,
+        new Alarm32khz16C() as SampleTimer,
         RandomLfsrC,
-        McuSleepC,
-        Counter32khzC;
+        Counter32khz16C as Counter;
     
     components ActiveMessageAddressC;
     RedMacP.amAddress -> ActiveMessageAddressC;
@@ -69,7 +68,6 @@ implementation {
     MainC.SoftwareInit -> RedMacP;
               
     SplitControl = RedMacP;
-    McuSleepC.McuPowerOverride -> RedMacP;
     MacSend = RedMacP;
     MacReceive = RedMacP;
     Tda5250Control = RedMacP;
@@ -95,7 +93,7 @@ implementation {
 
     RedMacP.Timer -> Timer;
     RedMacP.SampleTimer -> SampleTimer;
-    RedMacP.Counter32khz16 -> Counter32khzC.Counter32khz16;
+    RedMacP.Counter32khz16 -> Counter;
 /*    
     components PlatformLedsC;
     RedMacP.Led0 -> PlatformLedsC.Led0;