Merge pull request #13523 from jeromecoutant/PR_H7_ADC2

0xc0170 · web-flow · commit 895488f9459a · 2020-09-03T13:24:55.000+01:00
STM32H7 ADC: No MultiMode configuration needed for ADC2
diff --git a/targets/TARGET_STM/TARGET_STM32H7/analogin_device.c b/targets/TARGET_STM/TARGET_STM32H7/analogin_device.c
@@ -143,11 +143,11 @@ void analogin_init(analogin_t *obj, PinName pin)
         error("analogin_init HAL_ADC_Init");
     }
 
-    if ( ((ADCName)obj->handle.Instance == ADC_1) || ((ADCName)obj->handle.Instance == ADC_2) ) {
+    if ((ADCName)obj->handle.Instance == ADC_1) {
         ADC_MultiModeTypeDef multimode = {0};
         multimode.Mode = ADC_MODE_INDEPENDENT;
         if (HAL_ADCEx_MultiModeConfigChannel(&obj->handle, &multimode) != HAL_OK) {
-            error("analogin_init HAL_ADC_Init");
+            error("HAL_ADCEx_MultiModeConfigChannel HAL_ADC_Init");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,11 @@ void analogin_init(analogin_t *obj, PinName pin)`
`143`	`143`	`error("analogin_init HAL_ADC_Init");`
`144`	`144`	`}`
`145`	`145`
`146`		`- if ( ((ADCName)obj->handle.Instance == ADC_1) \|\| ((ADCName)obj->handle.Instance == ADC_2) ) {`
	`146`	`+ if ((ADCName)obj->handle.Instance == ADC_1) {`
`147`	`147`	`ADC_MultiModeTypeDef multimode = {0};`
`148`	`148`	`multimode.Mode = ADC_MODE_INDEPENDENT;`
`149`	`149`	`if (HAL_ADCEx_MultiModeConfigChannel(&obj->handle, &multimode) != HAL_OK) {`
`150`		`- error("analogin_init HAL_ADC_Init");`
	`150`	`+ error("HAL_ADCEx_MultiModeConfigChannel HAL_ADC_Init");`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`