Remove deprecated fields in config.yaml

src/picknik_ur_base_config/config/config.yaml

@@ -7,12 +7,6 @@
 # Baseline hardware configuration parameters for MoveIt Pro.
 # [Required]
 hardware:
-  # Used by the ur_description package to set kinematics and geometry for a specific robot type.
-  # You can change this to another UR model but you must update any configuration affected by the different arm size.
-  # UR models in the ur_description package are ur3, ur3e, ur5, ur5e, ur10, ur10e, and ur16e.
-  # [Required]
-  type: ur5e
-
   # Set simulated to false if you are using this as a configuration for real hardware.
   # This allows users to switch between mock and real hardware by changing a single parameter with config inheritance.
   # [Required]
@@ -27,18 +21,11 @@ hardware:
   # [Optional, default=True]
   launch_robot_state_publisher: True
 
-  # The robot's IP address.
-  # [Required]
-  ip: "0.0.0.0"
-
   # Specify additional launch files for running the robot with real hardware.
   # [Optional, defaults to a blank launch file if not specified]
   robot_driver_persist_launch_file:
     package: "picknik_ur_base_config"
     path: "launch/robot_drivers_to_persist.launch.py"
-  hardware_launch_file:
-    package: "moveit_studio_agent"
-    path: "launch/blank.launch.py"
 
   # Specify any additional launch files for running the robot in simulation mode.
   # Used when hardware.simulated is True.
@@ -64,7 +51,7 @@ hardware:
     # Many of these are specific to the UR descriptions packages, and can be customized as needed.
     # [Optional]
     urdf_params:
-      - name: ur5e
+      - name: "ur5e"
       - prefix: ""
       - use_fake_hardware: "true"
       - use_pinch_links: "true"
@@ -97,13 +84,6 @@ ros_global_params:
   # [Optional, default=False]
   use_sim_time: False
 
-# Configure additional, optional features in MoveIt Pro.
-# [Optional]
-optional_feature_params:
-  # Whether or not to use the Formant bridge for over-the-internet comms.
-  # [Optional, default=False]
-  use_formant_bridge: False
-
 # Configuration files for MoveIt.
 # For more information, refer to https://moveit.picknik.ai/main/doc/how_to_guides/moveit_configuration/moveit_configuration_tutorial.html
 # [Required]
@@ -154,13 +134,6 @@ moveit_params:
     allowed_goal_duration_margin: 5.0
     allowed_start_tolerance: 0.01
 
-# Additional configurable parameters for the MoveIt Pro user interface.
-# [Required]
-ui_params:
-  # By default, we use a frame named "grasp_link" for tool grasp pose rendering and planning.
-  # [Required]
-  servo_endpoint_frame_id: "grasp_link"
-
 # Configuration for launching ros2_control processes.
 # [Required, if using ros2_control]
 ros2_control:
@@ -191,12 +164,6 @@ ros2_control:
   # [Optional, default=[]]
   controller_shared_topics: []
 
-# Octomap manager configuration parameters
-octomap_manager:
-  # Input point cloud topic name. The *output* point cloud topic published by
-  # the Octomap manager node is defined in sensors_3d.yaml.
-  input_point_cloud_topic: "/wrist_mounted_camera/depth/color/points"
-
 # Configuration for loading behaviors and objectives.
 # [Required]
 objectives:

src/picknik_ur_gazebo_config/config/config.yaml

@@ -6,21 +6,16 @@
 based_on_package: "picknik_ur_site_config"
 
 # Optional parameters that can be read in your launch files for specific functionality
-optional_feature_params:
-  gazebo_world_name: "space_station_blocks_world.sdf"
-  gazebo_gui: False
-  gazebo_verbose: True
+# optional_feature_params:
+#   gazebo_world_name: "space_station_blocks_world.sdf"
+#   gazebo_gui: False
+#   gazebo_verbose: True
 
 # Enable simulation time so nodes are synced with the Gazebo block.
 ros_global_params:
   use_sim_time: True
 
 hardware:
-  # Used by the ur_description package to set kinematics and geometry for a specific robot type.
-  # You can change this to another UR model but you must update any configuration affected by the different arm size
-  # UR models in the ur_description package are ur3, ur3e, ur5, ur5e, ur10, ur10e, and ur16e.
-  type: "ur5e"
-
   # This is the only option for this site_config
   simulated: True
 
@@ -31,9 +26,6 @@ hardware:
   # This should be false if you are launching the robot state publisher as part of drivers.
   launch_robot_state_publisher: True
 
-  # The robot's IP address
-  ip: "0.0.0.0"
-
   # The following launch file is started when hardware.simulated is True
   simulated_hardware_launch_file:
     package: "picknik_ur_gazebo_config"
@@ -73,11 +65,6 @@ moveit_params:
     package: "picknik_ur_gazebo_config"
     path: "config/moveit/ur_servo.yaml"
 
-octomap_manager:
-  # Input point cloud topic name. The *output* point cloud topic published by
-  # the Octomap manager node is defined in sensors_3d.yaml.
-  input_point_cloud_topic: "/wrist_mounted_camera/depth/color/points"
-
 # This configures what controllers gets run at startup
 ros2_control:
   controllers_active_at_startup:

src/picknik_ur_mock_hw_config/config/config.yaml

@@ -1,9 +1,6 @@
 based_on_package: "picknik_ur_base_config"
 
 hardware:
-
-  # Be sure to set your robot's IP address.
-  ip: "0.0.0.0"
   simulated: True
 
   # Update robot description for machine tending world.

src/picknik_ur_site_config/config/config.yaml

@@ -1,10 +1,5 @@
 based_on_package: "picknik_ur_base_config"
 
-hardware:
-
-  # Be sure to set your robot's IP address.
-  ip: "0.0.0.0"
-
 objectives:
   behavior_loader_plugins: {}
   objective_library_paths: