From 38a9ba86d47285e3113486a43e8f960d3923d0b0 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 1 Jan 2017 16:36:16 +0000 Subject: [PATCH] Fixed version numbers. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@10005 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- doc/nil/Doxyfile_chm | 2 +- doc/nil/Doxyfile_html | 2 +- doc/rt/Doxyfile_chm | 2 +- doc/rt/Doxyfile_html | 2 +- os/rt/include/ch.h | 4 ++-- testhal/STM32/STM32F1xx/RTC/Makefile | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/nil/Doxyfile_chm b/doc/nil/Doxyfile_chm index b8a583daf..84c60996e 100644 --- a/doc/nil/Doxyfile_chm +++ b/doc/nil/Doxyfile_chm @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/NIL # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.1.2 +PROJECT_NUMBER = 1.1.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/doc/nil/Doxyfile_html b/doc/nil/Doxyfile_html index 908bf584d..6d76a8dbf 100644 --- a/doc/nil/Doxyfile_html +++ b/doc/nil/Doxyfile_html @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/NIL # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.1.2 +PROJECT_NUMBER = 1.1.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/doc/rt/Doxyfile_chm b/doc/rt/Doxyfile_chm index 60ce083d0..ffe0d6ca7 100644 --- a/doc/rt/Doxyfile_chm +++ b/doc/rt/Doxyfile_chm @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/RT # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.1.4 +PROJECT_NUMBER = 3.1.5 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/doc/rt/Doxyfile_html b/doc/rt/Doxyfile_html index 909ab3844..0dcebdf8f 100644 --- a/doc/rt/Doxyfile_html +++ b/doc/rt/Doxyfile_html @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/RT # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.1.4 +PROJECT_NUMBER = 3.1.5 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h index 981ee3a4f..e842bd451 100644 --- a/os/rt/include/ch.h +++ b/os/rt/include/ch.h @@ -48,7 +48,7 @@ /** * @brief Kernel version string. */ -#define CH_KERNEL_VERSION "3.1.4" +#define CH_KERNEL_VERSION "3.1.5" /** * @brief Kernel version major number. @@ -63,7 +63,7 @@ /** * @brief Kernel version patch number. */ -#define CH_KERNEL_PATCH 4 +#define CH_KERNEL_PATCH 5 /** @} */ /* Core headers.*/ diff --git a/testhal/STM32/STM32F1xx/RTC/Makefile b/testhal/STM32/STM32F1xx/RTC/Makefile index 9425ce988..b4c22d586 100644 --- a/testhal/STM32/STM32F1xx/RTC/Makefile +++ b/testhal/STM32/STM32F1xx/RTC/Makefile @@ -113,6 +113,7 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(TESTSRC) \ + $(CHIBIOS)/os/various/syscalls.c \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global