all misc. whitespace EXCEPT:

shimmerAnalogSetupP was missing the appropriate pin setups for the
msp430:  set input and modfunc.  should be fixed now.

diff --git a/tos/platforms/shimmer/shimmerAnalogSetupC.nc b/tos/platforms/shimmer/shimmerAnalogSetupC.nc
index 056596397a8b04b1dcdaa22a9ea224fab689cec9..d2194e14112734c4d17fb8159baf5c219ff5954c 100644 (file)
--- a/tos/platforms/shimmer/shimmerAnalogSetupC.nc
+++ b/tos/platforms/shimmer/shimmerAnalogSetupC.nc
@@ -53,7 +53,6 @@ implementation {
   
   components LedsC;
   shimmerAnalogSetupP.Leds -> LedsC;
-  
 }
   
   

diff --git a/tos/platforms/shimmer/shimmerAnalogSetupP.nc b/tos/platforms/shimmer/shimmerAnalogSetupP.nc
index a4d926b7b9bedf0bf74ae328fd025d842d28f35c..34cedf68c4744ae3cee26e32f8066f7ca2afe61f 100644 (file)
--- a/tos/platforms/shimmer/shimmerAnalogSetupP.nc
+++ b/tos/platforms/shimmer/shimmerAnalogSetupP.nc
@@ -64,6 +64,15 @@ implementation {
     addNewChannels(new_chans, 3);
     
     initADC12MEMCTLx();
+
+    TOSH_MAKE_ADC_5_INPUT();         
+    TOSH_SEL_ADC_5_MODFUNC();
+
+    TOSH_MAKE_ADC_4_INPUT();         
+    TOSH_SEL_ADC_4_MODFUNC();
+
+    TOSH_MAKE_ADC_3_INPUT();         
+    TOSH_SEL_ADC_3_MODFUNC();
   }
 
   command void shimmerAnalogSetup.addGyroInputs() {
@@ -71,6 +80,15 @@ implementation {
     addNewChannels(new_chans, 3);
     
     initADC12MEMCTLx();
+
+    TOSH_MAKE_ADC_1_INPUT();         
+    TOSH_SEL_ADC_1_MODFUNC();
+
+    TOSH_MAKE_ADC_6_INPUT();         
+    TOSH_SEL_ADC_6_MODFUNC();
+
+    TOSH_MAKE_ADC_2_INPUT();         
+    TOSH_SEL_ADC_2_MODFUNC();
   }
 
   command void shimmerAnalogSetup.addECGInputs() {
@@ -78,6 +96,12 @@ implementation {
     addNewChannels(new_chans, 2);
     
     initADC12MEMCTLx();
+
+    TOSH_MAKE_ADC_1_INPUT();         
+    TOSH_SEL_ADC_1_MODFUNC();
+
+    TOSH_MAKE_ADC_2_INPUT();         
+    TOSH_SEL_ADC_2_MODFUNC();
   }
 
   command void shimmerAnalogSetup.addUVInputs() {
@@ -85,6 +109,15 @@ implementation {
     addNewChannels(new_chans, 3);
     
     initADC12MEMCTLx();
+
+    TOSH_MAKE_ADC_1_INPUT();         
+    TOSH_SEL_ADC_1_MODFUNC();
+
+    TOSH_MAKE_ADC_2_INPUT();         
+    TOSH_SEL_ADC_2_MODFUNC();
+
+    TOSH_MAKE_ADC_6_INPUT();         
+    TOSH_SEL_ADC_6_MODFUNC();
   }
 
   command void shimmerAnalogSetup.addGSRInput() { 
@@ -92,6 +125,9 @@ implementation {
     addNewChannels(new_chans, 1);
     
     initADC12MEMCTLx();
+
+    TOSH_MAKE_ADC_1_INPUT();         
+    TOSH_SEL_ADC_1_MODFUNC();
   }
 
   command void shimmerAnalogSetup.addAnExInput() { 
@@ -99,6 +135,12 @@ implementation {
     addNewChannels(new_chans, 2);
     
     initADC12MEMCTLx();
+
+    TOSH_MAKE_ADC_0_INPUT();         
+    TOSH_SEL_ADC_0_MODFUNC();
+
+    TOSH_MAKE_ADC_7_INPUT();         
+    TOSH_SEL_ADC_7_MODFUNC();
   }
 
   command void shimmerAnalogSetup.finishADCSetup(uint16_t * buffer){