Fix version change rebase issue, PR comments

PickNikRobotics · Mar 18, 2024 · 6b1ed88 · 6b1ed88
1 parent fa9c56b
commit 6b1ed88
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 14 deletions.
diff --git a/src/moveit_studio_ur_pstop_manager/package.xml b/src/moveit_studio_ur_pstop_manager/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>moveit_studio_ur_pstop_manager</name>
-  <version>4.0.2</version>
+  <version>4.0.1</version>
   <description>Provides a node to monitor the protective stop state of the UR5, and reset protective
     stops when necessary.</description>
   <maintainer email="[email protected]">MoveIt Pro Maintainer</maintainer>

diff --git a/src/picknik_ur_base_config/package.xml b/src/picknik_ur_base_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_base_config</name>
-  <version>4.0.2</version>
+  <version>4.0.1</version>
 
   <description>Base configuration package for Picknik's UR robot arms</description>
 

diff --git a/src/picknik_ur_gazebo_config/package.xml b/src/picknik_ur_gazebo_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_gazebo_config</name>
-  <version>4.0.2</version>
+  <version>4.0.1</version>
 
   <description>Site configuration package for the UR5e in PickNik's space station world simulated by Gazebo.</description>
 

diff --git a/src/picknik_ur_gazebo_scan_and_plan_config/package.xml b/src/picknik_ur_gazebo_scan_and_plan_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_gazebo_scan_and_plan_config</name>
-  <version>4.0.2</version>
+  <version>4.0.1</version>
 
   <description>Site configuration package for the UR5e simulated in Gazebo to show "scan and plan" applications.</description>
 

diff --git a/src/picknik_ur_mock_hw_config/package.xml b/src/picknik_ur_mock_hw_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_mock_hw_config</name>
-  <version>4.0.2</version>
+  <version>4.0.1</version>
 
   <description>Configuration package for a UR arm that can be simulated with mock hardware</description>
 

diff --git a/src/picknik_ur_site_config/objectives/detect_door_graspable_object.xml b/src/picknik_ur_site_config/objectives/detect_door_graspable_object.xml
@@ -28,10 +28,6 @@
           <Action ID="AlwaysFailure"/>
         </Decorator>
       </Decorator>
-      <Decorator ID="ForceSuccess">
-        <Action ID="LogMessage" message="Found a GraspableObject for the door." log_level="info"/>
-        <!--<Action ID="ModifyObjectInPlanningScene" object="{door_object}" apply_planning_scene_service="/apply_planning_scene"/>-->
-      </Decorator>
     </Control>
   </BehaviorTree>
 </root>
diff --git a/src/picknik_ur_site_config/objectives/detect_fixed_handle_graspable_object.xml b/src/picknik_ur_site_config/objectives/detect_fixed_handle_graspable_object.xml
@@ -29,7 +29,7 @@
       </Decorator>
       <Action ID="ExtractGraspableObjectPose" graspable_object="{handle_object}" pose="{grasp_pose}"/>
       <Action ID="LogMessage" message="Successfully extracted necessary subframes for the detected pull handle." log_level="info"/>
-      <!--<Action ID="ModifyObjectInPlanningScene" object="{handle_object}" apply_planning_scene_service="/apply_planning_scene"/>-->
+      <Action ID="ModifyObjectInPlanningScene" object="{handle_object}" apply_planning_scene_service="/apply_planning_scene"/>
     </Control>
   </BehaviorTree>
 </root>
diff --git a/src/picknik_ur_site_config/objectives/open_door_lever_handle_ml.xml b/src/picknik_ur_site_config/objectives/open_door_lever_handle_ml.xml
@@ -4,9 +4,8 @@
   <BehaviorTree ID="Open Door Lever Handle ML" _description="Attempts to open a door with a lever handle using machine learning." _favorite="false" _hardcoded="true">
     <Control ID="Sequence" name="TopLevelSequence">
       <!-- Load the parameters needed for this Objective -->
-      <!-- Update the admittance controller and reset the FTS -->
-      <!-- Look at the desired location where objects (door) will be present -->
       <Action ID="LoadObjectiveParameters" config_file_name="open_door_lever_handle_MTC_config.yaml" parameters="{parameters}"/>
+      <!-- Update the admittance controller and reset the FTS -->
       <SubTree ID="Re-Zero Force-Torque Sensors" _collapsed="true"/>
       <SubTree ID="Update Admittance Controller" _collapsed="true"/>
       <!-- Look at the desired location where objects (door) will be present -->

diff --git a/src/picknik_ur_site_config/package.xml b/src/picknik_ur_site_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_site_config</name>
-  <version>4.0.2</version>
+  <version>4.0.1</version>
 
   <description>Site configuration package for a UR arm that can be simulated with mock hardware</description>
 

diff --git a/src/picknik_ur_studio_integration_testing/package.xml b/src/picknik_ur_studio_integration_testing/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>picknik_ur_studio_integration_testing</name>
-  <version>4.0.2</version>
+  <version>4.0.1</version>
   <description>Integration tests for UR with MoveIt Pro.</description>
   <maintainer email="[email protected]">MoveIt Pro Maintainer</maintainer>