Try to fix

This reverts commit f25816f2d5.

builder/image-build.sh

@@ -15,7 +15,7 @@
 
 set -e # Exit immidiately on non-zero result
 
-SOURCE_IMAGE="https://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2020-02-14/2020-02-13-raspbian-buster-lite.zip"
+SOURCE_IMAGE="https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-01-12/2021-01-11-raspios-buster-armhf-lite.zip"
 
 export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:='noninteractive'}
 export LANG=${LANG:='C.UTF-8'}

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

builder/image-software.sh

@@ -82,6 +82,9 @@ apt-get update
 
 # Let's retry fetching those packages several times, just in case
 echo_stamp "Software installing"
+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 +98,6 @@ git \
 dnsmasq  \
 tmux \
 vim \
-cmake \
 libjpeg8 \
 tcpdump \
 ltrace \
@@ -123,10 +125,11 @@ 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
-#my_travis_retry pip install --upgrade pip
+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
 
 echo_stamp "Make sure both pip and pip3 are installed"
@@ -135,6 +138,7 @@ pip3 --version
 
 echo_stamp "Install and enable Butterfly (web terminal)"
 echo_stamp "Workaround for tornado >= 6.0 breaking butterfly"
+export CRYPTOGRAPHY_DONT_BUILD_RUST=1
 my_travis_retry pip3 install tornado==5.1.1
 my_travis_retry pip3 install butterfly
 my_travis_retry pip3 install butterfly[systemd]

builder/standalone-install.sh

@@ -5,7 +5,7 @@ set -e
 # Step 1: Install pip
 apt update
 apt install -y curl
-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-pip.py
 python ./get-pip.py
 
 # Step 1.5: Add deb.coex.tech to apt

docs/clover.js

@@ -8,7 +8,7 @@ gitbook.events.bind('page.change', function() {
 		// look for stable release
 		let stable;
 		for (let release of data) {
-			let clever = release.name.indexOf('clever') != -1;
+			let clever = (release.name.indexOf('clover') != -1) || (release.name.indexOf('clever') != -1);
 			if (clever && !release.prerelease && !release.draft) {
 				stable = release;
 				break;

docs/en/SUMMARY.md

@@ -54,6 +54,8 @@
   * [MAVROS](mavros.md)
 * [Supplementary materials](supplementary.md)
   * [COEX Pix](coex_pix.md)
+  * [COEX PDB](coex_pdb.md)
+  * [COEX GPS](coex_gps.md)
   * [Guide on autonomous flight](auto_setup.md)
   * [Hostname](hostname.md)
   * [PX4 Simulation](sitl.md)

docs/en/coex_gps.md

@@ -0,0 +1,13 @@
+# COEX GPS
+
+The GNSS receiver **COEX GPS** is compatible with the [COEX Pix](coex_pix.md) flight controller. This receiver comes with a COEX Clover Drone Kit.
+
+## Port pinouts
+
+### Top view
+
+<img src="../assets/coex_gps/coex-gps-top.png" width=400 class=zoom>
+
+### Bottom view
+
+<img src="../assets/coex_gps/coex-gps-bottom.png" width=400 class=zoom>

docs/en/coex_pdb.md

@@ -0,0 +1,15 @@
+# COEX PDB
+
+**COEX PDB** is the power distribution board used in [Clover 4 Drone kit](assemble_4_2.md).
+
+Board size: 35x35 mm.
+
+## Port pinouts
+
+### Top view
+
+<img src="../assets/coex_pdb/coex-pdb-top.png" width=400 class=zoom>
+
+### Bottom view
+
+<img src="../assets/coex_pdb/coex-pdb-bottom.png" width=400 class=zoom>

docs/en/sonar.md

@@ -12,11 +12,11 @@ The distance gage is attached to the body using double-sided tape. For obtaining
 
 ### Connection
 
-Connect HC-SR04 to Raspberry Pi according to the connection diagram. Use 1.0 and 2.2 kΩ resistors and any free GPIO pins, e.g., 23 and 24:
+Connect HC-SR04 to Raspberry Pi according to the connection diagram. Use 1.0 and 2.2 kΩ resistors and any free GPIO pins, e.g., 23 and 24:
 
 <img src="../assets/raspberry-hc-sr04.png" alt="Connecting HC-SR04" height=600>
 
-> **Hint** Instead of a 2.2 kΩ resistor, you can use two 1 kΩ resistors connected in series.
+> **Hint** Instead of a 2.2 kΩ resistor, you can use two 1 kΩ resistors connected in series.
 
 <!-- -->
 
@@ -54,8 +54,8 @@ import time
 import threading
 import pigpio
 
-TRIG = 23 is the No. of the pin connected to the Trig contact of the distance gage
-TRIG = 24 is the No. of the pin connected to the Echo contact of the distance gage
+TRIG = 23  # pin connected to the Trig pin of the sonar
+ECHO = 24  # pin connected to the Echo pin of the sonar
 
 pi = pigpio.pi()
 done = threading.Event()

docs/ru/SUMMARY.md

@@ -54,6 +54,8 @@
   * [MAVROS](mavros.md)
 * [Дополнительные материалы](supplementary.md)
   * [COEX Pix](coex_pix.md)
+  * [COEX PDB](coex_pdb.md)
+  * [COEX GPS](coex_gps.md)
   * [Гид по автономному полету](auto_setup.md)
   * [Имя хоста](hostname.md)
   * [Симулятор](sitl.md)

docs/ru/coex_gps.md

@@ -0,0 +1,13 @@
+# COEX GPS
+
+ГНСС-приемник **COEX GPS** совместим с полетным контроллером [COEX Pix](coex_pix.md). Этот приемник поставляется с наборами COEX Клевер 4 Pro.
+
+## Схемы расположения контактов
+
+### Вид сверху
+
+<img src="../assets/coex_gps/coex-gps-top.png" width=400 class=zoom>
+
+### Вид снизу
+
+<img src="../assets/coex_gps/coex-gps-bottom.png" width=400 class=zoom>

docs/ru/coex_pdb.md

@@ -0,0 +1,15 @@
+# COEX PDB
+
+**COEX PDB** (Power Distribution Board) – плата распределения питания для квадрокоптеров <a href="assemble_4_2.md">Клевер&nbsp;4</a>.
+
+Габаритные размеры платы: 35x35 мм.
+
+## Схемы расположения контактов
+
+### Вид сверху
+
+<img src="../assets/coex_pdb/coex-pdb-top.png" width=400 class=zoom>
+
+### Вид снизу
+
+<img src="../assets/coex_pdb/coex-pdb-bottom.png" width=400 class=zoom>

docs/ru/projects.md

@@ -13,7 +13,7 @@
 |Интеграция системы позиционирования [Pozyx](https://www.pozyx.io)|[Наработки](https://github.com/goldarte/pozyx_clever).|
 |Интеграция системы позиционирования типа Motion Capture||
 |Разработка и интеграция дешевого Motion Capture||
-|Интеграция блочного программирования (Scratch, Blockly)|[Решение с программы стажировок](clever_blocks.md). Официальное решение COEX [в разработке](https://github.com/CopterExpress/clover/tree/blockly).|
+|Интеграция блочного программирования (Scratch, Blockly)|[Решение от COEX](blocks.md).|
 |Улучшение алгоритма визуального позиционирования (optical flow): трекинг по фичам, расчет угла по yaw||
 |Симулятор Клевера|[Решение от COEX](https://github.com/CopterExpress/clover_vm) (на основе Gazebo). Проект продолжает разрабатываться.|
 |Облачная платформа для симулятора Клевера|По аналогии или на основе [ROS Development Studio](http://rosds.online/).|