Skip to content

Commit 869de56

Browse files
dbaldwinryanerath
andauthored
DEXI ROS v0.07 (#96)
* pigpiod for servo control (#67) * Feature/calibration arducam imx519 (#69) * Initial docs for Arducam IMX519 16mp camera * Arducam IMX519 16MP calibration files * Feature/offboard navigation manager (#87) * Offboard navigation based on Casey's node * Utils refactoring * Explicit start/stop offboard commands * Offboard heartbeat example * Takeoff and land example * Add logging * Fly forward WIP * Comments * Offboard fly forward example * Offboard SITL launch file * Make offboard heartbeat more verbose * SITL docs (#89) * Docker pull notes based on system architecture * Update container URL to use HTTP instead of HTTPS Changed the container URL from https://localhost:6080 to http://localhost:6080 * SITL and Offboard docs WIP * Fix path * Unnecessary imports * Update px4_msgs to release/1.15 (#93) * Change to ubuntu home directory * Offboard SITL docs WIP * Cleanup * Takeoff and land docs * Offboard fly forward docs * pigpiod for servo control (#95) * Offboard fly foward docs * SITL offboard launchfile * Typo * Fixes NV21 format error with cv_bridge * Offboard box mission, rosbridge for node-red * Precision * Compressed format for lower bandwidth * Disable pigpiod for now --------- Co-authored-by: ryanerath <110474861+ryanerath@users.noreply.github.com>
1 parent a6c4dfd commit 869de56

26 files changed

+1388
-226
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# oST version 5.0 parameters
2+
3+
4+
[image]
5+
6+
width
7+
640
8+
9+
height
10+
480
11+
12+
[narrow_stereo]
13+
14+
camera matrix
15+
782.063681 0.000000 445.198357
16+
0.000000 777.530039 216.421280
17+
0.000000 0.000000 1.000000
18+
19+
distortion
20+
-0.236864 0.026662 0.001547 -0.000429 0.000000
21+
22+
rectification
23+
1.000000 0.000000 0.000000
24+
0.000000 1.000000 0.000000
25+
0.000000 0.000000 1.000000
26+
27+
projection
28+
729.889711 0.000000 455.309981 0.000000
29+
0.000000 758.696695 215.663313 0.000000
30+
0.000000 0.000000 1.000000 0.000000
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
image_width: 640
2+
image_height: 480
3+
camera_name: narrow_stereo
4+
camera_matrix:
5+
rows: 3
6+
cols: 3
7+
data: [782.06368, 0. , 445.19836,
8+
0. , 777.53004, 216.42128,
9+
0. , 0. , 1. ]
10+
distortion_model: plumb_bob
11+
distortion_coefficients:
12+
rows: 1
13+
cols: 5
14+
data: [-0.236864, 0.026662, 0.001547, -0.000429, 0.000000]
15+
rectification_matrix:
16+
rows: 3
17+
cols: 3
18+
data: [1., 0., 0.,
19+
0., 1., 0.,
20+
0., 0., 1.]
21+
projection_matrix:
22+
rows: 3
23+
cols: 4
24+
data: [729.88971, 0. , 455.30998, 0. ,
25+
0. , 758.6967 , 215.66331, 0. ,
26+
0. , 0. , 1. , 0. ]

dexi/launch/camera.launch.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<param name="camera" value="0" />
1818
<param name="width" value="640" />
1919
<param name="height" value="480" />
20+
<param name="format" value="BGR888" />
21+
<param name="jpeg_quality" value="50" />
2022
</node>
2123

2224
<!-- Camera 1 node -->
@@ -26,6 +28,8 @@
2628
<param name="camera" value="1" />
2729
<param name="width" value="640" />
2830
<param name="height" value="480" />
31+
<param name="format" value="BGR888" />
32+
<param name="jpeg_quality" value="50" />
2933
</node>
3034

3135
<!-- Web video server node -->

dexi/launch/dexi.launch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<let name="offboard" value="true" />
88

99
<!-- These can be passed in from command line -->
10-
<!-- ros2 launch dennis_launch_file dexi.launch.xml cam0:=true cam1:=false gpio:=true apriltags:=true -->
10+
<!-- ros2 launch dexi dexi.launch.xml cam0:=true cam1:=false gpio:=true apriltags:=true -->
1111
<arg name="cam0" default="true" />
1212
<arg name="cam1" default="false" />
1313
<arg name="gpio" default="false" />

dexi/scripts/install.bash

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ echo Setting up dexi.service...
44

55
sudo cp "$(dirname "$0")/dexi.service" /etc/systemd/system/
66
sudo cp "$(dirname "$0")/dexi_avr.service" /etc/systemd/system/
7+
sudo cp "$(dirname "$0")/pigpiod.service" /etc/systemd/system/
78

89
sudo systemctl daemon-reload
910
sudo systemctl enable dexi.service
1011
sudo systemctl restart dexi.service
12+
#sudo systemctl enable pigpiod.service
13+
#sudo systemctl restart pigpiod.service
1114

1215
#sudo systemctl disable dexi.service
13-
#sudo systemctl enable dexi_avr.service
16+
#sudo systemctl enable dexi_avr.service

dexi/scripts/pigpiod.service

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[Unit]
2+
Description=Pigpio daemon
3+
4+
[Service]
5+
Type=forking
6+
PIDFile=pigpio.pid
7+
ExecStart=/usr/local/bin/pigpiod
8+
9+
[Install]
10+
WantedBy=multi-user.target

dexi_interfaces

dexi_py/dexi_py/led_flight_mode_status.py

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import rclpy
22
from rclpy.node import Node
33
from std_msgs.msg import String
4-
from enum import IntEnum
5-
4+
from .utils.flight_mode import FlightMode
65
from rclpy.qos import QoSProfile, ReliabilityPolicy, HistoryPolicy, DurabilityPolicy
76
from px4_msgs.msg import VehicleStatus
87

@@ -28,32 +27,6 @@
2827
BLACK
2928
)
3029

31-
# These map to PX4 msgs VechicleStatus nav_state
32-
class FlightMode(IntEnum):
33-
MANUAL = 0
34-
ALTITUDE = 1
35-
POSITION = 2
36-
MISSION = 3
37-
HOLD = 4
38-
RTL = 5
39-
SLOW = 6
40-
FREE5 = 7
41-
FREE4 = 8
42-
FREE3 = 9
43-
ACRO = 10
44-
FREE2 = 11
45-
DESCEND = 12
46-
TERMINATION = 13
47-
OFFBOARD = 14
48-
STABILIZED = 15
49-
FREE1 = 16
50-
TAKEOFF = 17
51-
LAND = 18
52-
TARGET = 19
53-
PRECLAND = 20
54-
ORBIT = 21
55-
VTOL_TAKOFF = 22
56-
5730
class LEDFlightModeStatus(Node):
5831

5932
def __init__(self):

dexi_py/dexi_py/offboard.py

Lines changed: 0 additions & 172 deletions
This file was deleted.

0 commit comments

Comments
 (0)