diff options
author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-09-15 11:36:20 +0000 |
---|---|---|
committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-09-15 11:36:20 +0000 |
commit | ad5ce47a747f8a41341fa869607588584a284631 (patch) | |
tree | 23f794580b9e7ef4518b0c825d86f629151501c8 | |
parent | c89f1992ef2d66f9f4417bc0f5b9f29dc42e630e (diff) | |
download | ChibiOS-ad5ce47a747f8a41341fa869607588584a284631.tar.gz ChibiOS-ad5ce47a747f8a41341fa869607588584a284631.tar.bz2 ChibiOS-ad5ce47a747f8a41341fa869607588584a284631.zip |
Reintegrated CANv1 in L4+ HAL.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12263 110e8d01-0319-4d1e-a829-52ad28d1bb01
-rw-r--r-- | demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h | 2 | ||||
-rw-r--r-- | os/hal/ports/STM32/STM32L4xx+/platform.mk | 1 | ||||
-rw-r--r-- | tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h index 29baa0361..1b9964b9d 100644 --- a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h @@ -128,6 +128,8 @@ /*
* 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+/platform.mk b/os/hal/ports/STM32/STM32L4xx+/platform.mk index 8f7af9c33..fc2d9094d 100644 --- a/os/hal/ports/STM32/STM32L4xx+/platform.mk +++ b/os/hal/ports/STM32/STM32L4xx+/platform.mk @@ -21,6 +21,7 @@ else endif
# Drivers compatible with the platform.
+include $(CHIBIOS)/os/hal/ports/STM32/LLD/CANv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/DMAv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv3/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/driver.mk
diff --git a/tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl index 9d7a7214b..f54a4184c 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl @@ -139,6 +139,8 @@ /*
* CAN driver system settings.
*/
+#define STM32_CAN_USE_CAN1 ${doc.STM32_CAN_USE_CAN1!"FALSE"}
+#define STM32_CAN_CAN1_IRQ_PRIORITY ${doc.STM32_CAN_CAN1_IRQ_PRIORITY!"11"}
/*
* DAC driver system settings.
|