updated to release 1.7.0

jhu-dvrk · Apr 9, 2019 · fdfa444 · fdfa444
1 parent 0b5e00d
commit fdfa444
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,15 @@
 Change log
 ==========
 
-1.7.0 (2019-03-xx)
+1.7.0 (2019-04-09)
 ==================
 
 * API changes:
 
 * Deprecated features:
   * `kinematic` field in JSON console config file has been replaced by `arm` for MTMs to support gravity compensation (see New features)
 * New features:
-  * Added gravity compensation for the MTM.  Contribution from CUHK. Thank you! 
+  * Added gravity compensation for the MTM.  Contribution from CUHK. Thank you!
   * Support for multiple teleop components per MTM or PSM (ee issue #97)
     * Using the console, operator can use a "clutch" quick tap to toggle between PSMs.
     * Using ROS topics, programs can select which pairs to activate or de-activate.

diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
@@ -35,7 +35,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon
                               cisstQt)
 
 # find cisst and make sure the required libraries have been compiled
-find_package (cisst 1.0.10 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND_AS_REQUIRED)
 
@@ -49,10 +49,10 @@ if (cisst_FOUND_AS_REQUIRED)
   endif ()
 
   # saw components have been compiled within cisst, we should find them automatically
-  find_package (sawRobotIO1394          1.6.0 REQUIRED)
-  find_package (sawControllers          1.6.0 REQUIRED)
-  find_package (sawIntuitiveResearchKit 1.6.0 REQUIRED)
-  find_package (sawTextToSpeech REQUIRED)
+  find_package (sawRobotIO1394          1.7.0 REQUIRED)
+  find_package (sawControllers          1.7.0 REQUIRED)
+  find_package (sawIntuitiveResearchKit 1.7.0 REQUIRED)
+  find_package (sawTextToSpeech         1.2.0 REQUIRED)
 
   if (sawRobotIO1394_FOUND AND sawControllers_FOUND
       AND sawIntuitiveResearchKit_FOUND AND sawTextToSpeech_FOUND)

diff --git a/applications/package.xml b/applications/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_research_kit_applications</name>
-  <version>1.6.0</version>
+  <version>1.7.0</version>
   <description>
   sawIntuitiveResearchKit Application
   </description>

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
@@ -27,7 +27,7 @@ set (REQUIRED_CISST_LIBRARIES
      cisstRobot
      cisstNumerical)
 
-find_package (cisst 1.0.10 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND)
 
@@ -44,8 +44,8 @@ if (cisst_FOUND)
 
   # saw components have been compiled within cisst, we should find them automatically
   find_package (sawTextToSpeech         1.2.0 REQUIRED)
-  find_package (sawRobotIO1394          1.6.0 REQUIRED)
-  find_package (sawControllers          1.6.0 REQUIRED)
+  find_package (sawRobotIO1394          1.7.0 REQUIRED)
+  find_package (sawControllers          1.7.0 REQUIRED)
 
   if (sawRobotIO1394_FOUND AND sawControllers_FOUND)
 
@@ -77,7 +77,7 @@ if (cisst_FOUND)
 
     # Set the version number
     set (sawIntuitiveResearchKit_VERSION_MAJOR "1")
-    set (sawIntuitiveResearchKit_VERSION_MINOR "6")
+    set (sawIntuitiveResearchKit_VERSION_MINOR "7")
     set (sawIntuitiveResearchKit_VERSION_PATCH "0")
     set (sawIntuitiveResearchKit_VERSION "${sawIntuitiveResearchKit_VERSION_MAJOR}.${sawIntuitiveResearchKit_VERSION_MINOR}.${sawIntuitiveResearchKit_VERSION_PATCH}")
 

diff --git a/components/package.xml b/components/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_research_kit</name>
-  <version>1.6.0</version>
+  <version>1.7.0</version>
   <description>
   sawIntuitiveResearchKit
   </description>

diff --git a/examples/deprecated/CMakeLists.txt b/examples/deprecated/CMakeLists.txt
@@ -26,7 +26,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon
                               cisstQt)
 
 # find cisst and make sure the required libraries have been compiled
-find_package (cisst 1.0.10 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND_AS_REQUIRED)
 
@@ -40,10 +40,10 @@ if (cisst_FOUND_AS_REQUIRED)
   endif ()
 
   # saw components have been compiled within cisst, we should find them automatically
-  find_package (sawRobotIO1394          1.6.0 REQUIRED)
-  find_package (sawControllers          1.6.0 REQUIRED)
-  find_package (sawIntuitiveResearchKit 1.6.0 REQUIRED)
-  find_package (sawTextToSpeech REQUIRED)
+  find_package (sawRobotIO1394          1.7.0 REQUIRED)
+  find_package (sawControllers          1.7.0 REQUIRED)
+  find_package (sawIntuitiveResearchKit 1.7.0 REQUIRED)
+  find_package (sawTextToSpeech         1.2.0 REQUIRED)
 
   if (sawRobotIO1394_FOUND AND sawControllers_FOUND
       AND sawIntuitiveResearchKit_FOUND AND sawTextToSpeech_FOUND)

diff --git a/examples/deprecated/package.xml b/examples/deprecated/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_research_kit_examples_deprecated</name>
-  <version>1.6.0</version>
+  <version>1.7.0</version>
   <description>
   sawIntuitiveResearchKit Examples (deprecated)
   </description>

diff --git a/examples/derivedTeleOperationPSM/components/CMakeLists.txt b/examples/derivedTeleOperationPSM/components/CMakeLists.txt
@@ -37,7 +37,7 @@ if (cisst_FOUND)
 
   # sawIntuitiveResearchKit has been compiled within cisst, we should
   # find it automatically
-  find_package(sawIntuitiveResearchKit REQUIRED)
+  find_package(sawIntuitiveResearchKit 1.7.0 REQUIRED)
 
   if (sawIntuitiveResearchKit_FOUND)
 

diff --git a/examples/derivedTeleOperationPSM/components/package.xml b/examples/derivedTeleOperationPSM/components/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_research_kit_example_derived_teleop_psm</name>
-  <version>1.6.0</version>
+  <version>1.7.0</version>
   <description>
   sawIntuitiveResearchKit Example
   </description>

diff --git a/share/package.xml b/share/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>dvrk_config</name>
-  <version>1.6.0</version>
+  <version>1.7.0</version>
   <description>dVRK config files</description>
 
   <maintainer email="[email protected]">Anton Deguet</maintainer>