diff --git a/launch/iri_mvbluefox3_camera.launch b/launch/iri_mvbluefox3_camera.launch index daa1b7d0dfedd0d3da033b0e8f19109770e0c64f..a9d9019452f3c01d79c3934c616551013969041a 100644 --- a/launch/iri_mvbluefox3_camera.launch +++ b/launch/iri_mvbluefox3_camera.launch @@ -2,8 +2,8 @@ <launch> <arg name="num_cams" default="1" /> - <arg name="cam1_name" default="F0300141" /> - <arg name="cam2_name" default="F0300123" /> + <arg name="cam1_name" default="cam1" /> + <arg name="cam2_name" default="cam2" /> <node pkg="iri_mvbluefox3_camera" name="iri_mvbluefox3_camera" diff --git a/src/mvbluefox3_camera_driver.cpp b/src/mvbluefox3_camera_driver.cpp index 5c57a20fe2cc8e7fbfecf5a4195e0504b5ac3ba9..5444e20218053fa8f865d60a71f7fd2ed0a3b63d 100644 --- a/src/mvbluefox3_camera_driver.cpp +++ b/src/mvbluefox3_camera_driver.cpp @@ -233,9 +233,9 @@ CMvbluefox3::codings_t Mvbluefox3CameraDriver::PfToCodes(int &pf) case 0: ct = CMvbluefox3::raw; break; case 1: ct = CMvbluefox3::mono8; break; case 2: ct = CMvbluefox3::mono16; break; - case 3: ct = CMvbluefox3::rgb8; break; - case 4: ct = CMvbluefox3::rgb16; break; - case 5: ct = CMvbluefox3::bgr8; break; + case 3: ct = CMvbluefox3::bgr8; break; + case 4: ct = CMvbluefox3::bgr16; break; + case 5: ct = CMvbluefox3::rgb8; break; case 6: ct = CMvbluefox3::yuv422; break; case 7: ct = CMvbluefox3::yuv444; break; } @@ -250,9 +250,9 @@ int Mvbluefox3CameraDriver::CodesToPf(CMvbluefox3::codings_t ct) case CMvbluefox3::raw: pf = 0; break; case CMvbluefox3::mono8: pf = 1; break; case CMvbluefox3::mono16: pf = 2; break; - case CMvbluefox3::rgb8: pf = 3; break; - case CMvbluefox3::rgb16: pf = 4; break; - case CMvbluefox3::bgr8: pf = 5; break; + case CMvbluefox3::bgr8: pf = 3; break; + case CMvbluefox3::bgr16: pf = 4; break; + case CMvbluefox3::rgb8: pf = 5; break; case CMvbluefox3::yuv422: pf = 6; break; case CMvbluefox3::yuv444: pf = 7; break; }