Merge with master

builder/assets/clever-show.service

@@ -1,8 +1,7 @@
 [Unit]
 Description=Clever Show Client Service
-Requires=clever.service
-Requires=network.target
-After=network.target
+Requires=roscore.service
+After=clever.service
 
 [Service]
 WorkingDirectory=/home/pi/clever-show/Drone

builder/assets/visual_pose_watchdog.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=Visual Pose Watchdog
+Requires=roscore.service
+After=network.target
+
+[Service]
+User=pi
+WorkingDirectory=/home/pi/clever-show/Drone
+ExecStart=/bin/bash -c ". /home/pi/catkin_ws/devel/setup.sh; \
+                      ROS_HOSTNAME=`hostname`.local /usr/bin/python /home/pi/clever-show/Drone/visual_pose_watchdog.py"
+Restart=on-failure
+RestartSec=3
+
+[Install]
+WantedBy=multi-user.target

builder/image-build.sh

@@ -117,8 +117,9 @@ img-chroot ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-software.sh'
 # Configure image
 img-chroot ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-configure.sh'
 
-# Copy service file for clever show client
+# Copy service files for clever show client and visual_pose_watchdog
 img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever-show.service' '/lib/systemd/system/'
+img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/visual_pose_watchdog.service' '/lib/systemd/system/'
 
 # Copy config files for clever
 if [[ -d "${CONFIG_DIR}/launch" ]]; then img-chroot ${IMAGE_PATH} copy ${CONFIG_DIR}'/launch' '/home/pi/catkin_ws/src/clever/clever'; fi

builder/image-software.sh

@@ -61,6 +61,7 @@ chrony \
 
 echo_stamp "Install python libs"
 my_travis_retry pip install selectors2
+my_travis_retry pip install psutil
 
 echo_stamp "Install catkin packages"
 cd /home/pi/catkin_ws/src