diff --git a/config/adc_common/adc_control_config.yaml b/config/adc_common/adc_control_config.yaml index cc0a54c53d5b0eb7b75aab3f536c9004f9bf3d45..2538247f2eb068089b4c2c9293b0eebd8fc8069c 100644 --- a/config/adc_common/adc_control_config.yaml +++ b/config/adc_common/adc_control_config.yaml @@ -5,7 +5,7 @@ speed_Kd: 0.00 speed_i_max: 20.0 speed_deadband: 0.1 watchdog_time: 0.5 -axel_distance: 0.3662 +axel_distance: 0.36 max_steer_angle: 0.5 min_steer_angle: -0.5 max_speed_control: 20.0 diff --git a/config/adc_common/adc_odometry_config.yaml b/config/adc_common/adc_odometry_config.yaml index 4a4f9a72b57244ecc495a8ed3c5b894fa8aeba2b..0bab7ea50968c298516f9e88da73d938089c060f 100644 --- a/config/adc_common/adc_odometry_config.yaml +++ b/config/adc_common/adc_odometry_config.yaml @@ -3,8 +3,8 @@ odom_frame: "adc_car/odom" robot_frame: "adc_car/base_footprint" encoder_ticks: 30 wheel_diameter: 0.100 -wheel_distance: 0.261 -axel_distance: 0.3662 +wheel_distance: 0.265 +axel_distance: 0.36 filter_coeff: 0.3 speed_deadband: 0.1 max_steer_angle: 0.5 diff --git a/config/adc_rosnav/local_planner/ackermann_params.yaml b/config/adc_rosnav/local_planner/ackermann_params.yaml index 006cc8420147e3635f1ac32fb10921b428ad8ec2..0286e32dd749cc56f9029b7a7be71294e795b73b 100644 --- a/config/adc_rosnav/local_planner/ackermann_params.yaml +++ b/config/adc_rosnav/local_planner/ackermann_params.yaml @@ -38,8 +38,8 @@ AckermannPlannerROS: max_steer_vel: 0.3 min_steer_vel: -0.3 max_steer_acc: 1.0 - axis_distance: 0.3662 - wheel_distance: 0.216 + axis_distance: 0.36 + wheel_distance: 0.265 wheel_radius: 0.05 split_ignore_length: 0.1 diff --git a/config/adc_sim/adc_controller_config.yaml b/config/adc_sim/adc_controller_config.yaml index 1469ace0b0d37c18be5c2c467ed63db7cfdb63f7..dc8a5b17eebb429f463f34d9d253cd8c90e42de8 100644 --- a/config/adc_sim/adc_controller_config.yaml +++ b/config/adc_sim/adc_controller_config.yaml @@ -12,8 +12,8 @@ drive_rear_right_joint: base_link_2_rear_right_wheel_joint drive_front_left_joint: steer_left_2_front_left_wheel_joint drive_front_right_joint: steer_right_2_front_right_wheel_joint - axel_distance: 0.3662 - wheel_distance: 0.216 + axel_distance: 0.36 + wheel_distance: 0.265 wheel_diameter: 0.100 encoder_ticks: 30 encoder_rate: 40 diff --git a/config/adc_sim/basler_camera_sim_config.yaml b/config/adc_sim/basler_camera_sim_config.yaml index 2fbe6d5fc1db8b3a404dd50f94abcf1cac8cb416..78ac782b675d9cd71c4298ba778f2985f4ef65f7 100644 --- a/config/adc_sim/basler_camera_sim_config.yaml +++ b/config/adc_sim/basler_camera_sim_config.yaml @@ -2,7 +2,7 @@ horizontal_fov: 2.25 width: 1280 height: 960 format: 'R8G8B8' -clip_near: 0.1 +clip_near: 0.001 clip_far: 100 noise_type: 'gaussian' noise_mean: 0.0 diff --git a/launch/adc_sim.launch b/launch/adc_sim.launch index 7092be1d0358d84bb747ff343c707a04d8a9db6d..123dc326dd7ebe311ad12093af9f4debbd27a2c5 100644 --- a/launch/adc_sim.launch +++ b/launch/adc_sim.launch @@ -11,6 +11,11 @@ <arg name="car_y" default="0.0"/> <arg name="car_yaw" default="0.0"/> + <arg name="bodywork" default="Fasle"/> + <arg name="model" default="$(find iri_model_car_description)/urdf/car.xacro" unless="$(arg bodywork)"/> + <arg name="model" default="$(find iri_adc_description)/urdf/adc_car.xacro" if="$(arg bodywork)"/> + + <include file="$(find iri_model_car_gazebo)/launch/sim.launch"> <arg name="name" value="adc_car"/> <arg name="output" value="$(arg output)"/> @@ -21,6 +26,7 @@ <arg name="car_y" value="$(arg car_y)"/> <arg name="car_yaw" value="$(arg car_yaw)"/> <arg name="sim_config_path" value="$(find iri_adc_launch)/config/adc_sim"/> + <arg name="model" value="$(arg model)"/> <arg name="car_controller_config_file" value="$(find iri_adc_launch)/config/adc_sim/adc_controller_config.yaml"/> <arg name="control_config_file" value="$(find iri_adc_launch)/config/adc_common/adc_control_config.yaml"/> <arg name="odometry_config_file" value="$(find iri_adc_launch)/config/adc_common/adc_odometry_config.yaml"/> diff --git a/launch/adc_sim_env.launch b/launch/adc_sim_env.launch index 578ddde76cbbb5a8dab338aa04ae7184953c5b9b..6e5d6bad52de2ecf6db50ff9af4e3c655e624888 100644 --- a/launch/adc_sim_env.launch +++ b/launch/adc_sim_env.launch @@ -17,6 +17,10 @@ <arg name="road_y" default="0.0"/> <arg name="road_yaw" default="0.0"/> + <arg name="bodywork" default="Fasle"/> + <arg name="model" default="$(find iri_model_car_description)/urdf/car.xacro" unless="$(arg bodywork)"/> + <arg name="model" default="$(find iri_adc_description)/urdf/adc_car.xacro" if="$(arg bodywork)"/> + <include file="$(find iri_model_car_gazebo)/launch/sim.launch"> <arg name="name" value="adc_car"/> <arg name="output" value="$(arg output)"/> @@ -27,6 +31,7 @@ <arg name="car_y" value="$(arg car_y)"/> <arg name="car_yaw" value="$(arg car_yaw)"/> <arg name="sim_config_path" value="$(find iri_adc_launch)/config/adc_sim"/> + <arg name="model" value="$(arg model)"/> <arg name="car_controller_config_file" value="$(find iri_adc_launch)/config/adc_sim/adc_controller_config.yaml"/> <arg name="control_config_file" value="$(find iri_adc_launch)/config/adc_common/adc_control_config.yaml"/> <arg name="odometry_config_file" value="$(find iri_adc_launch)/config/adc_common/adc_odometry_config.yaml"/>