Try to fix

This reverts commit f25816f2d5.

.travis.yml

@@ -77,7 +77,6 @@ jobs:
         - sudo sh -c "echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections"
         - sudo apt update && sudo apt install -y calibre msttcorefonts
         - npm install gitbook-cli -g
-        - gitbook fetch 3.2.3 && npm i npm@3.10.10 --prefix=~/.gitbook/versions/3.2.3/ # fixing https://travis-ci.org/github/CopterExpress/clover/jobs/766541125#L932
         - npm install markdownlint-cli -g
         - npm install svgexport -g
         - gitbook -V
@@ -88,13 +87,7 @@ jobs:
         - ./check_unused_assets.py
         - gitbook install
         - gitbook build
-        - for i in 1 2 3 4; do gitbook pdf ./ _book/clover.pdf && break || sleep 1; done
-        - sudo apt-get install ghostscript
-        - gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/default -dNOPAUSE -dQUIET -dBATCH -dDetectDuplicateImages -dCompressFonts=true -r150 -sOutputFile=_book/clover_ru_compressed.pdf _book/clover_ru.pdf
-        - gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/default -dNOPAUSE -dQUIET -dBATCH -dDetectDuplicateImages -dCompressFonts=true -r150 -sOutputFile=_book/clover_en_compressed.pdf _book/clover_en.pdf
-        - rm _book/clover_ru.pdf && mv _book/clover_ru_compressed.pdf _book/clover_ru.pdf
-        - rm _book/clover_en.pdf && mv _book/clover_en_compressed.pdf _book/clover_en.pdf
-        - ls -lah _book/clover*.pdf
+        - gitbook pdf ./ _book/clover.pdf
       deploy:
         provider: pages
         local_dir: _book

README.md

@@ -21,7 +21,6 @@ Clover drone is used on a wide range of educational events, including [Copter Ha
 Preconfigured image for Raspberry Pi with installed and configured software, ready to fly, is available [in the Releases section](https://github.com/CopterExpress/clover/releases).
 
 [![Build Status](https://travis-ci.org/CopterExpress/clover.svg?branch=master)](https://travis-ci.org/CopterExpress/clover)
-![GitHub all releases](https://img.shields.io/github/downloads/CopterExpress/clover/total)
 
 Image features:
 

aruco_pose/CMakeLists.txt

@@ -111,7 +111,7 @@ generate_messages(
 
 ## Generate dynamic reconfigure parameters in the 'cfg' folder
 generate_dynamic_reconfigure_options(
-  cfg/Detector.cfg
+  cfg/DetectorParams.cfg
 )
 
 ###################################

aruco_pose/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>aruco_pose</name>
-  <version>0.21.3</version>
+  <version>0.21.1</version>
   <description>Positioning with ArUco markers</description>
 
   <maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>

builder/assets/examples/get_telemetry.py

@@ -1,11 +0,0 @@
-# Information: https://clover.coex.tech/en/simple_offboard.html#gettelemetry
-
-import rospy
-from clover import srv
-
-rospy.init_node('flight')
-
-get_telemetry = rospy.ServiceProxy('get_telemetry', srv.GetTelemetry)
-
-# Print drone's state
-print(get_telemetry())

builder/assets/hardware_setup.sh

@@ -65,7 +65,7 @@ echo_stamp "#6 Turn on UART"
 # https://github.com/RPi-Distro/raspi-config/pull/75
 /usr/bin/raspi-config nonint do_serial 1
 /usr/bin/raspi-config nonint set_config_var enable_uart 1 /boot/config.txt
-echo dtoverlay=pi3-disable-bt >> /boot/config.txt
+/usr/bin/raspi-config nonint set_config_var dtoverlay pi3-disable-bt /boot/config.txt
 systemctl disable hciuart.service
 
 # After adding to Raspbian OS

builder/image-ros.sh

@@ -13,7 +13,7 @@
 # copies or substantial portions of the Software.
 #
 
-set -e # Exit immidiately on non-zero result
+set -ex # Exit immidiately on non-zero result
 
 REPO=$1
 REF=$2
@@ -76,11 +76,9 @@ my_travis_retry sudo -u pi rosdep update
 
 export ROS_IP='127.0.0.1' # needed for running tests
 
-# echo_stamp "Reconfiguring Clover repository for simplier unshallowing" # TODO: bring back
-# cd /home/pi/catkin_ws/src/clover
-# git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-echo_stamp "Remove .git from Clover to reduce the size"
-rm -rf /home/pi/catkin_ws/src/clover/.git # TODO: remove
+echo_stamp "Reconfiguring Clover repository for simplier unshallowing"
+cd /home/pi/catkin_ws/src/clover
+git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 
 echo_stamp "Build and install Clover"
 cd /home/pi/catkin_ws
@@ -101,7 +99,6 @@ rm -rf build  # remove build artifacts
 echo_stamp "Build Clover documentation"
 cd /home/pi/catkin_ws/src/clover
 NPM_CONFIG_UNSAFE_PERM=true npm install gitbook-cli -g
-NPM_CONFIG_UNSAFE_PERM=true gitbook fetch 3.2.3 && npm i npm@3.10.10 --prefix=~/.gitbook/versions/3.2.3/ # fixing https://travis-ci.org/github/CopterExpress/clover/jobs/766541125#L932
 NPM_CONFIG_UNSAFE_PERM=true gitbook install
 gitbook build
 touch node_modules/CATKIN_IGNORE docs/CATKIN_IGNORE _book/CATKIN_IGNORE clover/www/CATKIN_IGNORE apps/CATKIN_IGNORE # ignore documentation files by catkin

builder/image-software.sh

@@ -82,7 +82,9 @@ apt-get update
 
 # Let's retry fetching those packages several times, just in case
 echo_stamp "Software installing"
-my_travis_retry apt-get install --no-install-recommends -y cmake-data=3.13.4-1 cmake=3.13.4-1 # FIXME: using older CMake due to https://travis-ci.org/github/CopterExpress/clover/jobs/764367665#L6984
+apt-cache policy cmake
+apt-cache policy cmake-data
+my_travis_retry apt-get install --no-install-recommends -y cmake-data=3.13.4-1 cmake=3.13.4-1
 my_travis_retry apt-get install --no-install-recommends -y \
 unzip \
 zip \
@@ -95,7 +97,6 @@ lsof \
 git \
 dnsmasq  \
 tmux \
-tree \
 vim \
 libjpeg8 \
 tcpdump \
@@ -128,7 +129,7 @@ curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip2.py
 python3 get-pip.py
 python get-pip2.py
 rm get-pip.py get-pip2.py
-#my_travis_retry pip install --upgrade pip
+my_travis_retry pip install --upgrade pip
 #my_travis_retry pip3 install --upgrade pip
 
 echo_stamp "Make sure both pip and pip3 are installed"
@@ -149,7 +150,6 @@ my_travis_retry pip install --prefer-binary rpi_ws281x
 echo_stamp "Setup Monkey"
 mv /etc/monkey/sites/default /etc/monkey/sites/default.orig
 mv /root/monkey /etc/monkey/sites/default
-sed -i 's/SymLink Off/SymLink On/' /etc/monkey/monkey.conf
 systemctl enable monkey.service
 
 echo_stamp "Install Node.js"

builder/standalone-install.sh

@@ -41,6 +41,3 @@ pip install --upgrade pytest
 cd /root/catkin_ws
 source devel/setup.bash
 catkin_make run_tests && catkin_test_results
-
-# Step 5: Install packages
-catkin_make install

builder/test/tests.sh

@@ -43,8 +43,6 @@ rosversion aruco_pose
 rosversion vl53l1x
 rosversion mavros
 rosversion mavros_extras
-rosversion ws281x
-rosversion led_msgs
 rosversion dynamic_reconfigure
 rosversion tf2_web_republisher
 rosversion compressed_image_transport

clover/CMakeLists.txt

@@ -24,7 +24,6 @@ find_package(catkin REQUIRED COMPONENTS
   tf2_ros
   image_transport
   cv_bridge
-  catkin_virtualenv
 )
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
@@ -133,16 +132,6 @@ generate_messages(
 ## LIBRARIES: libraries you create in this project that dependent projects also need
 ## CATKIN_DEPENDS: catkin_packages dependent projects also need
 ## DEPENDS: system dependencies of this project that dependent projects also need
-
-# Generate the virtualenv
-catkin_generate_virtualenv(INPUT_REQUIREMENTS requirements.in)
-
-# Make sure your python executables are installed using `catkin_install_python`:
-catkin_install_python(
-  PROGRAMS
-    src/selfcheck.py
-  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
-
 catkin_package(
 #  INCLUDE_DIRS include
   LIBRARIES ${PROJECT_NAME}
@@ -259,8 +248,11 @@ target_link_libraries(${PROJECT_NAME}
 # )
 
 ## Mark other files for installation (e.g. launch and bag files, etc.)
- install(FILES requirements.in
-       	 DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+# install(FILES
+#   # myfile1
+#   # myfile2
+#   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+# )
 
 # Only install udev rules when building a Debian package
 # FIXME: Other operating systems may have other prefixes

clover/launch/clover.launch

@@ -12,6 +12,7 @@
     <arg name="led" default="true"/>
     <arg name="blocks" default="false"/>
     <arg name="rc" default="true"/>
+    <arg name="shell" default="true"/>
 
     <arg name="simulator" default="false"/> <!-- flag that we are operating on a simulated drone -->
 
@@ -90,6 +91,9 @@
         <param name="use_fake_gcs" value="false"/>
     </node>
 
+    <!-- Shell access through ROS service -->
+    <node name="shell" pkg="clover" type="shell" output="screen" if="$(arg shell)"/>
+
     <!-- Update static directory -->
     <node pkg="roswww_static" name="roswww_static" type="main.py" clear_params="true">
         <param name="default_package" value="clover"/>

clover/launch/mavros.launch

@@ -6,15 +6,13 @@
     <arg name="viz" default="true"/>
     <arg name="respawn" default="true"/>
     <arg name="distance_sensor_remap" default="rangefinder/range"/>
-    <arg name="usb_device" default="/dev/px4fmu"/>
-    <arg name="prefix" default="bash -c 'while [ ! -e $(arg usb_device) ]; do sleep 1; done; $0 $@'" if="$(eval fcu_conn == 'usb')"/>
 
-    <node pkg="mavros" type="mavros_node" name="mavros" launch-prefix="$(arg prefix)" required="false" clear_params="true" respawn="$(arg respawn)" unless="$(eval fcu_conn == 'none')" respawn_delay="1" output="screen">
+    <node pkg="mavros" type="mavros_node" name="mavros" required="false" clear_params="true" respawn="$(arg respawn)" unless="$(eval fcu_conn == 'none')" respawn_delay="1" output="screen">
         <!-- UART connection -->
         <param name="fcu_url" value="/dev/ttyAMA0:921600" if="$(eval fcu_conn is None or fcu_conn == 'uart')"/>
 
         <!-- USB connection -->
-        <param name="fcu_url" value="$(arg usb_device)" if="$(eval fcu_conn == 'usb')"/>
+        <param name="fcu_url" value="/dev/px4fmu" if="$(eval fcu_conn == 'usb')"/>
 
         <!-- sitl before PX4 1.9.0 -->
         <param name="fcu_url" value="udp://@$(arg fcu_ip):14557" if="$(eval fcu_conn == 'udp')"/>

clover/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>clover</name>
-  <version>0.21.3</version>
+  <version>0.21.1</version>
   <description>The Clover package</description>
 
   <maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
@@ -15,7 +15,6 @@
 
   <!-- Package format specifier version 2.0 allows specifying dependencies for both
    build- and runtime in a single <depend> element -->
-  <build_depend>catkin_virtualenv</build_depend>
   <depend>message_generation</depend>
   <depend>roscpp</depend>
   <depend>rospy</depend>
@@ -39,8 +38,7 @@
   <depend>web_video_server</depend>
   <depend>tf2_web_republisher</depend>
   <depend>python-lxml</depend>
-  <test_depend>ros_pytest</test_depend>
-  <!-- <exec_depend>python-pymavlink</exec_depend> -->
+  <exec_depend>python-pymavlink</exec_depend>
   <!-- Use test_depend for packages you need only for testing: -->
   <!--   <test_depend>gtest</test_depend> -->
 
@@ -48,6 +46,5 @@
   <export>
     <nodelet plugin="${prefix}/nodelet_plugins.xml" />
     <!-- Other tools can request additional information be placed here -->
-    <pip_requirements>requirements.in</pip_requirements>
   </export>
 </package>

clover/requirements.in

@@ -1,13 +0,0 @@
-click>=7.1.2
-docopt>=0.6.2
-flask>=1.1.1
-future>=0.18.2
-geopy>=1.11.0
-itsdangerous>=1.1.0
-jinja2>=2.11.3
-lxml>=4.6.3
-markupsafe>=1.1.1
-pymavlink>=2.4.14
-smbus2>=0.3.0
-vl53l1x>=0.0.5
-werkzeug>=1.0.1

clover/requirements.txt

@@ -0,0 +1,5 @@
+flask==1.1.1
+docopt==0.6.2
+geopy==1.11.0
+smbus2==0.3.0
+VL53L1X==0.0.5

clover/test/basic.py

@@ -28,3 +28,19 @@ def test_simple_offboard_services_available():
 def test_web_video_server(node):
     import urllib2
     urllib2.urlopen("http://localhost:8080").read()
+
+def test_shell(node):
+    execute = rospy.ServiceProxy('exec', srv.Execute)
+    execute.wait_for_service(5)
+
+    res = execute(cmd='echo foo')
+    assert res.code == 0
+    assert res.output == 'foo\n'
+
+    res = execute(cmd='foo')
+    assert res.code == 32512
+    assert res.output == ''
+
+    res = execute(cmd='ls foo')
+    assert res.code == 512
+    assert res.output == ''

clover/www/clover_version

@@ -1 +0,0 @@
-/etc/clover_version

clover/www/index.html

@@ -13,15 +13,15 @@
 
 <div class="version"></div>
 
+<script src="js/roslib.js"></script>
 <script type="text/javascript">
 	document.querySelector("#wvs").href = location.protocol + '//' + location.hostname + ':8080';
 	document.querySelector("#butterfly").href = location.protocol + '//' + location.hostname + ':57575';
 
 	// Determine image version
-	fetch('clover_version').then(function(response) {
-		if (response.status !== 200) return;
-		response.text().then(function(text) {
-			document.querySelector('.version').innerHTML = 'Version: ' + text;
-		});
+	var ros = new ROSLIB.Ros({ url: 'ws://' + location.hostname + ':9090' });
+	var exec = new ROSLIB.Service({ ros: ros, name : '/exec', serviceType : 'clover/Execute' });
+	exec.callService(new ROSLIB.ServiceRequest({ cmd: 'cat /etc/clover_version' }), function(result) {
+		document.querySelector('.version').innerHTML = 'Version: ' + result.output;
 	});
 </script>

clover_blocks/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>clover_blocks</name>
-  <version>0.21.3</version>
+  <version>0.21.1</version>
   <description>Blockly programming support for Clover</description>
   <maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
   <license>MIT</license>

clover_description/package.xml

@@ -1,6 +1,6 @@
 <package format="2">
   <name>clover_description</name>
-  <version>0.21.3</version>
+  <version>0.21.1</version>
   <description>The clover_description package provides URDF models of the Clover series of quadcopters.</description>
 
   <maintainer email="sfalexrog@gmail.com">Alexey Rogachevskiy</maintainer>

clover_simulation/CMakeLists.txt

@@ -52,7 +52,7 @@ target_compile_options(throttling_camera PRIVATE -std=c++11)
 add_dependencies(throttling_camera ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
 
 install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
-install(DIRECTORY models DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+install(DIRECTORY meshes DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
 install(DIRECTORY resources DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
 
 catkin_install_python(PROGRAMS scripts/aruco_gen

clover_simulation/package.xml

@@ -1,6 +1,6 @@
 <package format="2">
     <name>clover_simulation</name>
-    <version>0.21.3</version>
+    <version>0.21.1</version>
     <description>The clover_simulation package provides worlds and launch files for Gazebo.</description>
 
     <maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>