aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-06-13 09:07:15 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-06-13 09:07:15 +0000
commitabec054420be9af92aeb3b5740cc20050236e01d (patch)
treea5b8454cc24240d83b971f3a749ce225e15a0b7e
parentb536b109923b260cf6fc3b4c03cf65e4b4c5c795 (diff)
downloadChibiOS-abec054420be9af92aeb3b5740cc20050236e01d.tar.gz
ChibiOS-abec054420be9af92aeb3b5740cc20050236e01d.tar.bz2
ChibiOS-abec054420be9af92aeb3b5740cc20050236e01d.zip
Fixed bug #604.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8023 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/adc_lld.h2
-rw-r--r--readme.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/STM32F3xx/adc_lld.h b/os/hal/ports/STM32/STM32F3xx/adc_lld.h
index ffaf94a1c..ee6e2b5f3 100644
--- a/os/hal/ports/STM32/STM32F3xx/adc_lld.h
+++ b/os/hal/ports/STM32/STM32F3xx/adc_lld.h
@@ -256,7 +256,7 @@
#error "ADC3 not present in the selected device"
#endif
-#if STM32_ADC_DUAL_MODE && STM32_ADC_USE_ADC2 && !STM32_HAS_ADC4
+#if STM32_ADC_DUAL_MODE && STM32_ADC_USE_ADC3 && !STM32_HAS_ADC4
#error "ADC4 not present in the selected device"
#endif
diff --git a/readme.txt b/readme.txt
index 63070ec9b..110324a90 100644
--- a/readme.txt
+++ b/readme.txt
@@ -77,6 +77,7 @@
- NIL: Added INTC priorities check to the e200z port.
- RT: Added INTC priorities check to the e200z port.
- HAL: Added support for extra DMA channels in STM32F072 devices.
+- HAL: Fixed wrong check on ADC3 in STM32F3xx ADC driver (bug #604).
- HAL: Fixed wrong macro names in STM32F3xx HAL driver (bug #603).
- HAL: Fixed errors in STM32 OTGv1 driver (bug #601).
- DEM: Fixed missing paths in e200z demos (bug #600).