REVIEW

Author: jeromecoutant

targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G474xx/TARGET_NUCLEO_G474RE/PeripheralPins.c

@@ -96,11 +96,10 @@ MBED_WEAK const PinMap PinMap_ADC[] = {
     {NC, NC, 0}
 };
 
-// !!! SECTION TO BE CHECKED WITH DEVICE REFERENCE MANUAL
 MBED_WEAK const PinMap PinMap_ADC_Internal[] = {
-    {ADC_TEMP,   ADC_1,    STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)},
-    {ADC_VREF,   ADC_1,    STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)},
-    {ADC_VBAT,   ADC_1,    STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)},
+    {ADC_TEMP,   ADC_1,    STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16
+    {ADC_VREF,   ADC_1,    STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_IN18
+    {ADC_VBAT,   ADC_1,    STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_IN17
     {NC, NC, 0}
 };
 

targets/TARGET_STM/TARGET_STM32G4/analogin_device.c

@@ -94,38 +94,33 @@ static void _analogin_init_direct(analogin_t *obj, const PinMap *pinmap)
 
 #if defined(ADC1)
     if ((ADCName)obj->handle.Instance == ADC_1) {
-        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC12);    // TODO - disable clock with deinit?
-        __HAL_RCC_ADC12_CONFIG(RCC_ADC12CLKSOURCE_SYSCLK);      // TODO - which clock?
-                                                                // SYSCLK or PLL?
+        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC12);
+        __HAL_RCC_ADC12_CONFIG(RCC_ADC12CLKSOURCE_SYSCLK);
     }
 #endif
 #if defined(ADC2)
     if ((ADCName)obj->handle.Instance == ADC_2) {
-        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC12);    // TODO - disable clock with deinit?
-        __HAL_RCC_ADC12_CONFIG(RCC_ADC12CLKSOURCE_SYSCLK);      // TODO - which clock?
-                                                                // SYSCLK or PLL?
+        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC12);
+        __HAL_RCC_ADC12_CONFIG(RCC_ADC12CLKSOURCE_SYSCLK);
     }
 #endif
 #if defined(ADC3)
     if ((ADCName)obj->handle.Instance == ADC_3) {
-        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC345);   // TODO - disable clock with deinit?
-        __HAL_RCC_ADC345_CONFIG(RCC_ADC345CLKSOURCE_SYSCLK);    // TODO - which clock?
-                                                                // SYSCLK or PLL?
+        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC345);
+        __HAL_RCC_ADC345_CONFIG(RCC_ADC345CLKSOURCE_SYSCLK);
     }
 #endif
 #if defined(ADC4)
     if ((ADCName)obj->handle.Instance == ADC_4) {
-        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC345);   // TODO - disable clock with deinit?
-        __HAL_RCC_ADC345_CONFIG(RCC_ADC345CLKSOURCE_SYSCLK);    // TODO - which clock?
-                                                                // SYSCLK or PLL?
+        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC345);
+        __HAL_RCC_ADC345_CONFIG(RCC_ADC345CLKSOURCE_SYSCLK);
     }
 #endif
 
 #if defined(ADC5)
     if ((ADCName)obj->handle.Instance == ADC_5) {
-        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC345);   // TODO - disable clock with deinit?
-        __HAL_RCC_ADC345_CONFIG(RCC_ADC345CLKSOURCE_SYSCLK);    // TODO - which clock?
-                                                                // SYSCLK or PLL?
+        LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_ADC345);
+        __HAL_RCC_ADC345_CONFIG(RCC_ADC345CLKSOURCE_SYSCLK);
     }
 
 #endif
@@ -220,12 +215,27 @@ uint16_t adc_read(analogin_t *obj)
             break;
         case 16:
             sConfig.Channel = ADC_CHANNEL_16;
+
+            if ((ADCName)obj->handle.Instance == ADC_1) {
+                sConfig.Channel = ADC_CHANNEL_TEMPSENSOR_ADC1;
+                sConfig.SamplingTime = ADC_SAMPLETIME_640CYCLES_5;
+            }
             break;
         case 17:
             sConfig.Channel = ADC_CHANNEL_17;
+
+            if ((ADCName)obj->handle.Instance == ADC_1) {
+                sConfig.Channel = ADC_CHANNEL_VBAT;
+                sConfig.SamplingTime = ADC_SAMPLETIME_640CYCLES_5;
+            }
             break;
         case 18:
             sConfig.Channel = ADC_CHANNEL_18;
+
+            if ((ADCName)obj->handle.Instance == ADC_1) {
+                sConfig.Channel = ADC_CHANNEL_VREFINT;
+                sConfig.SamplingTime = ADC_SAMPLETIME_640CYCLES_5;
+            }
             break;
         default:
             return 0;
@@ -246,7 +256,9 @@ uint16_t adc_read(analogin_t *obj)
     } else {
         debug("HAL_ADC_PollForConversion issue\n");
     }
+
     LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE((&obj->handle)->Instance), LL_ADC_PATH_INTERNAL_NONE);
+
     if (HAL_ADC_Stop(&obj->handle) != HAL_OK) {
         debug("HAL_ADC_Stop issue\n");;
     }