Skip to content

Commit e669c50

Browse files
committed
add create new camera name
1 parent 1ac4333 commit e669c50

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed
219 KB
Loading

example/GigeCam/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ int main() {
2020

2121
// 2.配置同步接口
2222
auto mv_cam = std::make_shared<MvCam>();
23-
mv_cam->SetParams({{"camera_1", CAM_1}});
23+
mv_cam->SetParams({{"cam_1", CAM_1}});
2424
synchronizer.UseSensor(mv_cam);
2525

2626
// 3.开启同步
2727
synchronizer.Start();
2828

2929
// 4.接收数据
3030
Messenger::GetInstance().SubStruct("imu_1", ImuCallback);
31-
Messenger::GetInstance().SubStruct("camera_1", ImageCallback);
31+
Messenger::GetInstance().SubStruct("cam_1", ImageCallback);
3232
// 阻塞线程
3333
while (true) {
3434
std::this_thread::sleep_for(std::chrono::milliseconds(100));

example/GigeCam/main_ros.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ int main() {
2020

2121
// 2.配置同步接口
2222
auto mv_cam = std::make_shared<MvCam>();
23-
mv_cam->SetParams({{"camera_1", CAM_1}});
23+
mv_cam->SetParams({{"cam_1", CAM_1}});
2424
synchronizer.UseSensor(mv_cam);
2525

2626
// 3.开启同步
2727
synchronizer.Start();
2828

2929
// 4.接收数据
3030
Messenger::GetInstance().SubStruct("imu_1", ImuCallback);
31-
Messenger::GetInstance().SubStruct("camera_1", ImageCallback);
31+
Messenger::GetInstance().SubStruct("cam_1", ImageCallback);
3232
// 阻塞线程
3333
while (true) {
3434
std::this_thread::sleep_for(std::chrono::milliseconds(100));

example/GigeCam/mv_cam.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ bool MvCam::Initialization() {
140140
if (MV_OK != rets_[i]) {
141141
LOG(ERROR) << "MV_CC_StartGrabbing fail! n_ret [" << rets_[i] << "]";
142142
}
143-
LOG(INFO) << "Camera " << i << " opens to completion";
143+
LOG(INFO) << "Camera " << i << " opens to completion.";
144144
}
145145
if (0 == st_device_list.nDeviceNum) {
146146
return true;
@@ -258,12 +258,13 @@ void MvCam::Start() {
258258
Enable();
259259
auto name = std::string(pst_value.chCurValue);
260260
if (name.empty()) {
261-
static int cam_index{0};
261+
// 相机名称默认从1开始
262+
static int cam_index{1};
262263
name = "cam_" + std::to_string(cam_index++);
263-
LOG(WARNING) << "Camera name is empty,create name " << name;
264+
LOG(WARNING) << "Camera name is empty,Create new name: " << name;
264265
}
265266
cam_threads.emplace_back(&MvCam::Receive, this, handle, name);
266-
LOG(INFO) << "Camera name is " << name << " start";
267+
LOG(INFO) << "Camera name is " << name << " start.";
267268
}
268269
}
269270
} // namespace infinite_sense

infinite_sense_core/src/infinite_sense.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void Synchronizer::Start() const {
4343
sensor_manager_->Initialization();
4444
sensor_manager_->Start();
4545
}
46-
LOG(INFO) << "Synchronizer Started";
46+
LOG(INFO) << "Synchronizer Started.";
4747
}
4848
void Synchronizer::Stop() const {
4949
if (net_manager_) {

infinite_sense_core/src/usb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void UsbManager::Start() {
4242
started_ = true;
4343
rx_thread_ = std::thread(&UsbManager::Receive, this);
4444
tx_thread_ = std::thread(&UsbManager::TimeStampSynchronization, this);
45-
LOG(INFO) << "USB manager started";
45+
LOG(INFO) << "USB manager started.";
4646
}
4747

4848
void UsbManager::Stop() {

0 commit comments

Comments
 (0)