update config file
This commit is contained in:
parent
6c6ba72967
commit
c0668fe5fb
@ -10,11 +10,12 @@ realsense_cameras {
|
||||
align_mode: ALIGN_MODE_COLOR
|
||||
buffer_size: 30
|
||||
sync: true
|
||||
enable: false
|
||||
}
|
||||
|
||||
uvc_cameras {
|
||||
id: "cam1"
|
||||
usb: "/dev/video0"
|
||||
usb: "/dev/uvc_left_camera"
|
||||
width: 640
|
||||
height: 480
|
||||
fps: 30
|
||||
@ -22,4 +23,5 @@ uvc_cameras {
|
||||
camera_mode: CAMERA_MODE_PHOTO
|
||||
stream_mode: STREAM_MODE_RGB
|
||||
buffer_size: 30
|
||||
enable: true
|
||||
}
|
||||
|
||||
@ -2,10 +2,12 @@ rh56dftp_dexhands {
|
||||
id: "hand1"
|
||||
ip: "192.168.1.213"
|
||||
port: 6000
|
||||
enable: false
|
||||
}
|
||||
|
||||
rh56dftp_dexhands {
|
||||
id: "hand2"
|
||||
ip: "192.168.1.214"
|
||||
port: 6000
|
||||
enable: false
|
||||
}
|
||||
@ -3,4 +3,5 @@ ffmpeg_microphones {
|
||||
channels: 2
|
||||
sampleRate: 44100
|
||||
volume: 100
|
||||
enable: true
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
ffmpeg_speakers {
|
||||
id: "spk1"
|
||||
enable: true
|
||||
}
|
||||
@ -237,6 +237,8 @@ void DeviceManager::init_devices_() {
|
||||
|
||||
for (int i = 0; i < camera_config.uvc_cameras().size(); i++) {
|
||||
auto cam = camera_config.uvc_cameras(i);
|
||||
if (!cam.enable())
|
||||
continue;
|
||||
auto id = cam.id();
|
||||
if (devices_.count(id)) {
|
||||
LOG(ERROR) << "[DeviceManager]: Duplicate Camera Device ID" << id;
|
||||
@ -249,6 +251,8 @@ void DeviceManager::init_devices_() {
|
||||
}
|
||||
for (int i = 0; i < camera_config.realsense_cameras().size(); i++) {
|
||||
auto cam = camera_config.realsense_cameras(i);
|
||||
if (!cam.enable())
|
||||
continue;
|
||||
auto id = cam.id();
|
||||
if (devices_.count(id)) {
|
||||
LOG(ERROR) << "[DeviceManager]: Duplicate Camera Device ID" << id;
|
||||
@ -264,6 +268,8 @@ void DeviceManager::init_devices_() {
|
||||
ConfigHelper::getDexHandsConfig(dexhand_cfg);
|
||||
for (int i = 0; i < dexhand_cfg.rh56dftp_dexhands().size(); i++) {
|
||||
auto dexhand = dexhand_cfg.rh56dftp_dexhands(i);
|
||||
if (!dexhand.enable())
|
||||
continue;
|
||||
auto id = dexhand.id();
|
||||
if (devices_.count(id)) {
|
||||
LOG(ERROR) << "[DeviceManager]: Duplicate DexHand Device ID" << id;
|
||||
@ -295,6 +301,8 @@ void DeviceManager::init_devices_() {
|
||||
ConfigHelper::getMicroPhonesConfig(micro_phone_config);
|
||||
for (int i = 0; i < micro_phone_config.ffmpeg_microphones().size(); i++) {
|
||||
auto mic = micro_phone_config.ffmpeg_microphones(i);
|
||||
if (!mic.enable())
|
||||
continue;
|
||||
auto id = mic.id();
|
||||
if (devices_.count(id)) {
|
||||
LOG(ERROR) << "[DeviceManager]: Duplicate MicroPhone Device ID" << id;
|
||||
@ -310,6 +318,8 @@ void DeviceManager::init_devices_() {
|
||||
ConfigHelper::getSpeakersConfig(speaker_config);
|
||||
for (int i = 0; i < speaker_config.ffmpeg_speakers().size(); i++) {
|
||||
auto speaker = speaker_config.ffmpeg_speakers(i);
|
||||
if (!speaker.enable())
|
||||
continue;
|
||||
auto id = speaker.id();
|
||||
if (devices_.count(id)) {
|
||||
LOG(ERROR) << "[DeviceManager]: Duplicate Speaker Device ID" << id;
|
||||
|
||||
Binary file not shown.
@ -32,6 +32,7 @@ message RealSenseCameraConfig {
|
||||
AlignMode align_mode = 9;
|
||||
int32 buffer_size = 10;
|
||||
bool sync = 11;
|
||||
bool enable = 12;
|
||||
}
|
||||
|
||||
// UVC摄像头
|
||||
@ -45,6 +46,7 @@ message UVCCameraConfig {
|
||||
CameraMode camera_mode = 7;
|
||||
StreamMode stream_mode = 8;
|
||||
int32 buffer_size = 9;
|
||||
bool enable = 10;
|
||||
}
|
||||
|
||||
// 主配置消息 - 统一管理所有摄像头
|
||||
|
||||
@ -5,7 +5,7 @@ message RH56DFTPDexHandConfig{
|
||||
string id = 1;
|
||||
string ip = 2;
|
||||
int32 port = 3;
|
||||
|
||||
bool enable = 4;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@ message FFMpegMicroPhoneConfig{
|
||||
int32 channels = 2;
|
||||
int32 sampleRate = 3;
|
||||
int32 volume = 4;
|
||||
bool enable = 5;
|
||||
}
|
||||
|
||||
message MicroPhoneConfig{
|
||||
|
||||
@ -3,6 +3,7 @@ package cmvr.config;
|
||||
|
||||
message FFMpegSpeakerConfig{
|
||||
string id = 1;
|
||||
bool enable = 2;
|
||||
}
|
||||
|
||||
message SpeakerConfig{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user