diff --git a/config/rm_controllers/sentry.yaml b/config/rm_controllers/sentry.yaml index 5111304e..fa0a7257 100644 --- a/config/rm_controllers/sentry.yaml +++ b/config/rm_controllers/sentry.yaml @@ -182,4 +182,4 @@ controllers: barrel_controller: type: effort_controllers/JointPositionController joint: "barrel_joint" - pid: { p: 30.0, i: 15.0, d: 0.3, i_clamp_max: 0.03, i_clamp_min: -0.03, antiwindup: true, publish_state: false } + pid: { p: 30.0, i: 15.0, d: 0.3, i_clamp_max: 0.03, i_clamp_min: -0.03, antiwindup: true, publish_state: false } \ No newline at end of file diff --git a/config/rm_ecat_hw/device_configurations/dart.yaml b/config/rm_ecat_hw/device_configurations/dart.yaml index 92daae67..772ff063 100644 --- a/config/rm_ecat_hw/device_configurations/dart.yaml +++ b/config/rm_ecat_hw/device_configurations/dart.yaml @@ -37,4 +37,4 @@ gpios: mode: 0 - name: "calibration_right" pin: 0 - mode: 0 + mode: 0 \ No newline at end of file diff --git a/config/rm_referee/dart.yaml b/config/rm_referee/dart.yaml index ef677847..740436b4 100644 --- a/config/rm_referee/dart.yaml +++ b/config/rm_referee/dart.yaml @@ -7,4 +7,4 @@ rm_referee: trigger_change: time_change: fixed: - flash: + flash: \ No newline at end of file diff --git a/config/vision/camera.yaml b/config/vision/camera.yaml index 9faeb368..4327354d 100644 --- a/config/vision/camera.yaml +++ b/config/vision/camera.yaml @@ -1,4 +1,4 @@ -camera: +hk_camera: image_width: 1440 image_height: 1080 pixel_format: bgr8 @@ -8,8 +8,10 @@ camera: camera_sn: 00J90631052 frame_rate: 1000 exposure_auto: false - exposure_value: 1500 + exposure_value: 1000 exposure_value_windmill: 3000 gamma_selector: 2 gamma_value: 0.5 - enable_imu_trigger: true + enable_imu_trigger: false + is_fps_down: false + target_fps: 40.0 diff --git a/config/vision/camera_left.yaml b/config/vision/camera_left.yaml new file mode 100644 index 00000000..82a9d0ca --- /dev/null +++ b/config/vision/camera_left.yaml @@ -0,0 +1,17 @@ +hk_camera_left: +# 1280×1024 640×512 + image_width: 1280 + image_height: 1024 + pixel_format: bgr8 + camera_info_url: 'file:///home/hiling/.ros/camera_info/DA8835803_left.yaml' + camera_name: hk_camera_left + camera_frame_id: camera_optical_frame_left + frame_id: camera_optical_frame_left + camera_sn: DA8835805 + frame_rate: 15 + exposure_auto: false + exposure_value: 1000 + gamma_selector: 2 + gamma_value: 0.5 + enable_imu_trigger: true + sleep_time: 2 \ No newline at end of file diff --git a/config/vision/camera_right.yaml b/config/vision/camera_right.yaml new file mode 100644 index 00000000..c5cfb23b --- /dev/null +++ b/config/vision/camera_right.yaml @@ -0,0 +1,17 @@ +hk_camera_right: +# 1280×1024 640×512 + image_width: 1280 + image_height: 1024 + pixel_format: bgr8 + camera_info_url: 'file:///home/hiling/.ros/camera_info/test_cam_right.yaml' + camera_name: hk_camera_right + camera_frame_id: camera_optical_frame_right + frame_id: camera_optical_frame_right + camera_sn: DA8835803 + frame_rate: 15 + exposure_auto: false + exposure_value: 1000 + gamma_selector: 2 + gamma_value: 0.5 + enable_imu_trigger: true + sleep_time: 1 \ No newline at end of file diff --git a/config/vision/sentry.yaml b/config/vision/sentry.yaml deleted file mode 100644 index 537dd0cc..00000000 --- a/config/vision/sentry.yaml +++ /dev/null @@ -1,22 +0,0 @@ -lower_camera: - image_width: 1280 - image_height: 1024 - pixel_format: bgr8 - camera_info_url: '' - camera_name: lower_camera - imu_name: lower_gimbal_imu - camera_frame_id: lower_camera_optical_frame - camera_sn: KE0220040170 - enable_imu_trigger: false - raising_filter_value: 0 -#upper_camera: -# image_width: 1280 -# image_height: 1024 -# pixel_format: bgr8 -# camera_info_url: '' -# camera_name: upper_camera -# imu_name: upper_gimbal_imu -# camera_frame_id: upper_camera_optical_frame -# camera_sn: KE0220030076 -# enable_imu_trigger: false -# raising_filter_value: 0 diff --git a/launch/vision/camera.launch b/launch/vision/camera.launch index b42ca5f2..44bc83af 100644 --- a/launch/vision/camera.launch +++ b/launch/vision/camera.launch @@ -1,25 +1,22 @@ - - - - - + + + + + + + - - - - - - - + - - - + + - + \ No newline at end of file diff --git a/launch/vision/sentry_camera.launch b/launch/vision/sentry_camera.launch deleted file mode 100644 index 59ec4731..00000000 --- a/launch/vision/sentry_camera.launch +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/launch/vision/sentry_vision_loader.launch b/launch/vision/sentry_vision_loader.launch deleted file mode 100644 index 0182bbb5..00000000 --- a/launch/vision/sentry_vision_loader.launch +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/launch/vision/vision_loader.launch b/launch/vision/vision_loader.launch deleted file mode 100644 index d02b74b8..00000000 --- a/launch/vision/vision_loader.launch +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/launch/vision/vision_main_node.launch b/launch/vision/vision_main_node.launch new file mode 100644 index 00000000..4012de63 --- /dev/null +++ b/launch/vision/vision_main_node.launch @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +