Merge pull request #129 from smaillet-ms/Fix-STM32F4-ADCWarning

smaillet-ms · smaillet-ms · commit 1abb95bbe904 · 2015-05-27T09:01:35.000-07:00
Fix bug in STM32F4 ADC generating compiler warning
diff --git a/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Analog/STM32F4_AD_functions.cpp b/DeviceCode/Targets/Native/STM32F4/DeviceCode/STM32F4_Analog/STM32F4_AD_functions.cpp
@@ -111,7 +111,7 @@ INT32 AD_Read( ANALOG_CHANNEL channel )
     
             // disable internally reference
             if(chNum == 16 || chNum == 17) {
-                ADC->CCR &= ~(1 << ADC_CCR_TSVREFE); 
+                ADC->CCR &= ~ADC_CCR_TSVREFE; 
             }
     
             return ADCx->DR; // read result

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ INT32 AD_Read( ANALOG_CHANNEL channel )`
`111`	`111`
`112`	`112`	`// disable internally reference`
`113`	`113`	`if(chNum == 16 \|\| chNum == 17) {`
`114`		`- ADC->CCR &= ~(1 << ADC_CCR_TSVREFE);`
	`114`	`+ ADC->CCR &= ~ADC_CCR_TSVREFE;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`return ADCx->DR; // read result`