aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-01-28 18:54:40 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-01-28 18:54:40 +0000
commitbd959fa31cf4e8cf8a6ee4592fb60a7fe024a2f5 (patch)
tree7dc78ab11e199372e74ca27247f911d1987f1928
parentaf7f1b1023e89d9df775d758f20649c4d0ae1cc4 (diff)
downloadChibiOS-bd959fa31cf4e8cf8a6ee4592fb60a7fe024a2f5.tar.gz
ChibiOS-bd959fa31cf4e8cf8a6ee4592fb60a7fe024a2f5.tar.bz2
ChibiOS-bd959fa31cf4e8cf8a6ee4592fb60a7fe024a2f5.zip
Start of 2.5.0.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3892 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--docs/Doxyfile_chm2
-rw-r--r--docs/Doxyfile_html2
-rw-r--r--os/kernel/include/ch.h4
-rw-r--r--readme.txt2
-rw-r--r--todo.txt5
5 files changed, 6 insertions, 9 deletions
diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm
index e51860562..f7070e26f 100644
--- a/docs/Doxyfile_chm
+++ b/docs/Doxyfile_chm
@@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 2.4.0
+PROJECT_NUMBER = 2.5.0
# 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
diff --git a/docs/Doxyfile_html b/docs/Doxyfile_html
index 7e1bd6292..2130ff4ea 100644
--- a/docs/Doxyfile_html
+++ b/docs/Doxyfile_html
@@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 2.4.0
+PROJECT_NUMBER = 2.5.0
# 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
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index ee9663429..65ca431e0 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -40,7 +40,7 @@
/**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "2.4.0"
+#define CH_KERNEL_VERSION "2.5.0"
/**
* @name Kernel version
@@ -54,7 +54,7 @@
/**
* @brief Kernel version minor number.
*/
-#define CH_KERNEL_MINOR 4
+#define CH_KERNEL_MINOR 5
/**
* @brief Kernel version patch number.
diff --git a/readme.txt b/readme.txt
index 0f19fc931..cf0f1e8f3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -77,6 +77,8 @@
*** Releases ***
*****************************************************************************
+*** 2.5.0 ***
+
*** 2.3.5 ***
- FIX: Fixed RTC compile problem on STM32F103 (bug 3468445).
- FIX: Fixed PWM with TIM1 and TIM8 broken in STM32 HAL (bug 3458947).
diff --git a/todo.txt b/todo.txt
index 7340a292d..3ad4037fa 100644
--- a/todo.txt
+++ b/todo.txt
@@ -5,11 +5,6 @@ X = In progress, some work done.
? = Not sure if worth the effort or useful at all.
N = Decided against.
-Current Pipeline (2.4.0):
-* Complete test cycle.
-* Complete documentation cycle.
-X Release.
-
Version 2.4.1
X STM32F2 validation (so far testing done on STM32F4 only).
X Revision of the RTCv2 driver implementation.