aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-08-24 10:13:42 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-08-24 10:13:42 +0000
commitdb035833f5f7d1d13c0decb467d69026fab288b9 (patch)
tree5a39e43c89a0194d368056be57a3471170badb12
parentd5ce517dc2cc86a9d30483ea42e1f0f803b126ac (diff)
downloadChibiOS-db035833f5f7d1d13c0decb467d69026fab288b9.tar.gz
ChibiOS-db035833f5f7d1d13c0decb467d69026fab288b9.tar.bz2
ChibiOS-db035833f5f7d1d13c0decb467d69026fab288b9.zip
Fixed bug #877.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10469 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--demos/STM32/RT-STM32L432KC-NUCLEO32/mcuconf.h5
-rw-r--r--os/hal/ports/STM32/STM32L4xx/stm32_registry.h12
-rw-r--r--readme.txt2
3 files changed, 18 insertions, 1 deletions
diff --git a/demos/STM32/RT-STM32L432KC-NUCLEO32/mcuconf.h b/demos/STM32/RT-STM32L432KC-NUCLEO32/mcuconf.h
index a56dd002c..094f1a243 100644
--- a/demos/STM32/RT-STM32L432KC-NUCLEO32/mcuconf.h
+++ b/demos/STM32/RT-STM32L432KC-NUCLEO32/mcuconf.h
@@ -101,6 +101,11 @@
#define STM32_ADC_ADC1_DMA_PRIORITY 2
#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 5
#define STM32_ADC_ADC123_CLOCK_MODE ADC_CCR_CKMODE_AHB_DIV1
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_CAN1 FALSE
+#define STM32_CAN_CAN1_IRQ_PRIORITY 11
/*
* DAC driver system settings.
diff --git a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h
index 880f4362e..44364d60c 100644
--- a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h
@@ -63,7 +63,17 @@
#define STM32_HAS_ADC4 FALSE
/* CAN attributes.*/
-#define STM32_HAS_CAN1 FALSE
+#define STM32_HAS_CAN1 TRUE
+#define STM32_CAN_MAX_FILTERS 14
+#define STM32_CAN1_TX_HANDLER Vector8C
+#define STM32_CAN1_RX0_HANDLER Vector90
+#define STM32_CAN1_RX1_HANDLER Vector94
+#define STM32_CAN1_SCE_HANDLER Vector98
+#define STM32_CAN1_TX_NUMBER 19
+#define STM32_CAN1_RX0_NUMBER 20
+#define STM32_CAN1_RX1_NUMBER 21
+#define STM32_CAN1_SCE_NUMBER 22
+
#define STM32_HAS_CAN2 FALSE
#define STM32_HAS_CAN3 FALSE
diff --git a/readme.txt b/readme.txt
index 2b82c8410..959871b00 100644
--- a/readme.txt
+++ b/readme.txt
@@ -93,6 +93,8 @@
dependencies and configuration directories. This makes possible
to have multiple non-conflicting makefiles in the same project.
Updated the various platform.mk implementing "smart build" mode.
+- HAL: Fixed missing CAN definitions in STM32L432 registry entry (bug #877)
+ (backported to 17.6.1).
- HAL: Fixed missing STM32_TIM_MAX_CHANNELS definition in STM32L0 registry
(bug #876)(backported to 17.6.1 and 16.1.9).
- HAL: Fixed STM32 OTGv1 driver fails on STM32L4 (bug #875)