From 16a2ecef2e963d832ab9ee986816a458c1e9bbe2 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Wed, 11 Sep 2019 20:59:04 +0300 Subject: [PATCH 1/3] gitbook: fix --- docs/clever.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/clever.js b/docs/clever.js index 8524673a..c984e6d1 100644 --- a/docs/clever.js +++ b/docs/clever.js @@ -37,7 +37,7 @@ gitbook.events.bind('page.change', function() { // show link to latest raspberry image gitbook.events.bind('page.change', function() { var el = document.querySelector('a.latest-image'); - if (el) return; + if (!el) return; // get latest release from GitHub fetch('https://api.github.com/repos/CopterExpress/clever/releases').then(function(res) { From 035384cd6f2826fb09905cf652022af4ac12a277 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Wed, 11 Sep 2019 21:55:05 +0300 Subject: [PATCH 2/3] builder: Make tests run again --- builder/image-ros.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/image-ros.sh b/builder/image-ros.sh index 903f6180..b493f1c2 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -183,6 +183,7 @@ echo_stamp "Install GeographicLib datasets (needed for mavros)" \ && wget -qO- https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh | bash echo_stamp "Running tests" +cd /home/pi/catkin_ws catkin_make run_tests && catkin_test_results echo_stamp "Change permissions for catkin_ws" From e1a11bd70a69152bb873131d05bb33cbc9467362 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Wed, 11 Sep 2019 21:33:46 +0300 Subject: [PATCH 3/3] aruco_pose: Allow rgb8 map images --- aruco_pose/test/basic.py | 2 +- aruco_pose/test/largemap.py | 2 +- aruco_pose/test/test_parser_pass.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aruco_pose/test/basic.py b/aruco_pose/test/basic.py index 48e739a3..c8eca6c3 100755 --- a/aruco_pose/test/basic.py +++ b/aruco_pose/test/basic.py @@ -140,7 +140,7 @@ def test_map_image(node): img = rospy.wait_for_message('aruco_map/image', Image, timeout=5) assert img.width == 2000 assert img.height == 2000 - assert img.encoding == 'mono8' + assert img.encoding in ('mono8', 'rgb8') def test_map_markers(node): markers = rospy.wait_for_message('aruco_map/markers', MarkerArray, timeout=5) diff --git a/aruco_pose/test/largemap.py b/aruco_pose/test/largemap.py index 8ca1b065..56e06837 100755 --- a/aruco_pose/test/largemap.py +++ b/aruco_pose/test/largemap.py @@ -17,7 +17,7 @@ class TestArucoPose(unittest.TestCase): img = rospy.wait_for_message('aruco_map/image', Image, timeout=5) self.assertEqual(img.width, 2000) self.assertEqual(img.height, 2000) - self.assertEqual(img.encoding, 'mono8') + self.assertIn(img.encoding, ('mono8', 'rgb8')) def test_map_visualization(self): vis = rospy.wait_for_message('aruco_map/visualization', VisMarkerArray, timeout=5) diff --git a/aruco_pose/test/test_parser_pass.py b/aruco_pose/test/test_parser_pass.py index a504544a..1537a1ab 100755 --- a/aruco_pose/test/test_parser_pass.py +++ b/aruco_pose/test/test_parser_pass.py @@ -58,4 +58,4 @@ def test_map_image(node): img = rospy.wait_for_message('aruco_map/image', Image, timeout=5) assert img.width == 2000 assert img.height == 2000 - assert img.encoding == 'mono8' + assert img.encoding in ('mono8', 'rgb8')