diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d7654c4..29b305d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,13 +7,13 @@ on: branches: [ master ] jobs: - melodic: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Native Melodic build - run: | - docker run --rm -v $(pwd):/root/catkin_ws/src/clover ros:melodic-ros-base /root/catkin_ws/src/clover/builder/standalone-install.sh + # melodic: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v2 + # - name: Native Melodic build + # run: | + # docker run --rm -v $(pwd):/root/catkin_ws/src/clover ros:melodic-ros-base /root/catkin_ws/src/clover/builder/standalone-install.sh noetic: runs-on: ubuntu-latest steps: diff --git a/aruco_pose/package.xml b/aruco_pose/package.xml index 43f08abe..03977753 100644 --- a/aruco_pose/package.xml +++ b/aruco_pose/package.xml @@ -1,7 +1,7 @@ aruco_pose - 0.21.1 + 0.23.0 Positioning with ArUco markers Oleg Kalachev diff --git a/builder/image-ros.sh b/builder/image-ros.sh index e98934db..afa369b5 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -90,7 +90,7 @@ echo_stamp "Installing OpenCV 4.2-compatible ROS packages" apt install -y --no-install-recommends \ ros-${ROS_DISTRO}-compressed-image-transport=1.14.0-0buster \ ros-${ROS_DISTRO}-cv-bridge=1.15.0-0buster \ -ros-${ROS_DISTRO}-cv-camera=0.5.0-0buster \ +ros-${ROS_DISTRO}-cv-camera=0.5.1-0buster \ ros-${ROS_DISTRO}-image-publisher=1.15.3-0buster \ ros-${ROS_DISTRO}-web-video-server=0.2.1-0buster apt-mark hold \ diff --git a/builder/test/tests.sh b/builder/test/tests.sh index 70616eaa..93e6ea87 100755 --- a/builder/test/tests.sh +++ b/builder/test/tests.sh @@ -58,5 +58,9 @@ rosversion rosshow rosversion nodelet rosversion image_view +# validate some versions +[[ $(rosversion cv_camera) == "0.5.1" ]] # patched version with init fix +[[ $(rosversion ws281x) == "0.0.12" ]] + # validate examples are present [[ $(ls /home/pi/examples/*) ]] diff --git a/clover/package.xml b/clover/package.xml index a4f5878b..33ac4f7f 100644 --- a/clover/package.xml +++ b/clover/package.xml @@ -1,7 +1,7 @@ clover - 0.21.1 + 0.23.0 The Clover package Oleg Kalachev diff --git a/clover_blocks/package.xml b/clover_blocks/package.xml index aa618f86..384d75f9 100644 --- a/clover_blocks/package.xml +++ b/clover_blocks/package.xml @@ -1,7 +1,7 @@ clover_blocks - 0.21.1 + 0.23.0 Blockly programming support for Clover Oleg Kalachev MIT diff --git a/clover_description/package.xml b/clover_description/package.xml index 4de6b9ea..1e5db705 100644 --- a/clover_description/package.xml +++ b/clover_description/package.xml @@ -1,6 +1,6 @@ clover_description - 0.21.1 + 0.23.0 The clover_description package provides URDF models of the Clover series of quadcopters. Alexey Rogachevskiy diff --git a/clover_simulation/package.xml b/clover_simulation/package.xml index 8771151b..a7d27462 100644 --- a/clover_simulation/package.xml +++ b/clover_simulation/package.xml @@ -1,6 +1,6 @@ clover_simulation - 0.21.1 + 0.23.0 The clover_simulation package provides worlds and launch files for Gazebo. Oleg Kalachev diff --git a/docs/en/autolaunch.md b/docs/en/autolaunch.md index 6fe295cb..530449d6 100644 --- a/docs/en/autolaunch.md +++ b/docs/en/autolaunch.md @@ -6,7 +6,7 @@ Software autorun systemd --- -Main documentation: [https://wiki.archlinux.org/title/Systemd](https://wiki.archlinux.org/title/Systemd). +Main documentation: https://wiki.archlinux.org/title/Systemd. All automatically started Clover software is launched as a `clover.service` systemd service. @@ -54,8 +54,8 @@ The started file must have *permission* to run: chmod +x my_program.py ``` -When scripting languages are used, a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) should be placed at the beginning of the file, for example: +When scripting languages are used, a shebang should be placed at the beginning of the file, for example: ```bash -#!/usr/bin/env python +#!/usr/bin/env python3 ``` diff --git a/docs/en/frames.md b/docs/en/frames.md index 7eab6f12..0482fe32 100644 --- a/docs/en/frames.md +++ b/docs/en/frames.md @@ -9,7 +9,8 @@ Main frames in the `clover` package: * `base_link` is rigidly bound to the drone. It is shown by the simplified drone model on the image above; * `body` is bound to the drone, but its Z axis points up regardless of the drone's pitch and roll. It is shown by the red, blue and green lines in the illustration; * `navigate_target` is bound to the current navigation target (as set by the [navigate](simple_offboard.md#navigate) service); -* `setpoint` is current position setpoint. +* `setpoint` is current position setpoint; +* `main_camera_optical` is the coordinate system, [linked to the main camera](camera_setup.md#frame); Additional frames become available when [ArUco positioning system](aruco.md) is active: diff --git a/docs/ru/autolaunch.md b/docs/ru/autolaunch.md index f840f8a1..7afbbcae 100644 --- a/docs/ru/autolaunch.md +++ b/docs/ru/autolaunch.md @@ -6,7 +6,7 @@ systemd --- -Основная документация: [https://wiki.archlinux.org/index.php/Systemd_(Русский)](https://wiki.archlinux.org/index.php/Systemd_(Русский)). +Основная документация: https://wiki.archlinux.org/index.php/Systemd_(Русский). Все автоматически стартуемое ПО Клевера запускается в виде systemd-сервиса `clover.service`. @@ -54,8 +54,8 @@ roslaunch chmod +x my_program.py ``` -При использовании скриптовых языков вначале файла должен стоять [shebang](https://ru.wikipedia.org/wiki/Шебанг_(Unix)), например: +При использовании скриптовых языков вначале файла должен стоять shebang, например: ```bash -#!/usr/bin/env python +#!/usr/bin/env python3 ``` diff --git a/docs/ru/frames.md b/docs/ru/frames.md index 6bc760fc..19a8b119 100644 --- a/docs/ru/frames.md +++ b/docs/ru/frames.md @@ -11,7 +11,8 @@ * `base_link` — координаты относительно квадрокоптера: схематичное изображение квадрокоптера на иллюстрации; * `body` — координаты относительно квадрокоптера без учета наклонов по тангажу и крену: красная, синяя и зеленая линии на иллюстрации; * `navigate_target` – координаты точки, в которую сейчас летит дрон (с использованием [navigate](simple_offboard.md#navigate)); -* `setpoint` – текущий setpoint по позиции. +* `setpoint` – текущий setpoint по позиции; +* `main_camera_optical` – система координат, [связанная с основной камерой](camera_setup.md#frame). При использовании [системы позиционирования по ArUco-маркерам](aruco.md) появляются дополнительные фреймы: diff --git a/roswww_static/package.xml b/roswww_static/package.xml index b696c6c7..b98dba6a 100644 --- a/roswww_static/package.xml +++ b/roswww_static/package.xml @@ -1,7 +1,7 @@ roswww_static - 0.21.1 + 0.23.0 Static web pages for ROS packages Oleg Kalachev MIT