From f97d7fbf39b2a67ec45aa9d9a4c517f877393965 Mon Sep 17 00:00:00 2001
From: lovodllt <743648056@qq.com>
Date: Sat, 19 Apr 2025 21:17:34 +0800
Subject: [PATCH 1/3] Add some function for deep_aim.
---
launch/vision/camera.launch | 6 ++---
launch/vision/vision_loader.launch | 42 +++++++++++++++++++-----------
2 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/launch/vision/camera.launch b/launch/vision/camera.launch
index b42ca5f2..0d5b781d 100644
--- a/launch/vision/camera.launch
+++ b/launch/vision/camera.launch
@@ -1,10 +1,10 @@
-
-
+
+
-
+
diff --git a/launch/vision/vision_loader.launch b/launch/vision/vision_loader.launch
index d02b74b8..4caadc85 100644
--- a/launch/vision/vision_loader.launch
+++ b/launch/vision/vision_loader.launch
@@ -1,15 +1,27 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+ args="load rm_digtialimg_proc_deep/Processor vision_nodelet" respawn="true">
+
+
+
+
+
@@ -31,15 +43,15 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
From 11831ff2858a0622fc27ca97f63821bcc35e634e Mon Sep 17 00:00:00 2001
From: lovodllt <743648056@qq.com>
Date: Thu, 5 Jun 2025 20:24:14 +0800
Subject: [PATCH 2/3] Sync the commits from the master branch.
---
launch/vision/vision_loader.launch | 34 +++++++++++++++---------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/launch/vision/vision_loader.launch b/launch/vision/vision_loader.launch
index 4caadc85..b116371f 100644
--- a/launch/vision/vision_loader.launch
+++ b/launch/vision/vision_loader.launch
@@ -4,29 +4,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ args="load rm_digtialimg_proc/Processor vision_nodelet" respawn="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 4c44ccb12ae47e7e9693c480b0c48b2235a8a4ea Mon Sep 17 00:00:00 2001
From: lovod <743648056@qq.com>
Date: Mon, 6 Apr 2026 21:50:41 +0800
Subject: [PATCH 3/3] Adaptive new auto-aim.
---
config/rm_controllers/sentry.yaml | 2 +-
.../device_configurations/dart.yaml | 2 +-
config/rm_referee/dart.yaml | 2 +-
config/vision/camera.yaml | 8 +-
config/vision/camera_left.yaml | 17 ++++
config/vision/camera_right.yaml | 17 ++++
config/vision/sentry.yaml | 22 -----
launch/vision/camera.launch | 29 +++---
launch/vision/sentry_camera.launch | 53 ----------
launch/vision/sentry_vision_loader.launch | 42 --------
launch/vision/vision_loader.launch | 57 -----------
launch/vision/vision_main_node.launch | 99 +++++++++++++++++++
12 files changed, 154 insertions(+), 196 deletions(-)
create mode 100644 config/vision/camera_left.yaml
create mode 100644 config/vision/camera_right.yaml
delete mode 100644 config/vision/sentry.yaml
delete mode 100644 launch/vision/sentry_camera.launch
delete mode 100644 launch/vision/sentry_vision_loader.launch
delete mode 100644 launch/vision/vision_loader.launch
create mode 100644 launch/vision/vision_main_node.launch
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 0d5b781d..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 b116371f..00000000
--- a/launch/vision/vision_loader.launch
+++ /dev/null
@@ -1,57 +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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+