CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-05-29 08:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

builder: Update clever image version, add default aruco map for show

Browse Source
This commit is contained in:
Arthur Golubtsov
2019-06-09 14:44:55 +03:00
parent 21a1ac7d3c
commit 09427f32bb
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
builder/assets/animation_map.txt Normal file
View File

@@ -0,0 +1,25 @@
0 0.3375 0.0 4.6 0 0 0 0
1 0.3375 1.15 4.6 0 0 0 0
2 0.3375 2.3 4.6 0 0 0 0
3 0.3375 3.45 4.6 0 0 0 0
4 0.3375 4.6 4.6 0 0 0 0
5 0.3375 0.0 3.45 0 0 0 0
6 0.3375 1.15 3.45 0 0 0 0
7 0.3375 2.3 3.45 0 0 0 0
8 0.3375 3.45 3.45 0 0 0 0
9 0.3375 4.6 3.45 0 0 0 0
10 0.3375 0.0 2.3 0 0 0 0
11 0.3375 1.15 2.3 0 0 0 0
12 0.3375 2.3 2.3 0 0 0 0
13 0.3375 3.45 2.3 0 0 0 0
14 0.3375 4.6 2.3 0 0 0 0
15 0.3375 0.0 1.15 0 0 0 0
16 0.3375 1.15 1.15 0 0 0 0
17 0.3375 2.3 1.15 0 0 0 0
18 0.3375 3.45 1.15 0 0 0 0
19 0.3375 4.6 1.15 0 0 0 0
20 0.3375 0.0 0.0 0 0 0 0
21 0.3375 1.15 0.0 0 0 0 0
22 0.3375 2.3 0.0 0 0 0 0
23 0.3375 3.45 0.0 0 0 0 0
24 0.3375 4.6 0.0 0 0 0 0

3
builder/image-build.sh
View File

@@ -2,7 +2,7 @@
set -e # Exit immidiately on non-zero result
SOURCE_IMAGE="https://github.com/CopterExpress/clever/releases/download/v0.16/clever_v0.16.img.zip"
SOURCE_IMAGE="https://github.com/CopterExpress/clever/releases/download/v0.17/clever_v0.17.img.zip"
export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:='noninteractive'}
export LANG=${LANG:='C.UTF-8'}
@@ -105,6 +105,7 @@ git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
# Copy service file for clever show client
img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever-show.service' '/lib/systemd/system/'
img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/animation_map.txt' '/home/pi/catkin_ws/src/clever/aruco_pose/map/'
# Shrink image
img-resize ${IMAGE_PATH}

5
builder/image-configure.sh
View File

@@ -46,10 +46,5 @@ sed -i '/<arg name="aruco"/c \ <arg name="aruco" default="true"/>' /home/pi/c
sed -i '/<arg name="rangefinder_vl53l1x"/c \ <arg name="rangefinder_vl53l1x" default="true"/>' /home/pi/catkin_ws/src/clever/clever/launch/clever.launch
#sed -i '/<arg name="optical_flow"/c \ <arg name="optical_flow" default="true"/>' /home/pi/catkin_ws/src/clever/clever/launch/clever.launch
# copy office map to animation map if there is no animation map file
if ! [ -f "/home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt" ] ; then
sudo -u pi cp /home/pi/catkin_ws/src/clever/aruco_pose/map/office.txt /home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt
fi
echo_stamp "Image was configured!" "SUCCESS"

2
builder/image-software.sh
View File

@@ -59,12 +59,10 @@ echo_stamp "Software installing"
apt-get install -y \
samba \
chrony \
ros-kinetic-vl53l1x \
&& echo_stamp "Everything was installed!" "SUCCESS" \
|| (echo_stamp "Some packages wasn't installed!" "ERROR"; exit 1)
echo_stamp "Install python libs"
my_travis_retry pip install pause
my_travis_retry pip install selectors2
echo_stamp "End of software installation"