Skip to content

Commit 26c2387

Browse files
committed
Merge branch 'master' into recent-px4
2 parents 4fbc4f6 + 826f631 commit 26c2387

File tree

13 files changed

+28
-22
lines changed

13 files changed

+28
-22
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ on:
77
branches: [ master ]
88

99
jobs:
10-
melodic:
11-
runs-on: ubuntu-latest
12-
steps:
13-
- uses: actions/checkout@v2
14-
- name: Native Melodic build
15-
run: |
16-
docker run --rm -v $(pwd):/root/catkin_ws/src/clover ros:melodic-ros-base /root/catkin_ws/src/clover/builder/standalone-install.sh
10+
# melodic:
11+
# runs-on: ubuntu-latest
12+
# steps:
13+
# - uses: actions/checkout@v2
14+
# - name: Native Melodic build
15+
# run: |
16+
# docker run --rm -v $(pwd):/root/catkin_ws/src/clover ros:melodic-ros-base /root/catkin_ws/src/clover/builder/standalone-install.sh
1717
noetic:
1818
runs-on: ubuntu-latest
1919
steps:

aruco_pose/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>aruco_pose</name>
4-
<version>0.21.1</version>
4+
<version>0.23.0</version>
55
<description>Positioning with ArUco markers</description>
66

77
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>

builder/image-ros.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ echo_stamp "Installing OpenCV 4.2-compatible ROS packages"
9090
apt install -y --no-install-recommends \
9191
ros-${ROS_DISTRO}-compressed-image-transport=1.14.0-0buster \
9292
ros-${ROS_DISTRO}-cv-bridge=1.15.0-0buster \
93-
ros-${ROS_DISTRO}-cv-camera=0.5.0-0buster \
93+
ros-${ROS_DISTRO}-cv-camera=0.5.1-0buster \
9494
ros-${ROS_DISTRO}-image-publisher=1.15.3-0buster \
9595
ros-${ROS_DISTRO}-web-video-server=0.2.1-0buster
9696
apt-mark hold \

builder/test/tests.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,9 @@ rosversion rosshow
5858
rosversion nodelet
5959
rosversion image_view
6060

61+
# validate some versions
62+
[[ $(rosversion cv_camera) == "0.5.1" ]] # patched version with init fix
63+
[[ $(rosversion ws281x) == "0.0.12" ]]
64+
6165
# validate examples are present
6266
[[ $(ls /home/pi/examples/*) ]]

clover/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="3">
33
<name>clover</name>
4-
<version>0.21.1</version>
4+
<version>0.23.0</version>
55
<description>The Clover package</description>
66

77
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>

clover_blocks/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>clover_blocks</name>
4-
<version>0.21.1</version>
4+
<version>0.23.0</version>
55
<description>Blockly programming support for Clover</description>
66
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
77
<license>MIT</license>

clover_description/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package format="2">
22
<name>clover_description</name>
3-
<version>0.21.1</version>
3+
<version>0.23.0</version>
44
<description>The clover_description package provides URDF models of the Clover series of quadcopters.</description>
55

66
<maintainer email="sfalexrog@gmail.com">Alexey Rogachevskiy</maintainer>

clover_simulation/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package format="2">
22
<name>clover_simulation</name>
3-
<version>0.21.1</version>
3+
<version>0.23.0</version>
44
<description>The clover_simulation package provides worlds and launch files for Gazebo.</description>
55

66
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>

docs/en/autolaunch.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Software autorun
66
systemd
77
---
88

9-
Main documentation: [https://wiki.archlinux.org/title/Systemd](https://wiki.archlinux.org/title/Systemd).
9+
Main documentation: https://wiki.archlinux.org/title/Systemd.
1010

1111
All automatically started Clover software is launched as a `clover.service` systemd service.
1212

@@ -54,8 +54,8 @@ The started file must have *permission* to run:
5454
chmod +x my_program.py
5555
```
5656

57-
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:
57+
When scripting languages are used, a <a href="https://en.wikipedia.org/wiki/Shebang_(Unix)">shebang</a> should be placed at the beginning of the file, for example:
5858

5959
```bash
60-
#!/usr/bin/env python
60+
#!/usr/bin/env python3
6161
```

docs/en/frames.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ Main frames in the `clover` package:
99
* `base_link` is rigidly bound to the drone. It is shown by the simplified drone model on the image above;
1010
* `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;
1111
* <a name="navigate_target"></a>`navigate_target` is bound to the current navigation target (as set by the [navigate](simple_offboard.md#navigate) service);
12-
* `setpoint` is current position setpoint.
12+
* `setpoint` is current position setpoint;
13+
* `main_camera_optical` is the coordinate system, [linked to the main camera](camera_setup.md#frame);
1314

1415
Additional frames become available when [ArUco positioning system](aruco.md) is active:
1516

0 commit comments

Comments
 (0)