Merge branch 'master' into 22-armhf

builder/assets/examples/flight_marker.py

@@ -1,4 +1,4 @@
-# Information: https://clover.coex.tech/en/aruco.html
+# Information: https://clover.coex.tech/aruco
 
 import rospy
 from clover import srv

builder/assets/examples/leds.py

@@ -1,4 +1,4 @@
-# Information: https://clover.coex.tech/en/leds.html
+# Information: https://clover.coex.tech/led
 
 import rospy
 from clover.srv import SetLEDEffect

builder/image-software.sh

@@ -121,9 +121,10 @@ sed -i "s/updates_available//" /usr/share/byobu/status/status
 
 echo_stamp "Installing pip"
 curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip2.py
 python3 get-pip.py
-python get-pip.py
-rm get-pip.py
+python get-pip2.py
+rm get-pip.py get-pip2.py
 #my_travis_retry pip install --upgrade pip
 #my_travis_retry pip3 install --upgrade pip
 

builder/standalone-install.sh

@@ -6,13 +6,7 @@ set -e
 apt update
 apt install -y curl
 curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-if [ "x${ROS_PYTHON_VERSION}" = "x3" ]; then
-  PYTHON=python3
-else
-  PYTHON=python
-fi
-
-${PYTHON} ./get-pip.py
+python3 ./get-pip.py
 
 # Step 1.5: Add deb.coex.tech to apt
 curl http://deb.coex.tech/aptly_repo_signing.key 2> /dev/null | apt-key add -

builder/test/tests.py

@@ -25,7 +25,7 @@ import pymavlink
 from pymavlink import mavutil
 import rpi_ws281x
 import pigpio
-from espeak import espeak
+# from espeak import espeak
 from pyzbar import pyzbar
 
 print(cv2.getBuildInformation())

builder/test/tests.sh

@@ -32,7 +32,7 @@ monkey --version
 pigpiod -v
 i2cdetect -V
 butterfly -h
-espeak --version
+# espeak --version
 mjpg_streamer --version
 
 # ros stuff