Updated CHANGELOG and CMake for release 1.3.0

jhu-saw · Jan 9, 2016 · 19ac435 · 19ac435
1 parent 643318a
commit 19ac435
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,21 @@
 Change log
 ==========
 
+1.3.0 (2016-01-08)
+==================
+
+* API changes:
+  * None
+* Deprecated features:
+  * None
+* New features:
+  * PID: added SetSimulated mode
+  * PID: added methods to enable/disable some joints (used to change actuator coupling on the fly)
+  * PID: added joint type in XML configuration, used to be pulled from IO, now needed for simulation
+  * PID Qt widget: plot/display desired effort
+* Bug fixes:
+  * PID: forward error as status when PID is disabled
+
 1.2.0 (2015-10-18)
 ==================
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,5 @@
 #
-#
-# (C) Copyright 2012 Johns Hopkins University (JHU), All Rights
-# Reserved.
+# (C) Copyright 2012-2016 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -11,8 +9,7 @@
 #
 # --- end cisst license ---
 
-project( sawControllers )
-
-add_subdirectory( code )
-add_subdirectory( examples )
+project (sawControllers)
 
+add_subdirectory (code)
+add_subdirectory (examples)
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2011-2015 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2011-2016 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -19,7 +19,7 @@ set (REQUIRED_CISST_LIBRARIES
      cisstRobot
      cisstNumerical)
 
-find_package (cisst REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.0.6 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND)
 
@@ -43,7 +43,7 @@ if (cisst_FOUND)
 
   # Set the version number
   set (sawControllers_VERSION_MAJOR "1")
-  set (sawControllers_VERSION_MINOR "2")
+  set (sawControllers_VERSION_MINOR "3")
   set (sawControllers_VERSION_PATCH "0")
   set (sawControllers_VERSION "${sawControllers_VERSION_MAJOR}.${sawControllers_VERSION_MINOR}.${sawControllers_VERSION_PATCH}")
 

diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_controllers</name>
-  <version>1.2.0</version>
+  <version>1.3.0</version>
   <description>
   sawControllers
   </description>