Bump version to 1.2.0.

picoos · Feb 22, 2019 · ecd9280 · ecd9280
1 parent 14e5dfd
commit ecd9280
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## [1.2.0 Unreleased]
+## [1.2.0]
 - add posTimerCallbackSet to create a callback timer instead of normal one.
   Callback is done from timer interrupt context with scheduler lock,
   which limits it's usefulness (causes easily jitter in interrupt response).

diff --git a/inc/picoos.h b/inc/picoos.h
@@ -22,7 +22,7 @@
  * <ul><li> @ref intro <ul>
  *   <li> @ref layer    </li><li> @ref port      </li>
  *   <li> @ref debug    </li><li> @ref make      </li>
- *   <li> @ref cmake      </li></ul></li></ul>
+ *   <li> @ref cmake    </li></ul></li></ul>
  * <ul><li><b>Configuration</b><ul>
  *   <li><b>Pico Layer</b><ul>
  *     <li> @ref arch     </li><li> @ref codestyle </li>
@@ -164,7 +164,7 @@
  * @section license License
  *
  *  Copyright (c) 2004-2012, Dennis Kuschel. @n
- *  Copyright (c) 2011-2016, Ari Suutari. @n
+ *  Copyright (c) 2011-2019, Ari Suutari. @n
  *  All rights reserved. @n
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -194,11 +194,7 @@
  *
  * @n@n
  * @section cont Contact Information
- * Dennis Kuschel @n
- * Kurt-Georg-Kiesinger-Allee 14 @n
- * 28279 Bremen @n
- * GERMANY @n
- *
+ * Dennis Kuschel (original author) @n
  * mail: dennis_k@freenet.de @n
  * web:  http://picoos.sourceforge.net @n
  *
@@ -247,7 +243,7 @@
  * is disabled by default to lower the memory usage for small devices.
  * There are two ways to enable the nano layer: First, if you run your
  * makefile, you can add the parameter @c NANO=1 to the make command line.
- * Second, you can set this parameter in your application makefile. @n
+ * Second, you can set this parameter in your application makefile or CMakeLists.txt. @n
  * If the parameter @c NANO is set to 1, the makesystem will automatically
  * compile and link the nano layer source files. Also the global define
  * @c POSCFG_ENABLE_NANO is set, so you can test from within your sources
@@ -262,10 +258,10 @@
 #define _PICOOS_H
 
 
-#define POS_VER_N           0x0112
-#define POS_VER_S           "1.1.2"
+#define POS_VER_N           0x0120
+#define POS_VER_S           "1.2.0"
 #define POS_COPYRIGHT       "(c) 2004-2012, Dennis Kuschel\n" \
-                            "(c) 2011-2017, Ari Suutari"
+                            "(c) 2011-2019, Ari Suutari"
 
 #define POS_STARTUPSTRING   "pico]OS " POS_VER_S "\n" POS_COPYRIGHT