|
@@ -22,7 +22,7 @@
|
|
|
# error "You need to set HAL_USE_ADC to TRUE in your halconf.h to use the ADC."
|
|
|
#endif
|
|
|
|
|
|
-#if !STM32_ADC_USE_ADC1 && !STM32_ADC_USE_ADC2 && !STM32_ADC_USE_ADC3 && !STM32_ADC_USE_ADC4
|
|
|
+#if !STM32_ADC_USE_ADC1 && !STM32_ADC_USE_ADC2 && !STM32_ADC_USE_ADC3 && !STM32_ADC_USE_ADC4 && !WB32_ADC_USE_ADC1
|
|
|
# error "You need to set one of the 'STM32_ADC_USE_ADCx' settings to TRUE in your mcuconf.h to use the ADC."
|
|
|
#endif
|
|
|
|
|
@@ -37,7 +37,7 @@
|
|
|
// Otherwise assume V3
|
|
|
#if defined(STM32F0XX) || defined(STM32L0XX)
|
|
|
# define USE_ADCV1
|
|
|
-#elif defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) || defined(GD32VF103)
|
|
|
+#elif defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) || defined(GD32VF103) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
|
|
|
# define USE_ADCV2
|
|
|
#endif
|
|
|
|
|
@@ -74,7 +74,7 @@
|
|
|
|
|
|
/* User configurable ADC options */
|
|
|
#ifndef ADC_COUNT
|
|
|
-# if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F4XX) || defined(GD32VF103)
|
|
|
+# if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F4XX) || defined(GD32VF103) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
|
|
|
# define ADC_COUNT 1
|
|
|
# elif defined(STM32F3XX)
|
|
|
# define ADC_COUNT 4
|
|
@@ -121,7 +121,7 @@ static ADCConversionGroup adcConversionGroup = {
|
|
|
.cfgr1 = ADC_CFGR1_CONT | ADC_RESOLUTION,
|
|
|
.smpr = ADC_SAMPLING_RATE,
|
|
|
#elif defined(USE_ADCV2)
|
|
|
-# if !defined(STM32F1XX) && !defined(GD32VF103)
|
|
|
+# if !defined(STM32F1XX) && !defined(GD32VF103) && !defined(WB32F3G71xx) && !defined(WB32FQ95xx)
|
|
|
.cr2 = ADC_CR2_SWSTART, // F103 seem very unhappy with, F401 seems very unhappy without...
|
|
|
# endif
|
|
|
.smpr2 = ADC_SMPR2_SMP_AN0(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN1(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN2(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN3(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN4(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN5(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN6(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN7(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN8(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN9(ADC_SAMPLING_RATE),
|
|
@@ -219,7 +219,7 @@ __attribute__((weak)) adc_mux pinToMux(pin_t pin) {
|
|
|
case F9: return TO_MUX( ADC_CHANNEL_IN7, 2 );
|
|
|
case F10: return TO_MUX( ADC_CHANNEL_IN8, 2 );
|
|
|
# endif
|
|
|
-#elif defined(STM32F1XX) || defined(GD32VF103)
|
|
|
+#elif defined(STM32F1XX) || defined(GD32VF103) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
|
|
|
case A0: return TO_MUX( ADC_CHANNEL_IN0, 0 );
|
|
|
case A1: return TO_MUX( ADC_CHANNEL_IN1, 0 );
|
|
|
case A2: return TO_MUX( ADC_CHANNEL_IN2, 0 );
|
|
@@ -248,7 +248,7 @@ __attribute__((weak)) adc_mux pinToMux(pin_t pin) {
|
|
|
|
|
|
static inline ADCDriver* intToADCDriver(uint8_t adcInt) {
|
|
|
switch (adcInt) {
|
|
|
-#if STM32_ADC_USE_ADC1
|
|
|
+#if STM32_ADC_USE_ADC1 || WB32_ADC_USE_ADC1
|
|
|
case 0:
|
|
|
return &ADCD1;
|
|
|
#endif
|