remapped timer ports to reflect the availability of b1 on port 4.1

(this was incorrectly left out from a telos cut-and-paste).

diff --git a/tos/platforms/shimmer/Msp430Timer32khzMapC.nc b/tos/platforms/shimmer/Msp430Timer32khzMapC.nc
index c3e6d19262b7fbe3bbdfc477d687ac30f6c1cc75..dd64fc7d163017d33029d9977f4b586156e6382d 100644 (file)
--- a/tos/platforms/shimmer/Msp430Timer32khzMapC.nc
+++ b/tos/platforms/shimmer/Msp430Timer32khzMapC.nc
@@ -53,23 +53,27 @@ implementation
   // 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/shimmer/hardware.h b/tos/platforms/shimmer/hardware.h
index 694ebfa0db322c8041fc1cd25d3c10e3ac3d2e87..e3008caa66c05912ce675260eb98decca784deff 100644 (file)
--- a/tos/platforms/shimmer/hardware.h
+++ b/tos/platforms/shimmer/hardware.h
@@ -74,7 +74,7 @@ TOSH_ASSIGN_PIN(SD_CLK, 3, 3);
 TOSH_ASSIGN_PIN(SD_DO, 3, 2);
 TOSH_ASSIGN_PIN(SD_DI, 3, 1);
 
-// Don't think these are needed
+// this happens in hplcc2420pinsc
 TOSH_ASSIGN_PIN(CC_FIFOP, 2, 6);
 TOSH_ASSIGN_PIN(CC_FIFO, 1, 0);
 TOSH_ASSIGN_PIN(CC_SFD, 1, 2);