zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7330 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2014-09-28 10:43:14 +00:00
parent c822cd9ad1
commit 52c1339d23
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/hal/ports/STM32/STM32F30x/adc_lld.h
View File

@ -248,10 +248,18 @@
#error "ADC1 not present in the selected device" #error "ADC1 not present in the selected device"
#endif #endif
#if STM32_ADC_DUAL_MODE && STM32_ADC_USE_ADC1 && !STM32_HAS_ADC2
#error "ADC2 not present in the selected device"
#endif
#if STM32_ADC_USE_ADC3 && !STM32_HAS_ADC3 #if STM32_ADC_USE_ADC3 && !STM32_HAS_ADC3
#error "ADC3 not present in the selected device" #error "ADC3 not present in the selected device"
#endif #endif
#if STM32_ADC_DUAL_MODE && STM32_ADC_USE_ADC2 && !STM32_HAS_ADC4
#error "ADC4 not present in the selected device"
#endif
#if !STM32_ADC_USE_ADC1 && !STM32_ADC_USE_ADC3 #if !STM32_ADC_USE_ADC1 && !STM32_ADC_USE_ADC3
#error "ADC driver activated but no ADC peripheral assigned" #error "ADC driver activated but no ADC peripheral assigned"
#endif #endif

4
os/hal/ports/STM32/STM32F30x/ext_lld_isr.c
View File

@ -370,7 +370,9 @@ void ext_lld_exti_irq_enable(void) {
nvicEnableVector(RTC_WKUP_IRQn, STM32_EXT_EXTI20_IRQ_PRIORITY); nvicEnableVector(RTC_WKUP_IRQn, STM32_EXT_EXTI20_IRQ_PRIORITY);
nvicEnableVector(COMP1_2_3_IRQn, STM32_EXT_EXTI21_22_29_IRQ_PRIORITY); nvicEnableVector(COMP1_2_3_IRQn, STM32_EXT_EXTI21_22_29_IRQ_PRIORITY);
nvicEnableVector(COMP4_5_6_IRQn, STM32_EXT_EXTI30_32_IRQ_PRIORITY); nvicEnableVector(COMP4_5_6_IRQn, STM32_EXT_EXTI30_32_IRQ_PRIORITY);
#if STM32_EXTI_NUM_CHANNELS >= 34
nvicEnableVector(COMP7_IRQn, STM32_EXT_EXTI33_IRQ_PRIORITY); nvicEnableVector(COMP7_IRQn, STM32_EXT_EXTI33_IRQ_PRIORITY);
#endif
} }
/** /**
@ -394,7 +396,9 @@ void ext_lld_exti_irq_disable(void) {
nvicDisableVector(RTC_WKUP_IRQn); nvicDisableVector(RTC_WKUP_IRQn);
nvicDisableVector(COMP1_2_3_IRQn); nvicDisableVector(COMP1_2_3_IRQn);
nvicDisableVector(COMP4_5_6_IRQn); nvicDisableVector(COMP4_5_6_IRQn);
#if STM32_EXTI_NUM_CHANNELS >= 34
nvicDisableVector(COMP7_IRQn); nvicDisableVector(COMP7_IRQn);
#endif
} }
#endif /* HAL_USE_EXT */ #endif /* HAL_USE_EXT */

6
os/hal/ports/STM32/STM32F30x/stm32_registry.h
View File

@ -65,7 +65,7 @@
#define STM32_HAS_ETH FALSE #define STM32_HAS_ETH FALSE
/* EXTI attributes.*/ /* EXTI attributes.*/
#define STM32_EXTI_NUM_CHANNELS 36 #define STM32_EXTI_NUM_CHANNELS 34
/* GPIO attributes.*/ /* GPIO attributes.*/
#define STM32_HAS_GPIOA TRUE #define STM32_HAS_GPIOA TRUE
@ -687,7 +687,7 @@
#define STM32_HAS_ETH FALSE #define STM32_HAS_ETH FALSE
/* EXTI attributes.*/ /* EXTI attributes.*/
#define STM32_EXTI_NUM_CHANNELS 36 #define STM32_EXTI_NUM_CHANNELS 34
/* GPIO attributes.*/ /* GPIO attributes.*/
#define STM32_HAS_GPIOA TRUE #define STM32_HAS_GPIOA TRUE
@ -1149,7 +1149,7 @@
#define STM32_HAS_ETH FALSE #define STM32_HAS_ETH FALSE
/* EXTI attributes.*/ /* EXTI attributes.*/
#define STM32_EXTI_NUM_CHANNELS 36 #define STM32_EXTI_NUM_CHANNELS 34
/* GPIO attributes.*/ /* GPIO attributes.*/
#define STM32_HAS_GPIOA TRUE #define STM32_HAS_GPIOA TRUE