diff --git a/builder/assets/animation_map.txt b/builder/assets/animation_map.txt new file mode 100644 index 0000000..8e04a74 --- /dev/null +++ b/builder/assets/animation_map.txt @@ -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 diff --git a/builder/image-build.sh b/builder/image-build.sh index fb40a10..5432a5f 100755 --- a/builder/image-build.sh +++ b/builder/image-build.sh @@ -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} diff --git a/builder/image-configure.sh b/builder/image-configure.sh index 1274256..4e3273e 100755 --- a/builder/image-configure.sh +++ b/builder/image-configure.sh @@ -46,10 +46,5 @@ sed -i '/' /home/pi/c sed -i '/' /home/pi/catkin_ws/src/clever/clever/launch/clever.launch #sed -i '/' /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" diff --git a/builder/image-software.sh b/builder/image-software.sh index 13f5426..cbe11bb 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -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"