Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: TCP issues #27

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
9c0cad4
Support distributed PX4 and Gazebo for separated docker containers
Nov 18, 2020
5a93dac
Add initial version of SSRC drone model
Nov 18, 2020
c5249c9
Add camera into jinja (sdf) file
sergehog Dec 10, 2020
b04f477
ROS2 modifications to camera plugin
sergehog Dec 16, 2020
4af2273
ROS2 camera replaced with GST camera
Dec 30, 2020
bb25706
Add gazebo_group_pos_plugin
Jan 22, 2021
223a96e
Add empty_ssrc.world to use group_pos world plugin
Jan 22, 2021
901e248
Fix namePrefix for group_pos_plugin
Jan 27, 2021
89607b2
Hardware acceleration for H264 encoding
maseabunikie Mar 24, 2021
1f8d477
Default configuration is software encoding
maseabunikie Mar 24, 2021
303a587
Update .gitignore with ssrc_fog_x.sdf
Mar 29, 2021
b97b770
add x500 model
stibipet Apr 20, 2021
d551567
Revert "add x500 model"
Jun 15, 2021
ed603af
update ssrc_fog_x model
stibipet May 20, 2021
9173665
increase model weight, reduce bouncing when landed
stibipet Jun 4, 2021
eb2d13c
Add lockstep to jinja script and ssrc_fog_x model
Oct 5, 2021
e00d8f7
Enable mesh_sim_plugin in empty_ssrc.world
lassilaiho Nov 15, 2021
86edc65
Update jinja_gen and ssrc_fog_x sdf from dronsole
Dec 7, 2021
07a14f0
Add mavlink_hostname element parsing
Dec 7, 2021
19ced0d
Update ssrc_fog_x model and jinja_gen script for mavlink_hostname
Dec 7, 2021
e3488df
GPS Plugin: ROS2 Service for Activation & Spoofing
aravindraja93 Dec 8, 2021
4cf49f4
Merge pull request #14 from aravindraja93/gps_attack
Dec 8, 2021
a632b56
Add gazebo-ros include dir into CMakeLists.txt for gps plugin
Dec 14, 2021
a68689b
Fix sdf files according to validity check results
Jan 26, 2022
12ece55
Cleanup github workflows
Jan 26, 2022
3f05ad8
Delay mavlink_interface loading if hostname not resolved yet
Jan 13, 2022
b59daed
Replace gst_camera_plugin with gazebo_ros_camera in ssrc_fog_x
lassilaiho Feb 9, 2022
e06e237
Update empty_ssrc.world mesh sim configuration
lassilaiho Feb 9, 2022
ab7365b
Add TCP client mode support to mavlink plugin
Feb 17, 2022
e947c46
Add tcp_client_mode mavlink parameter to ssrc_fog_x sdf
Feb 17, 2022
ae08664
Merge pull request #18 from tiiuae/DP-2268-gazebo-mavlink-plugin-tcp-…
Feb 17, 2022
73087dd
Mavlink plugin: UDP/TCP message receiver running separate thread
Feb 18, 2022
f4c2536
Mavlink plugin: Use queue instead of vector for recv_buffer
Feb 18, 2022
fda685c
Mavlink plugin: Use shared_ptr for recv queue messages
Feb 18, 2022
f198554
Mavlink plugin: rename receiver class members
Feb 18, 2022
1aac228
Mavlink plugin: UDP/TCP message sender running separate thread
Feb 18, 2022
731f83a
Mavlink plugin: sender and receiver threads for UDP transport
Feb 18, 2022
dcac174
Fix double network-to-host conversion for mavlink address
Feb 22, 2022
c56a2fa
GPS plugin: Service to enable/disable debug printing
Feb 21, 2022
502a0fb
Increase send buffer size
Feb 23, 2022
f6a144d
Direct sensor message sending switched to use sender thread and send …
Feb 23, 2022
7dcc3ee
Merge pull request #19 from tiiuae/DP-2269-gazebo-mavlink-plugin-rece…
Feb 23, 2022
56b015a
Use diffent plugin for the garmin rangefinder. Mavlink plugin is now …
spurnvoj Feb 28, 2022
3e71331
updated rate of gps topic to 10Hz
spurnvoj Feb 28, 2022
1d858e3
parametrize component values
stibipet Mar 4, 2022
0c803d5
update motor scaling
stibipet Mar 4, 2022
7a88eae
enable camera
stibipet Mar 4, 2022
f1c0053
renamed rplidar link and joint to 2d_scanner link and joint.
spurnvoj Mar 4, 2022
f17da1b
manually merge tiiuae/master to fly4future/ssrc_model_upgrade
stibipet Mar 8, 2022
dd8b023
resolve merge conflicts
stibipet Mar 8, 2022
dbfaac7
Fixed missing curly brackets
spurnvoj Apr 1, 2022
07766bd
Merge pull request #21 from fly4future/distance_sensor_fix
Apr 6, 2022
bd19da3
Merge pull request #22 from fly4future/tiiuae-master
Apr 6, 2022
beacf41
Fix TCP receive message corruption
Apr 29, 2022
3371442
Merge pull request #24 from tiiuae/fix-tcp-rcv-msg-corruption
Apr 29, 2022
f6e55b3
Fix Mavlink message finalization issue
May 16, 2022
8c8850f
Fix uninitialized variable
solita-ilkkas May 21, 2022
e0f4ef5
Temporary fix for OnUpdate lockstep freeze
solita-ilkkas May 21, 2022
17bd4ba
Fixed log entries not gettings flushed
solita-ilkkas May 21, 2022
430f517
Revert "Fix Mavlink message finalization issue"
solita-ilkkas May 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions .github/workflows/build_test.yml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/build_test_macos.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/catkin_build_test.yml

This file was deleted.

85 changes: 0 additions & 85 deletions .github/workflows/firmware_build_test.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/tii-build-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: TII Build Test

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build-test:
runs-on: ubuntu-latest
steps:
- name: Checkout mavlink-router
uses: actions/checkout@v2
with:
submodules: recursive

- uses: docker/setup-buildx-action@v1

- name: Build PX4-SITL_gazebo
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile.build_test
push: false
25 changes: 25 additions & 0 deletions .github/workflows/tii-validate_sdf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: TII Validate SDF files

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
validate-sdf:
runs-on: ubuntu-latest
steps:
- name: Checkout mavlink-router
uses: actions/checkout@v2
with:
submodules: recursive

- uses: docker/setup-buildx-action@v1

- name: Generate SDF files and validate
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile.validate_sdf
push: false
21 changes: 0 additions & 21 deletions .github/workflows/validate_sdf.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ models/boat/boat.sdf
models/typhoon_h480/typhoon_h480.sdf
models/depth_camera/depth_camera.sdf
models/standard_vtol_drop/standard_vtol_drop.sdf
models/ssrc_fog_x/ssrc_fog_x.sdf
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ option(SEND_ODOMETRY_DATA "Send Mavlink ODOMETRY msgs" OFF)
find_package(Boost 1.58 REQUIRED COMPONENTS system thread filesystem)
find_package(gazebo REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(gazebo_ros REQUIRED)
find_package(std_srvs REQUIRED)
pkg_search_module(GLIB REQUIRED glib-2.0)
# Note: If using catkin, Python 2 is found since it points
# to the Python libs installed with the ROS distro
Expand Down Expand Up @@ -194,6 +196,7 @@ include_directories(
${OpenCV_INCLUDE_DIRS}
${OpticalFlow_INCLUDE_DIRS}
${TinyXML_INCLUDE_DIRS}
${gazebo_ros_INCLUDE_DIRS}
)

if (GSTREAMER_FOUND)
Expand Down Expand Up @@ -368,12 +371,14 @@ add_library(gazebo_usv_dynamics_plugin SHARED src/gazebo_usv_dynamics_plugin.cpp
add_library(gazebo_parachute_plugin SHARED src/gazebo_parachute_plugin.cpp)
add_library(gazebo_airship_dynamics_plugin SHARED src/gazebo_airship_dynamics_plugin.cpp)
add_library(gazebo_drop_plugin SHARED src/gazebo_drop_plugin.cpp)
add_library(gazebo_group_pos_plugin SHARED src/gazebo_group_pos_plugin.cpp)

set(plugins
gazebo_airspeed_plugin
gazebo_camera_manager_plugin
gazebo_gps_plugin
gazebo_groundtruth_plugin
gazebo_group_pos_plugin
gazebo_irlock_plugin
gazebo_lidar_plugin
gazebo_opticalflow_mockup_plugin
Expand Down
28 changes: 28 additions & 0 deletions Dockerfile.build_test
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM ros:galactic-ros-base

ENV LANG C.UTF-8
ENV LANGUAGE C.UTF-8
ENV LC_ALL C.UTF-8

RUN apt-get update -y && apt-get install -y --no-install-recommends \
build-essential git wget cmake lsb-core ninja-build \
ros-galactic-gazebo-ros \
libopencv-dev \
libgstreamer-plugins-base1.0-dev \
python3-jinja2 \
&& rm -rf /var/lib/apt/lists/*

RUN git clone -q https://github.com/mavlink/c_library_v2.git /usr/local/include/mavlink/v2.0 && \
cd /usr/local/include/mavlink/v2.0 && git checkout -q f03d91ae932dd718d81f851b584dbd21cffafdd2 && \
rm -rf /usr/local/include/mavlink/v2.0/.git

WORKDIR /px4_sitl_gazebo
COPY . .

SHELL ["/bin/bash", "-c"]

RUN source /opt/ros/galactic/setup.bash && \
mkdir -p build && \
cd build && \
cmake .. && \
make -j $(nproc)
30 changes: 30 additions & 0 deletions Dockerfile.validate_sdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM ros:galactic-ros-base

ENV LANG C.UTF-8
ENV LANGUAGE C.UTF-8
ENV LC_ALL C.UTF-8

RUN apt-get update -y && apt-get install -y --no-install-recommends \
build-essential git wget cmake lsb-core ninja-build \
ros-galactic-gazebo-ros \
libopencv-dev \
libgstreamer-plugins-base1.0-dev \
python3-jinja2 \
&& rm -rf /var/lib/apt/lists/*

RUN git clone -q https://github.com/mavlink/c_library_v2.git /usr/local/include/mavlink/v2.0 && \
cd /usr/local/include/mavlink/v2.0 && git checkout -q f03d91ae932dd718d81f851b584dbd21cffafdd2 && \
rm -rf /usr/local/include/mavlink/v2.0/.git

WORKDIR /px4_sitl_gazebo
COPY . .

SHELL ["/bin/bash", "-c"]

RUN source /opt/ros/galactic/setup.bash && \
mkdir -p build && \
cd build && \
cmake .. && \
make models_gen

RUN source scripts/validate_sdf.bash
Loading