diff --git a/clover/camera_info/fisheye_cam_640.yaml b/clover/camera_info/fisheye_cam.yaml similarity index 94% rename from clover/camera_info/fisheye_cam_640.yaml rename to clover/camera_info/fisheye_cam.yaml index f664bb7c..42825540 100644 --- a/clover/camera_info/fisheye_cam_640.yaml +++ b/clover/camera_info/fisheye_cam.yaml @@ -8,10 +8,10 @@ camera_matrix: data: - 332.47884746146343 - 0. - - 324.38022493658536 + - 320.0 - 0. - 333.1761847948052 - - 219.6445547142857 + - 240.0 - 0. - 0. - 1. diff --git a/clover/camera_info/fisheye_cam_320.yaml b/clover/camera_info/fisheye_cam_320.yaml deleted file mode 100644 index 76fcd8c2..00000000 --- a/clover/camera_info/fisheye_cam_320.yaml +++ /dev/null @@ -1,45 +0,0 @@ -image_width: 320 -image_height: 240 -distortion_model: plumb_bob -camera_name: raspicam -camera_matrix: - rows: 3 - cols: 3 - data: - - 166.23942373073172 - - 0. - - 162.19011246829268 - - 0. - - 166.5880923974026 - - 109.82227735714285 - - 0. - - 0. - - 1. -distortion_coefficients: - rows: 1 - cols: 8 - data: [ 2.15356885e-01, -1.17472846e-01, -3.06197672e-04, - -1.09444025e-04, -4.53657258e-03, 5.73090623e-01, - -1.27574577e-01, -2.86125589e-02, 0.00000000e+00, - 0.00000000e+00, 0.00000000e+00, 0.00000000e+00, - 0.00000000e+00, 0.00000000e+00] -rectification_matrix: - rows: 3 - cols: 3 - data: [1, 0, 0, 0, 1, 0, 0, 0, 1] -projection_matrix: - rows: 3 - cols: 4 - data: - - 166.23942373073172 - - 0. - - 162.19011246829268 - - 0. - - 0. - - 166.5880923974026 - - 109.82227735714285 - - 0. - - 0. - - 0. - - 1. - - 0. diff --git a/clover/launch/main_camera.launch b/clover/launch/main_camera.launch index e9d72297..ed22d143 100644 --- a/clover/launch/main_camera.launch +++ b/clover/launch/main_camera.launch @@ -18,14 +18,14 @@ - + - +