|
| 1 | +From 8c34ed0da9a90ca07423cadb1f49996d779b97b3 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Michael Sharman <michael@thecodesharman.com.au> |
| 3 | +Date: Fri, 4 Sep 2020 19:03:07 +1000 |
| 4 | +Subject: [PATCH 1/1] [F4] Fix IS_ADC_CHANNEL() |
| 5 | + |
| 6 | +Have to be fixed in STM32CubeF4: |
| 7 | +https://github.com/STMicroelectronics/STM32CubeF4/pull/36 |
| 8 | + |
| 9 | +Signed-off-by: Michael Sharman <michael@thecodesharman.com.au> |
| 10 | +Co-authored-by: Frederic Pillon <frederic.pillon@st.com> |
| 11 | +--- |
| 12 | + .../Inc/stm32f4xx_hal_adc_ex.h | 16 ++++++++-------- |
| 13 | + 1 file changed, 8 insertions(+), 8 deletions(-) |
| 14 | + |
| 15 | +diff --git a/system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h b/system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h |
| 16 | +index 6587acc8..f796e43d 100644 |
| 17 | +--- a/system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h |
| 18 | ++++ b/system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h |
| 19 | +@@ -219,7 +219,7 @@ typedef struct |
| 20 | + #endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F401xC || STM32F401xE || STM32F410xx || STM32F412Zx || |
| 21 | + STM32F412Vx || STM32F412Rx || STM32F412Cx */ |
| 22 | + |
| 23 | +-#if defined(STM32F411xE) || defined(STM32F413xx) || defined(STM32F423xx) || defined(STM32F427xx) || defined(STM32F437xx) ||\ |
| 24 | ++#if defined(STM32F411xE) || defined(STM32F413xx) || defined(STM32F423xx) || defined(STM32F427xx) || defined(STM32F437xx) || \ |
| 25 | + defined(STM32F429xx) || defined(STM32F439xx) || defined(STM32F446xx) || defined(STM32F469xx) || defined(STM32F479xx) |
| 26 | + #define ADC_CHANNEL_DIFFERENCIATION_TEMPSENSOR_VBAT 0x10000000U /* Dummy bit for driver internal usage, not used in ADC channel setting registers CR1 or SQRx */ |
| 27 | + #define ADC_CHANNEL_TEMPSENSOR ((uint32_t)ADC_CHANNEL_18 | ADC_CHANNEL_DIFFERENCIATION_TEMPSENSOR_VBAT) |
| 28 | +@@ -304,17 +304,17 @@ HAL_StatusTypeDef HAL_ADCEx_MultiModeConfigChannel(ADC_HandleTypeDef* hadc, ADC_ |
| 29 | + */ |
| 30 | + #if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx) || defined(STM32F417xx) || \ |
| 31 | + defined(STM32F401xC) || defined(STM32F401xE) || defined(STM32F410Tx) || defined(STM32F410Cx) || \ |
| 32 | +- defined(STM32F410Rx) || defined(STM32F411xE) || defined(STM32F412Zx) || defined(STM32F412Vx) || \ |
| 33 | +- defined(STM32F412Rx) || defined(STM32F412Cx) || defined(STM32F413xx) || defined(STM32F423xx) |
| 34 | ++ defined(STM32F410Rx) || defined(STM32F412Zx) || defined(STM32F412Vx) || defined(STM32F412Rx) || \ |
| 35 | ++ defined(STM32F412Cx) |
| 36 | + #define IS_ADC_CHANNEL(CHANNEL) ((CHANNEL) <= ADC_CHANNEL_18) |
| 37 | +-#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F401xC || STM32F401xE || STM32F410xx || STM32F411xE || |
| 38 | +- STM32F412Zx || STM32F412Vx || STM32F412Rx || STM32F412Cx || STM32F413xx || STM32F423xx */ |
| 39 | ++#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F401xC || STM32F401xE || STM32F410xx || STM32F412Zx || |
| 40 | ++ STM32F412Vx || STM32F412Rx || STM32F412Cx */ |
| 41 | + |
| 42 | +-#if defined(STM32F427xx) || defined(STM32F437xx) || defined(STM32F429xx) || defined(STM32F439xx) || \ |
| 43 | +- defined(STM32F446xx) || defined(STM32F469xx) || defined(STM32F479xx) |
| 44 | ++#if defined(STM32F411xE) || defined(STM32F413xx) || defined(STM32F423xx) || defined(STM32F427xx) || defined(STM32F437xx) || \ |
| 45 | ++ defined(STM32F429xx) || defined(STM32F439xx) || defined(STM32F446xx) || defined(STM32F469xx) || defined(STM32F479xx) |
| 46 | + #define IS_ADC_CHANNEL(CHANNEL) (((CHANNEL) <= ADC_CHANNEL_18) || \ |
| 47 | + ((CHANNEL) == ADC_CHANNEL_TEMPSENSOR)) |
| 48 | +-#endif /* STM32F427xx || STM32F437xx || STM32F429xx || STM32F439xx || STM32F446xx || STM32F469xx || STM32F479xx */ |
| 49 | ++#endif /* STM32F411xE || STM32F413xx || STM32F423xx || STM32F427xx || STM32F437xx || STM32F429xx || STM32F439xx || STM32F446xx || STM32F469xx || STM32F479xx */ |
| 50 | + |
| 51 | + #define IS_ADC_MODE(MODE) (((MODE) == ADC_MODE_INDEPENDENT) || \ |
| 52 | + ((MODE) == ADC_DUALMODE_REGSIMULT_INJECSIMULT) || \ |
| 53 | +-- |
| 54 | +2.27.0.windows.1 |
| 55 | + |
0 commit comments