update to v2.0.7

This commit is contained in:
jj
2024-10-21 18:31:11 +08:00
parent 99d35d9138
commit 0de68ca4d3
60 changed files with 1086 additions and 3763 deletions
@@ -23,7 +23,7 @@
#define OB_ROS_MAJOR_VERSION 2
#define OB_ROS_MINOR_VERSION 0
#define OB_ROS_PATCH_VERSION 5
#define OB_ROS_PATCH_VERSION 7
#ifndef STRINGIFY
#define STRINGIFY(arg) #arg
@@ -63,6 +63,7 @@
#include "orbbec_camera/image_publisher.h"
#include "jpeg_decoder.h"
#include <std_msgs/msg/string.hpp>
#include <fcntl.h>
#if defined(ROS_JAZZY) || defined(ROS_IRON)
#include <cv_bridge/cv_bridge.hpp>
@@ -94,6 +95,8 @@
(static_cast<std::ostringstream&&>(std::ostringstream() << getNamespaceStr() << "_odom_frame")) \
.str()
#define DEVICE_PATH "/dev/camsync"
namespace orbbec_camera {
using GetDeviceInfo = orbbec_camera_msgs::srv::GetDeviceInfo;
using Extrinsics = orbbec_camera_msgs::msg::Extrinsics;
@@ -129,6 +132,11 @@ const std::map<OBStreamType, OBFrameType> STREAM_TYPE_TO_FRAME_TYPE = {
{OB_STREAM_ACCEL, OB_FRAME_ACCEL},
};
typedef struct {
uint8_t mode;
uint16_t fps;
} cs_param_t;
class OBCameraNode {
public:
OBCameraNode(rclcpp::Node* node, std::shared_ptr<ob::Device> device,
@@ -152,6 +160,11 @@ class OBCameraNode {
void startIMU();
int openSocSyncPwmTrigger(uint16_t fps);
int closeSocSyncPwmTrigger();
void startGmslTrigger();
void stopGmslTrigger();
private:
struct IMUData {
IMUData() = default;
@@ -539,6 +552,9 @@ class OBCameraNode {
int hdr_merge_gain_1_ = -1;
int hdr_merge_exposure_2_ = -1;
int hdr_merge_gain_2_ = -1;
int gmsl_trigger_fd_ = -1;
int gmsl_trigger_fps_ = -1;
bool enable_gmsl_trigger_ = false;
rclcpp::Publisher<std_msgs::msg::String>::SharedPtr filter_status_pub_;
nlohmann::json filter_status_;