mirror of
https://github.com/orbbec/OrbbecSDK_ROS2.git
synced 2026-10-04 12:07:46 +08:00
Add support for Gemini_338 device in camera node PID checks and update version numbers to 2.5.1 in constants.h
This commit is contained in:
@@ -22,8 +22,8 @@
|
|||||||
#define THREAD_NUM 4
|
#define THREAD_NUM 4
|
||||||
|
|
||||||
#define OB_ROS_MAJOR_VERSION 2
|
#define OB_ROS_MAJOR_VERSION 2
|
||||||
#define OB_ROS_MINOR_VERSION 4
|
#define OB_ROS_MINOR_VERSION 5
|
||||||
#define OB_ROS_PATCH_VERSION 5
|
#define OB_ROS_PATCH_VERSION 1
|
||||||
|
|
||||||
#ifndef STRINGIFY
|
#ifndef STRINGIFY
|
||||||
#define STRINGIFY(arg) #arg
|
#define STRINGIFY(arg) #arg
|
||||||
@@ -133,5 +133,6 @@ const int32_t GEMINI_336LE_PID = 0x0810; // Gemini 335Le
|
|||||||
const int32_t CUSTOM_ADVANTECH_GEMINI_336_PID = 0x0816; // Custom Advantech Gemini 336
|
const int32_t CUSTOM_ADVANTECH_GEMINI_336_PID = 0x0816; // Custom Advantech Gemini 336
|
||||||
const int32_t CUSTOM_ADVANTECH_GEMINI_336L_PID = 0x0817; // Custom Advantech Gemini 336L
|
const int32_t CUSTOM_ADVANTECH_GEMINI_336L_PID = 0x0817; // Custom Advantech Gemini 336L
|
||||||
const int32_t DABAI_MAX_PID = 0x069a; // dabai max
|
const int32_t DABAI_MAX_PID = 0x069a; // dabai max
|
||||||
|
const int32_t GEMINI_338_PID = 0x0818; // Gemini 338
|
||||||
|
|
||||||
} // namespace orbbec_camera
|
} // namespace orbbec_camera
|
||||||
|
|||||||
@@ -3720,7 +3720,7 @@ bool OBCameraNode::isGemini335PID(uint32_t pid) {
|
|||||||
pid == GEMINI_335L_PID || pid == GEMINI_330L_PID || pid == GEMINI_336L_PID ||
|
pid == GEMINI_335L_PID || pid == GEMINI_330L_PID || pid == GEMINI_336L_PID ||
|
||||||
pid == GEMINI_335LG_PID || pid == GEMINI_336LG_PID || pid == GEMINI_335LE_PID ||
|
pid == GEMINI_335LG_PID || pid == GEMINI_336LG_PID || pid == GEMINI_335LE_PID ||
|
||||||
pid == GEMINI_336LE_PID || pid == CUSTOM_ADVANTECH_GEMINI_336_PID ||
|
pid == GEMINI_336LE_PID || pid == CUSTOM_ADVANTECH_GEMINI_336_PID ||
|
||||||
pid == CUSTOM_ADVANTECH_GEMINI_336L_PID;
|
pid == CUSTOM_ADVANTECH_GEMINI_336L_PID || pid == GEMINI_338_PID;
|
||||||
}
|
}
|
||||||
|
|
||||||
orbbec_camera_msgs::msg::IMUInfo OBCameraNode::createIMUInfo(
|
orbbec_camera_msgs::msg::IMUInfo OBCameraNode::createIMUInfo(
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ class MultiCameraSubscriber : public rclcpp::Node {
|
|||||||
pid == GEMINI_335L_PID || pid == GEMINI_330L_PID || pid == GEMINI_336L_PID ||
|
pid == GEMINI_335L_PID || pid == GEMINI_330L_PID || pid == GEMINI_336L_PID ||
|
||||||
pid == GEMINI_335LG_PID || pid == GEMINI_336LG_PID || pid == GEMINI_335LE_PID ||
|
pid == GEMINI_335LG_PID || pid == GEMINI_336LG_PID || pid == GEMINI_335LE_PID ||
|
||||||
pid == GEMINI_336LE_PID || pid == CUSTOM_ADVANTECH_GEMINI_336_PID ||
|
pid == GEMINI_336LE_PID || pid == CUSTOM_ADVANTECH_GEMINI_336_PID ||
|
||||||
pid == CUSTOM_ADVANTECH_GEMINI_336L_PID;
|
pid == CUSTOM_ADVANTECH_GEMINI_336L_PID || pid == GEMINI_338_PID;
|
||||||
}
|
}
|
||||||
void params_init() {
|
void params_init() {
|
||||||
std::ifstream file(
|
std::ifstream file(
|
||||||
|
|||||||
Reference in New Issue
Block a user