diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-02-02 16:03:12 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2019-02-02 16:03:12 +0000 |
| commit | 4abae0c02008f2d803a5102d9b9155365095a5ed (patch) | |
| tree | ba3a7836f8c6b3bde3cbc9404dfc0a17206024fd | |
| parent | d2c3f1c58db1c540263e62df8e0e112d892cbef4 (diff) | |
| download | ChibiOS-4abae0c02008f2d803a5102d9b9155365095a5ed.tar.gz ChibiOS-4abae0c02008f2d803a5102d9b9155365095a5ed.tar.bz2 ChibiOS-4abae0c02008f2d803a5102d9b9155365095a5ed.zip | |
Fixed bug #1007.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_19.1.x@12629 110e8d01-0319-4d1e-a829-52ad28d1bb01
11 files changed, 43 insertions, 40 deletions
diff --git a/readme.txt b/readme.txt index 73e19e6b1..3945902d2 100644 --- a/readme.txt +++ b/readme.txt @@ -73,5 +73,8 @@ *** Releases and Change Log ***
*****************************************************************************
+*** 19.1.1 ***
+- FIX: Fixed problem in STM32 mcuconf.h template files (bug #1007).
+
*** 19.1.0 ***
- First 19.1.x release, see release note 19.1.0.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32f303xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32f303xx/mcuconf.h.ftl index 6231f9535..c67faf368 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32f303xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32f303xx/mcuconf.h.ftl @@ -215,10 +215,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SERIAL driver system settings.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32f413xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32f413xx/mcuconf.h.ftl index f20ff071a..1b18064d5 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32f413xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32f413xx/mcuconf.h.ftl @@ -226,10 +226,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SDC driver system settings.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32f72xxx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32f72xxx/mcuconf.h.ftl index 8a23c7023..ac243dae9 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32f72xxx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32f72xxx/mcuconf.h.ftl @@ -251,10 +251,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SDC driver system settings.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32f746xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32f746xx/mcuconf.h.ftl index c8a52734f..43715a43b 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32f746xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32f746xx/mcuconf.h.ftl @@ -282,10 +282,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SDC driver system settings.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32f76xxx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32f76xxx/mcuconf.h.ftl index 703d10c40..e72c65cb4 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32f76xxx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32f76xxx/mcuconf.h.ftl @@ -274,10 +274,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SDC driver system settings.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl index 22bae87ad..25acd2076 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl @@ -333,10 +333,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SDC driver system settings.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32l432xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l432xx/mcuconf.h.ftl index 30c4e9bae..079b4a8a8 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32l432xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32l432xx/mcuconf.h.ftl @@ -201,10 +201,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SERIAL driver system settings.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl index 11f400739..34a6d330c 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl @@ -248,10 +248,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SDC driver system settings.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl index e4bf6ca63..f734ddb5e 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl @@ -253,10 +253,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SDC driver system settings.
diff --git a/tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl index e57194d0e..bfbbf79d0 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl @@ -252,10 +252,10 @@ /*
* RTC driver system settings.
*/
-#define STM32_RTC_PRESA_VALUE 32
-#define STM32_RTC_PRESS_VALUE 1024
-#define STM32_RTC_CR_INIT 0
-#define STM32_RTC_TAMPCR_INIT 0
+#define STM32_RTC_PRESA_VALUE ${doc.STM32_RTC_PRESA_VALUE!"32"}
+#define STM32_RTC_PRESS_VALUE ${doc.STM32_RTC_PRESS_VALUE!"1024"}
+#define STM32_RTC_CR_INIT ${doc.STM32_RTC_CR_INIT!"0"}
+#define STM32_RTC_TAMPCR_INIT ${doc.STM32_RTC_TAMPCR_INIT!"0"}
/*
* SDC driver system settings.
|