chore: consolidate kinova content out of example_ws#620
Draft
nbbrooks wants to merge 1 commit into
Draft
Conversation
Issue PickNikRobotics/moveit_pro#18874 consolidates the Kinova/Kortex configurations into a dedicated workspace at https://github.com/PickNikRobotics/moveit_pro_kinova_ws. The Kinova hardware-side configs and the kinova_sim boilerplate move out of this example workspace. The two satellite demo configs are world/example content (not Kinova boilerplate) and stay here, but they no longer inherit from the now-deleted kinova_sim. Removed ------- * src/moveit_pro_kinova_configs/kinova_gen3_base_config * src/moveit_pro_kinova_configs/kinova_gen3_site_config * src/moveit_pro_kinova_configs/kinova_sim * src/moveit_pro_kinova_configs/moveit_studio_kinova_pstop_manager * The moveit_pro_kinova_configs/ metapackage directory (empty after the moves below) * ros2_kortex_vision submodule (only ever used by the kinova_vision wrist-camera driver, which lived with the hardware configs) ros2_kortex stays — space_satellite_sim still pulls kortex_description for the arm URDF. Moved ----- The satellite demo packages move out of the now-empty kinova_configs metapackage to top-level src/, matching how the other example worlds (lab_sim, factory_sim, hangar_sim, ...) are laid out: * src/moveit_pro_kinova_configs/space_satellite_sim -> src/space_satellite_sim * src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal -> src/space_satellite_sim_camera_cal Flattened --------- space_satellite_sim previously had `based_on_package: kinova_sim`, so it inherited the URDF/SRDF launch, MoveIt configuration, ros2_control config, ros_global_params, and various YAMLs from kinova_sim. With kinova_sim deleted there is nothing to inherit from, and per project guidance the satellite demos shouldn't inherit from the Kinova boilerplate anyway (an example of how someone modifies the boilerplate, not a config that inherits from it). * Dropped `based_on_package: kinova_sim` from space_satellite_sim's config.yaml; inlined the hardware, ros_global_params, moveit_params, and ros2_control sections it had been inheriting. All package paths rewritten from "kinova_sim" -> "space_satellite_sim". * Copied the previously-referenced helper YAMLs from kinova_sim into space_satellite_sim/config/{moveit,control}/ so they ship with the demo: pose_ik_distance.yaml sensors_3d.yaml joint_limits.yaml pose_jog.yaml joint_jog.yaml picknik_kinova_gen3.ros2_control.yaml Pre-existing copies in space_satellite_sim (e.g. its own space_satellite_sim.srdf) were preserved. * Dropped the now-unused `robot_driver_persist_launch_file` field (kinova_sim's value pointed at a launch file that didn't exist in kinova_sim/launch/ anyway, so dropping it doesn't change runtime behavior). MoveIt Pro defaults to a blank launch when not specified. * space_satellite_sim/package.xml drops the kinova_sim and moveit_studio_kinova_pstop_manager exec_depends. The remaining deps (kortex_description, picknik_mujoco_ros, picknik_accessories, realsense2_description, robotiq_description, apriltag_ros, joint_trajectory_admittance_controller, velocity_force_controller) are what the demo's URDF and Objectives actually consume. space_satellite_sim_camera_cal still uses `based_on_package: space_satellite_sim`. That is intra-example inheritance (the calibration variant of the same demo), which the doc explicitly recommends for "small variations" — keeping it. README ------ Top-level README's robot-config list drops the moveit_pro_kinova_configs/* entries and adds the satellite configs at top level.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue PickNikRobotics/moveit_pro#18874 consolidates the Kinova/Kortex configurations into a dedicated workspace at
https://github.com/PickNikRobotics/moveit_pro_kinova_ws. The Kinova hardware-side configs and the kinova_sim boilerplate move out of this example workspace. The two satellite demo configs are world/example content (not Kinova boilerplate) and stay here, but they no longer inherit from the now-deleted kinova_sim.
Removed
ros2_kortex stays — space_satellite_sim still pulls kortex_description for the arm URDF.
Moved
The satellite demo packages move out of the now-empty kinova_configs metapackage to top-level src/, matching how the other example worlds (lab_sim, factory_sim, hangar_sim, ...) are laid out:
Flattened
space_satellite_sim previously had
based_on_package: kinova_sim, so it inherited the URDF/SRDF launch, MoveIt configuration, ros2_control config, ros_global_params, and various YAMLs from kinova_sim. With kinova_sim deleted there is nothing to inherit from, and per project guidance the satellite demos shouldn't inherit from the Kinova boilerplate anyway (an example of how someone modifies the boilerplate, not a config that inherits from it).based_on_package: kinova_simfrom space_satellite_sim's config.yaml; inlined the hardware, ros_global_params, moveit_params, and ros2_control sections it had been inheriting. All package paths rewritten from "kinova_sim" -> "space_satellite_sim".robot_driver_persist_launch_filefield (kinova_sim's value pointed at a launch file that didn't exist in kinova_sim/launch/ anyway, so dropping it doesn't change runtime behavior). MoveIt Pro defaults to a blank launch when not specified.space_satellite_sim_camera_cal still uses
based_on_package: space_satellite_sim. That is intra-example inheritance (the calibration variant of the same demo), which the doc explicitly recommends for "small variations" — keeping it.README
Top-level README's robot-config list drops the moveit_pro_kinova_configs/* entries and adds the satellite configs at top level.