replaced missing hw timer b1 from bad cut-and-paste from telos carried

from shimmer the first.

hardware.h addition...following practice.  might not be necessary.

diff --git a/tos/platforms/shimmer2/Msp430Timer32khzMapC.nc b/tos/platforms/shimmer2/Msp430Timer32khzMapC.nc
index c3e6d19262b7fbe3bbdfc477d687ac30f6c1cc75..e23e742a6dc2ac8fe8a64d9536528af34025f1d5 100644 (file)
--- a/tos/platforms/shimmer2/Msp430Timer32khzMapC.nc
+++ b/tos/platforms/shimmer2/Msp430Timer32khzMapC.nc
@@ -48,28 +48,28 @@ implementation
   Msp430TimerControl[0] = Msp430TimerC.ControlB0;
   Msp430Compare[0] = Msp430TimerC.CompareB0;
 
-  // Timer pin B1 is used by the CC2420 radio's SFD pin
-  // this is the only difference between the default 32khz map
-  // and the map on telos
-
   Msp430Timer[1] = Msp430TimerC.TimerB;
-  Msp430TimerControl[1] = Msp430TimerC.ControlB2;
-  Msp430Compare[1] = Msp430TimerC.CompareB2;
+  Msp430TimerControl[1] = Msp430TimerC.ControlB1;
+  Msp430Compare[1] = Msp430TimerC.CompareB1;
 
   Msp430Timer[2] = Msp430TimerC.TimerB;
-  Msp430TimerControl[2] = Msp430TimerC.ControlB3;
-  Msp430Compare[2] = Msp430TimerC.CompareB3;
+  Msp430TimerControl[2] = Msp430TimerC.ControlB2;
+  Msp430Compare[2] = Msp430TimerC.CompareB2;
 
   Msp430Timer[3] = Msp430TimerC.TimerB;
-  Msp430TimerControl[3] = Msp430TimerC.ControlB4;
-  Msp430Compare[3] = Msp430TimerC.CompareB4;
+  Msp430TimerControl[3] = Msp430TimerC.ControlB3;
+  Msp430Compare[3] = Msp430TimerC.CompareB3;
 
   Msp430Timer[4] = Msp430TimerC.TimerB;
-  Msp430TimerControl[4] = Msp430TimerC.ControlB5;
-  Msp430Compare[4] = Msp430TimerC.CompareB5;
+  Msp430TimerControl[4] = Msp430TimerC.ControlB4;
+  Msp430Compare[4] = Msp430TimerC.CompareB4;
 
   Msp430Timer[5] = Msp430TimerC.TimerB;
-  Msp430TimerControl[5] = Msp430TimerC.ControlB6;
-  Msp430Compare[5] = Msp430TimerC.CompareB6;
+  Msp430TimerControl[5] = Msp430TimerC.ControlB5;
+  Msp430Compare[5] = Msp430TimerC.CompareB5;
+
+  Msp430Timer[6] = Msp430TimerC.TimerB;
+  Msp430TimerControl[6] = Msp430TimerC.ControlB6;
+  Msp430Compare[6] = Msp430TimerC.CompareB6;
 }
 

diff --git a/tos/platforms/shimmer2/hardware.h b/tos/platforms/shimmer2/hardware.h
index 71e7c2e153e79718c28c6df7c028a3e06a95af50..90d857e7b78ec4f8afd7836fa668a58563bd32b5 100644 (file)
--- a/tos/platforms/shimmer2/hardware.h
+++ b/tos/platforms/shimmer2/hardware.h
@@ -65,6 +65,13 @@ TOSH_ASSIGN_PIN(RADIO_SOMI1, 5, 2);
 TOSH_ASSIGN_PIN(RADIO_CSN,   5, 4);
 TOSH_ASSIGN_PIN(RADIO_RESET, 5, 7);
 
+// this happens in hplcc2420pinsc
+TOSH_ASSIGN_PIN(CC_FIFOP, 1, 2);
+TOSH_ASSIGN_PIN(CC_FIFO, 1, 5);
+TOSH_ASSIGN_PIN(CC_SFD, 1, 0);
+TOSH_ASSIGN_PIN(CC_VREN, 5, 6);
+TOSH_ASSIGN_PIN(CC_RSTN, 5, 7);
+
 // BT pins
 TOSH_ASSIGN_PIN(BT_PIO,      2, 6);
 TOSH_ASSIGN_PIN(BT_RTS,      1, 6);