Skip to content

Commit b28888f

Browse files
committed
add param TriggerCacheEnable
1 parent 08dcb7a commit b28888f

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

config/camera.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Camera:
88
frame_rate: 10.0
99

1010
# 触发模式
11-
Trigger: false
11+
Trigger: true
1212
# 触发源
1313
# 0:Line0
1414
# 1:Line1
@@ -17,7 +17,7 @@ Camera:
1717
# 4:Counter0
1818
# 7:Software
1919
# 8:FrequencyConverter
20-
Tigger_line: 2
20+
Tigger_line: 0
2121
# 触发上升沿、下降沿、高电平、低电平等
2222
# 0:RisingEdge
2323
# 1:FallingEdge
@@ -26,6 +26,7 @@ Camera:
2626
Trigger_action: 0
2727
# 触发延时 ≥0.0 ,单位 us
2828
Trigger_delay: 0.0
29+
Trigger_cache_enable: true
2930

3031
# 自动曝光
3132
# 0:Off
@@ -61,4 +62,4 @@ Camera:
6162
# 伽马调节
6263
Gamma_value: 1.0
6364
# Gamma 选择
64-
Gamma_selector: 1
65+
Gamma_selector: 1

src/camera.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ namespace HIKCAMERA
2727
int trigger_line;
2828
int trigger_action;
2929
float trigger_delay;
30+
bool trigger_cache;
3031
int Exposure;
3132
float Exposure_time;
3233
int ExposureTimeUp, ExposureTimeLow;
@@ -43,6 +44,7 @@ namespace HIKCAMERA
4344
private_nh.param<int>("Camera/Tigger_line", trigger_line, 2);
4445
private_nh.param<int>("Camera/Trigger_action", trigger_action, 0);
4546
private_nh.param<float>("Camera/Trigger_delay", trigger_delay, 0.0);
47+
private_nh.param<bool>("Camera/Trigger_cache_enable", trigger_cache, false);
4648
private_nh.param<int>("Camera/Exposure", Exposure, 2);
4749
private_nh.param<float>("Camera/Exposure_time", Exposure_time, 10000.0);
4850
private_nh.param<int>("Camera/ExposureTimeUp", ExposureTimeUp, 6000);
@@ -93,6 +95,8 @@ namespace HIKCAMERA
9395
}
9496
setFloatValue("TriggerDelay", trigger_delay);
9597
ROS_INFO_STREAM("TriggerDelay set to " << trigger_delay << "us.");
98+
setBoolValue("TriggerCacheEnable", trigger_cache);
99+
ROS_INFO_STREAM("TriggerCacheEnable set to " << trigger_cache);
96100
}
97101
else
98102
{

0 commit comments

Comments
 (0)