aboutsummaryrefslogtreecommitdiffstats
path: root/demos/STM32
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-07-28 14:22:57 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-07-28 14:22:57 +0000
commit5b7d62c5490a3f4662c1ba77ab3f78a80ad6869d (patch)
treedffae619b098255689af0ae2dddfdad4166c4d70 /demos/STM32
parent402bd03481bb1d0b062e72eab2d24d714b846285 (diff)
downloadChibiOS-5b7d62c5490a3f4662c1ba77ab3f78a80ad6869d.tar.gz
ChibiOS-5b7d62c5490a3f4662c1ba77ab3f78a80ad6869d.tar.bz2
ChibiOS-5b7d62c5490a3f4662c1ba77ab3f78a80ad6869d.zip
Updated EXT driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8121 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/STM32')
-rw-r--r--demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h3
-rw-r--r--demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h2
-rw-r--r--demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h3
-rw-r--r--demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h3
-rw-r--r--demos/STM32/RT-STM32L053R8-NUCLEO/halconf.h2
-rw-r--r--demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h4
6 files changed, 10 insertions, 7 deletions
diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
index 851599c72..2a494b377 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
@@ -75,7 +75,8 @@
#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_IRQ_PRIORITY 3
+#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 3
/*
* GPT driver system settings.
diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h
index 5eb82fd6d..b9f7a8c5b 100644
--- a/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h
+++ b/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h
@@ -75,7 +75,7 @@
#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_IRQ_PRIORITY 3
+#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
/*
* GPT driver system settings.
diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
index 851599c72..2a494b377 100644
--- a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
@@ -75,7 +75,8 @@
#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_IRQ_PRIORITY 3
+#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 3
/*
* GPT driver system settings.
diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h
index 2a523b61e..95419bd1e 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h
@@ -77,7 +77,8 @@
#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3
#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3
#define STM32_EXT_EXTI16_IRQ_PRIORITY 3
-#define STM32_EXT_EXTI17_IRQ_PRIORITY 3
+#define STM32_EXT_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_EXT_EXTI21_22_IRQ_PRIORITY 3
/*
* GPT driver system settings.
diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/halconf.h b/demos/STM32/RT-STM32L053R8-NUCLEO/halconf.h
index 29155d16b..3e61eeaf9 100644
--- a/demos/STM32/RT-STM32L053R8-NUCLEO/halconf.h
+++ b/demos/STM32/RT-STM32L053R8-NUCLEO/halconf.h
@@ -41,7 +41,7 @@
* @brief Enables the ADC subsystem.
*/
#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC TRUE
+#define HAL_USE_ADC FALSE
#endif
/**
diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h
index 85180451c..ad56a50fd 100644
--- a/demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h
+++ b/demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h
@@ -67,11 +67,11 @@
/*
* ADC driver system settings.
+ * Note, IRQ is shared with EXT channels 21 and 22.
*/
-#define STM32_ADC_USE_ADC1 TRUE
+#define STM32_ADC_USE_ADC1 FALSE
#define STM32_ADC_ADC1_CKMODE STM32_ADC_CKMODE_ADCCLK
#define STM32_ADC_ADC1_DMA_PRIORITY 2
-#define STM32_ADC_ADC1_IRQ_PRIORITY 2
#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 2
#define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
#define STM32_ADC_PRESCALER_VALUE 1