Skip to content

Commit d56d71b

Browse files
authored
Update default resolution for stereo - Humble (#434)
1 parent 43c228c commit d56d71b

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

depthai_ros_driver/src/dai_nodes/sensors/sensor_helpers.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ namespace dai_nodes {
1111
namespace sensor_helpers {
1212

1313
std::vector<ImageSensor> availableSensors = {{"IMX378", "1080P", {"12MP", "4K", "1080P"}, true},
14-
{"OV9282", "800P", {"800P", "720P", "400P"}, false},
15-
{"OV9782", "800P", {"800P", "720P", "400P"}, true},
16-
{"OV9281", "800P", {"800P", "720P", "400P"}, true},
14+
{"OV9282", "720P", {"800P", "720P", "400P"}, false},
15+
{"OV9782", "720P", {"800P", "720P", "400P"}, true},
16+
{"OV9281", "720P", {"800P", "720P", "400P"}, true},
1717
{"IMX214", "1080P", {"13MP", "12MP", "4K", "1080P"}, true},
1818
{"IMX412", "1080P", {"13MP", "12MP", "4K", "1080P"}, true},
1919
{"OV7750", "480P", {"480P", "400P"}, false},

depthai_ros_driver/src/dai_nodes/stereo.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,15 @@ void Stereo::closeQueues() {
337337
if(ph->getParam<bool>("i_publish_topic")) {
338338
stereoQ->close();
339339
}
340-
if(ph->getParam<bool>("i_publish_left_rect") || ph->getParam<bool>("i_publish_synced_rect_pair")) {
341-
syncTimer->reset();
340+
if(ph->getParam<bool>("i_publish_left_rect")){
342341
leftRectQ->close();
343342
}
344-
if(ph->getParam<bool>("i_publish_right_rect") || ph->getParam<bool>("i_publish_synced_rect_pair")) {
345-
syncTimer->reset();
343+
if(ph->getParam<bool>("i_publish_right_rect")){
344+
rightRectQ->close();
345+
}
346+
if(ph->getParam<bool>("i_publish_synced_rect_pair")) {
347+
syncTimer->cancel();
348+
leftRectQ->close();
346349
rightRectQ->close();
347350
}
348351
if(ph->getParam<bool>("i_left_rect_enable_feature_tracker")) {

depthai_ros_driver/src/dai_nodes/sys_logger.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ std::string SysLogger::sysInfoToString(const dai::SystemInformation& sysInfo) {
6464

6565
void SysLogger::produceDiagnostics(diagnostic_updater::DiagnosticStatusWrapper& stat) {
6666
try {
67-
auto logData = loggerQ->tryGet<dai::SystemInformation>();
68-
if(logData) {
67+
bool timeout;
68+
auto logData = loggerQ->get<dai::SystemInformation>(std::chrono::seconds(5), timeout);
69+
if(!timeout) {
6970
stat.summary(diagnostic_msgs::msg::DiagnosticStatus::OK, "System Information");
7071
stat.add("System Information", sysInfoToString(*logData));
7172
} else {

depthai_ros_driver/src/param_handlers/sensor_param_handler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void SensorParamHandler::declareParams(std::shared_ptr<dai::node::MonoCamera> mo
7070
monoCam->setIsp3aFps(declareAndLogParam<int>("i_isp3a_fps", 10));
7171
}
7272
monoCam->setImageOrientation(
73-
utils::getValFromMap(declareAndLogParam<std::string>("i_sensor_img_orientation", "NORMAL"), dai_nodes::sensor_helpers::cameraImageOrientationMap));
73+
utils::getValFromMap(declareAndLogParam<std::string>("i_sensor_img_orientation", "AUTO"), dai_nodes::sensor_helpers::cameraImageOrientationMap));
7474
}
7575
void SensorParamHandler::declareParams(std::shared_ptr<dai::node::ColorCamera> colorCam, dai_nodes::sensor_helpers::ImageSensor sensor, bool publish) {
7676
declareAndLogParam<bool>("i_publish_topic", publish);
@@ -158,7 +158,7 @@ void SensorParamHandler::declareParams(std::shared_ptr<dai::node::ColorCamera> c
158158
colorCam->setIsp3aFps(declareAndLogParam<int>("i_isp3a_fps", 10));
159159
}
160160
colorCam->setImageOrientation(
161-
utils::getValFromMap(declareAndLogParam<std::string>("i_sensor_img_orientation", "NORMAL"), dai_nodes::sensor_helpers::cameraImageOrientationMap));
161+
utils::getValFromMap(declareAndLogParam<std::string>("i_sensor_img_orientation", "AUTO"), dai_nodes::sensor_helpers::cameraImageOrientationMap));
162162
}
163163
dai::CameraControl SensorParamHandler::setRuntimeParams(const std::vector<rclcpp::Parameter>& params) {
164164
dai::CameraControl ctrl;

0 commit comments

Comments
 (0)