Merge pull request #33 from usdot-fhwa-stol/develop

Component release 1.2.0
usdot-fhwa-stol · Mar 18, 2020 · 8b5cbec · 8b5cbec
2 parents c2ca67c + 7beca25
commit 8b5cbec
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2
 
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of
@@ -28,7 +28,7 @@ jobs:
     # Pull docker image from docker hub
     # XTERM used for better catkin_make output
     docker:
-      - image: usdotfhwastol/carma-base:3.4.0
+      - image: usdotfhwastol/carma-base:3.7.0
         user: carma
         environment:
           TERM: xterm

diff --git a/.sonarqube/sonar-scanner.properties b/.sonarqube/sonar-scanner.properties
@@ -1,4 +1,4 @@
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of
@@ -12,14 +12,14 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-FROM usdotfhwastol/carma-base:3.4.0 as setup
+FROM usdotfhwastol/carma-base:3.7.0 as setup
 
 RUN mkdir ~/src
 COPY --chown=carma . /home/carma/src/CARMAAvtVimbaDriver
 RUN ~/src/CARMAAvtVimbaDriver/docker/checkout.sh
 RUN ~/src/CARMAAvtVimbaDriver/docker/install.sh
 
-FROM usdotfhwastol/carma-base:3.4.0
+FROM usdotfhwastol/carma-base:3.7.0
 
 ARG BUILD_DATE="NULL"
 ARG VERSION="NULL"

diff --git a/Vimba_installation_under_Linux.pdf b/Vimba_installation_under_Linux.pdf
diff --git a/Vimba_v3.1_Linux.tgz b/Vimba_v3.1_Linux.tgz
diff --git a/calibrations/camera_fl_intrinsics.yaml b/calibrations/camera_fl_intrinsics.yaml
@@ -0,0 +1,20 @@
+%YAML:1.0
+CameraExtrinsicMat: !!opencv-matrix
+  cols: 4
+  data: [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0,
+    1.0]
+  dt: d
+  rows: 4
+CameraMat: !!opencv-matrix
+  cols: 3
+  data: [4721.906852, 0.000000, 1203.133268, 0.000000, 4699.428088, 668.673413, 0.000000, 0.000000, 1.000000]
+  dt: d
+  rows: 3
+DistCoeff: !!opencv-matrix
+  cols: 1
+  data: [0.017352, -2.130108, 0.008863, 0.014784, 0.000000]
+  dt: d
+  rows: 5
+ImageSize: [1920, 1440]
+Reprojection Error: 0.0
+DistModel: plumb_bob
diff --git a/docker/build-image.sh b/docker/build-image.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of

diff --git a/docker/checkout.sh b/docker/checkout.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of

diff --git a/docker/get-component-version.sh b/docker/get-component-version.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of

diff --git a/docker/get-image-name.sh b/docker/get-image-name.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of

diff --git a/docker/get-repo-name.sh b/docker/get-repo-name.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of

diff --git a/docker/get-system-version.sh b/docker/get-system-version.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of

diff --git a/docker/install.sh b/docker/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#  Copyright (C) 2018-2019 LEIDOS.
+#  Copyright (C) 2018-2020 LEIDOS.
 # 
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of

diff --git a/include/avt_vimba_camera/status_camera.h b/include/avt_vimba_camera/status_camera.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 LEIDOS.
+ * Copyright (C) 2019-2020 LEIDOS.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/launch/mobileye_eval.launch b/launch/mobileye_eval.launch
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2018-2019 LEIDOS.
+  Copyright (C) 2018-2020 LEIDOS.
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not
   use this file except in compliance with the License. You may obtain a copy of

diff --git a/launch/mono_camera.launch b/launch/mono_camera.launch
@@ -1,17 +1,24 @@
 <launch>
-	<arg name="remap_ns" default="/"/>
-	<group ns="$(arg remap_ns)">
+
+	<arg name="guid" default=""/>
+ 	<arg name="ip" default="192.168.88.90"/>
+  	<arg name="camera_info_url" default="file://$(find avt_vimba_camera)/calibrations/camera_fl_intrinsics.yaml"/>
+ 	<arg name="frame_id" default="left_optical"/>
+	<arg name="trig_timestamp_topic" default=""/>
+	<arg name="show_debug_prints" default="true"/>
+
+	<group>
 		<group ns="camera">
 			<node name="image_proc" pkg="image_proc" type="image_proc"/>
 		</group>
 
 		<node name="camera" pkg="avt_vimba_camera" type="mono_camera_node" output="screen">
-			<param name="guid" value=""/>
-			<param name="ip" value="192.168.88.90"/>
-			<param name="camera_info_url" value="file://$(find avt_vimba_camera)/calibrations/calibration_50-0536911040.yaml"/>
-			<param name="frame_id" value="left_optical"/>
-			<param name="trig_timestamp_topic" value=""/>
-			<param name="show_debug_prints" value="true"/>
+			<param name="guid" value="$(arg guid)"/>
+			<param name="ip" value="$(arg ip)"/>
+			<param name="camera_info_url" value="$(arg camera_info_url)"/>
+			<param name="frame_id" value="$(arg frame_id)"/>
+			<param name="trig_timestamp_topic" value="$(arg trig_timestamp_topic)"/>
+			<param name="show_debug_prints" value="$(arg show_debug_prints)"/>
 
 			<!-- Trigger mode:
 				1. Freerun

diff --git a/src/status_camera.cpp b/src/status_camera.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 LEIDOS.
+ * Copyright (C) 2019-2020 LEIDOS.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

diff --git a/test/status_mako_camera_test.cpp b/test/status_mako_camera_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 LEIDOS.
+ * Copyright (C) 2019-2020 LEIDOS.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of