[Tinyos-commits] CVS: tinyos-1.x/tos/platform/msp430 MSP430ADC12M.nc, 1.18, 1.19

[Vlado Handziski]

Update of /cvsroot/tinyos/tinyos-1.x/tos/platform/msp430
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15215

Modified Files:
	MSP430ADC12M.nc 
Log Message:
Setting of sample & hold time should be _after_  the init of the register otherwise it is always reverted to  4 cycles! Yuck!

Index: MSP430ADC12M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/msp430/MSP430ADC12M.nc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MSP430ADC12M.nc	26 Oct 2005 19:47:42 -0000	1.18
--- MSP430ADC12M.nc	22 Feb 2006 02:42:35 -0000	1.19
***************
*** 287,293 ****
              lastMemctl.eos = 1;  
              call HPLADC12.setMemControl(i, lastMemctl);
-             call HPLADC12.setSHT(adc12settings[num16].sampleHoldTime);
              call HPLADC12.setIEFlags(mask << i);
              call HPLADC12.setControl0_IgnoreRef(*(adc12ctl0_t*) &ctl0);
              
              if (req & SINGLE_CHANNEL){
--- 287,293 ----
              lastMemctl.eos = 1;  
              call HPLADC12.setMemControl(i, lastMemctl);
              call HPLADC12.setIEFlags(mask << i);
              call HPLADC12.setControl0_IgnoreRef(*(adc12ctl0_t*) &ctl0);
+             call HPLADC12.setSHT(adc12settings[num16].sampleHoldTime);
              
              if (req & SINGLE_CHANNEL){