Merge pull request #49 from jhu-dvrk/rc-2.2.1

2.2.1
jhu-dvrk · Dec 29, 2023 · 9923a96 · 9923a96
2 parents e60ad6d + 07e5f15
commit 9923a96
Show file tree

Hide file tree

Showing 22 changed files with 198 additions and 313 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 Change log
 ==========
 
+2.2.1 (2023-12-29)
+==================
+
+* API changes:
+  * Add `deinterlace` for gscam launch for DeckLink cards
+* Deprecated features:
+  * None
+* New features:
+  * Added `-s` to publish raw voltages for SUJs
+* Bug fixes:
+  * None
+
 2.2.0 (2023-11-21)
 ==================
 

diff --git a/dvrk-2.1.vcs b/dvrk-2.1.vcs
diff --git a/dvrk-2.2.vcs b/dvrk-2.2.vcs
diff --git a/dvrk-devel.vcs b/dvrk-devel.vcs
diff --git a/dvrk_arms_from_ros/components/CMakeLists.txt b/dvrk_arms_from_ros/components/CMakeLists.txt
@@ -9,14 +9,13 @@
 #
 # --- end cisst license ---
 
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.10)
+project (dvrk_arms_from_ros VERSION 2.2.1)
 
 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
-project (dvrk_arms_from_ros VERSION 2.2.0)
-
 ## find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages

diff --git a/dvrk_arms_from_ros/components/package.xml b/dvrk_arms_from_ros/components/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>dvrk_arms_from_ros</name>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
   <description>
   sawIntuitiveResearchKit compatible arm from ROS topics
   </description>

diff --git a/dvrk_arms_from_ros/components/src/dvrk_arm_from_ros.cpp b/dvrk_arms_from_ros/components/src/dvrk_arm_from_ros.cpp
@@ -5,7 +5,7 @@
   Author(s):  Anton Deguet
   Created on: 2020-01-13
 
-  (C) Copyright 2020-2022 Johns Hopkins University (JHU), All Rights Reserved.
+  (C) Copyright 2020-2023 Johns Hopkins University (JHU), All Rights Reserved.
 
 --- begin cisst license - do not edit ---
 
@@ -48,12 +48,12 @@ void dvrk_arm_from_ros::Init(void)
     populate_interface_provided(interface_provided,
                                 ros_namespace,
                                 // void commands
-                                Commands({"hold"}),
+                                Commands({"hold", "free"}),
                                 // write commands
-                                Commands({"state_command", "servo_cp"}),
+                                Commands({"state_command", "servo_cp", "servo_js"}),
                                 // read commands
                                 Commands({"operating_state", "period_statistics",
-                                          "setpoint_js", "measured_js", "setpoint_cp"}),
+                                          "setpoint_js", "measured_js", "setpoint_cp", "measured_cp"}),
                                 // write events
                                 Commands({"operating_state", "error", "warning", "status"}));
 }

diff --git a/dvrk_hrsv_widget/CMakeLists.txt b/dvrk_hrsv_widget/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required (VERSION 3.1)
-project (dvrk_hrsv_widget VERSION 2.2.0)
+cmake_minimum_required (VERSION 3.10)
+project (dvrk_hrsv_widget VERSION 2.2.1)
 
 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/dvrk_hrsv_widget/package.xml b/dvrk_hrsv_widget/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>dvrk_hrsv_widget</name>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
   <description>dVRK HRSV widget</description>
 
   <maintainer email="anton.deguet@jhu.edu">Anton Deguet</maintainer>

diff --git a/dvrk_model/CMakeLists.txt b/dvrk_model/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.1)
-project(dvrk_model VERSION 2.1.0)
+cmake_minimum_required(VERSION 3.10)
+project(dvrk_model VERSION 2.2.1)
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)

diff --git a/dvrk_model/package.xml b/dvrk_model/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>dvrk_model</name>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
   <description>The dvrk_model package</description>
 
   <maintainer email="anton.deguet@jhu.edu">Anton Deguet</maintainer>

diff --git a/dvrk_python/CMakeLists.txt b/dvrk_python/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required (VERSION 3.1)
-project (dvrk_python VERSION 2.2.0)
+cmake_minimum_required (VERSION 3.10)
+project (dvrk_python VERSION 2.2.1)
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)

diff --git a/dvrk_python/package.xml b/dvrk_python/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>dvrk_python</name>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
   <description>The dVRK Python package</description>
 
   <maintainer email="anton.deguet@jhu.edu">Anton Deguet</maintainer>

diff --git a/dvrk_robot/CMakeLists.txt b/dvrk_robot/CMakeLists.txt
@@ -9,8 +9,8 @@
 #
 # --- end cisst license ---
 
-cmake_minimum_required (VERSION 3.1)
-project (dvrk_robot VERSION 2.2.0)
+cmake_minimum_required (VERSION 3.10)
+project (dvrk_robot VERSION 2.2.1)
 
 set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/dvrk_robot/include/dvrk_utilities/dvrk_console.h b/dvrk_robot/include/dvrk_utilities/dvrk_console.h
@@ -74,6 +74,7 @@ namespace dvrk {
         // buttons on PSM
         void add_topics_psm_io(const std::string & _arm_name,
                                const std::string & _io_component_name);
+        void add_topics_suj_voltages(void);
         void add_topics_teleop_ecm(const std::string & _name);
         void add_topics_teleop_psm(const std::string & _name);
 

diff --git a/dvrk_robot/package.xml b/dvrk_robot/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>dvrk_robot</name>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
   <description>The dvrk_robot package</description>
 
   <maintainer email="anton.deguet@jhu.edu">Anton Deguet</maintainer>