Skip to content

Commit

Permalink
made into ros package, removed old stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Aug 11, 2023
1 parent abb1b28 commit d54d222
Show file tree
Hide file tree
Showing 22 changed files with 66 additions and 828 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/docker_with_linux_setup.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/docker_with_linux_setup_modules.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/docker_without_linux_setup.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/docker_without_linux_setup_modules.yml

This file was deleted.

46 changes: 0 additions & 46 deletions .github/workflows/noetic.yml

This file was deleted.

22 changes: 22 additions & 0 deletions .github/workflows/ros_package_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: ros_package_build

on:

push:
branches: [ 1.5 ]

pull_request:
branches: [ 1.5 ]

workflow_dispatch:

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:

build:
uses: ctu-mrs/ci_scripts/.github/workflows/ros_package_build.yml@master
secrets:
PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}
15 changes: 15 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 3.5)
project(mrs_uav_system)

set(CATKIN_DEPENDENCIES
cmake_modules
rospy
)

find_package(catkin REQUIRED COMPONENTS
${CATKIN_DEPENDENCIES}
)

catkin_package(
CATKIN_DEPENDS ${CATKIN_DEPENDENCIES}
)
61 changes: 6 additions & 55 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,15 @@ Thus our platform is built to allow safe verification of approaches in planning,

These meta-repositories aggregate related packages.

| Component | 20.04 | Description |
|---------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------|
| [mrs_uav_system](https://github.com/ctu-mrs/mrs_uav_system) | [![Build Status](https://github.com/ctu-mrs/mrs_uav_system/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/mrs_uav_system/actions) | Integrates [uav_core](https://github.com/ctu-mrs/uav_core) and [simulation](https://github.com/ctu-mrs/simulation) |
| [uav_core](https://github.com/ctu-mrs/uav_core) | [![Build Status](https://github.com/ctu-mrs/uav_core/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/uav_core/actions) | The minimum needed to fly a drone |
| [simulation](https://github.com/ctu-mrs/simulation) | [![Build Status](https://github.com/ctu-mrs/simulation/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/simulation/actions) | Simulation resources |
| [uav_modules](https://github.com/ctu-mrs/uav_modules) | [![Build Status](https://github.com/ctu-mrs/uav_modules/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/uav_modules/actions) | Optional UAV modules, drivers and utils |
| [octomap_mapping_planning](https://github.com/ctu-mrs/octomap_mapping_planning) | [![Build Status](https://github.com/ctu-mrs/octomap_mapping_planning/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/octomap_mapping_planning/actions) | Octomap Mapping & Planning for UAVs |
| [linux-setup](https://github.com/klaxalk/linux-setup) | [![Build Status](https://github.com/klaxalk/linux-setup/workflows/Focal/badge.svg)](https://github.com/klaxalk/linux-setup/actions) | Tomas's Linux configuration |
TODO

## System properties

The platform is

* built using [Robot Operating System](https://www.ros.org/) Noetic,
* meant to be executed entirely onboard,
* can be deployed on any multi-rotor vehicle, given it is equipped with a [PX4](https://github.com/ctu-mrs/px4_firmware)-compatible [flight controller](https://pixhawk.org/),
* can be deployed on any multi-rotor vehicle, given TODO
* for both indoor and outdoor,
* supports multi-robot experiments using [Nimbro network](https://github.com/ctu-mrs/nimbro_network) communication.
* provides both: agile flying and robust control.
Expand Down Expand Up @@ -112,9 +105,12 @@ Recent changes requiring user action:

## Installation

### Native installation

TODO

### Singularity and Docker

Singularity images with our system are the preferred way how a _normal_ user should interract with our system.
Please, follow this link to learn how to run our system using Singularity.

* [MRS Singularity](https://github.com/ctu-mrs/mrs_singularity/)
Expand All @@ -124,51 +120,6 @@ The following link points to our Docker HUB organization.

* [Docker Images](https://hub.docker.com/u/ctumrs)

### Native installation (not recommended)

Native installation is supported via a set of automated install scripts.
**Beware** the installation will take a **lot of disk space**, is **difficult to remove** from the computer, and is often **difficult to upgrade**.
The native installation is intended mostly for real drones.
Most people should use [MRS Singularity](https://github.com/ctu-mrs/mrs_singularity) for working with the MRS system!

In the you want a native installation case we provide installation scripts that set everything up for you.
Our automated install script will:
* install Robot Operating System (ROS),
* install other dependencies such *git*, *gitman*,
* clone [uav_core](https://github.com/ctu-mrs/uav_core), [simulation](https://github.com/ctu-mrs/simulation), [example_ros_packages](https://github.com/ctu-mrs/example_ros_packages) into *~/git*,
* install more dependencies such as *tmux* and *tmuxinator*
* create our ros workspace ([guide](https://ctu-mrs.github.io/docs/software/catkin/managing_workspaces/managing_workspaces.html)) in ```~/mrs_workspace``` for the *uav_core* and *simulation*,
* create a ros workspace in ```~/workspace``` for *examples* ([guide](https://ctu-mrs.github.io/docs/software/catkin/managing_workspaces/managing_workspaces.html)),
* link our packages to the workspaces ([guide](https://ctu-mrs.github.io/docs/software/catkin/managing_workspaces/managing_workspaces.html)),
* compile the workspaces,
* add configuration lines into your *~/.bashrc*.

To start the automatic installation, please paste the following code into your terminal and press **enter**.
You might be prompted a few times to confirm something by pressing enter:
```bash
cd /tmp
echo '
GIT_PATH=~/git
mkdir -p $GIT_PATH
cd $GIT_PATH
sudo apt-get -y install git
git clone https://github.com/ctu-mrs/mrs_uav_system
cd mrs_uav_system
git checkout master
git pull
./install.sh -g $GIT_PATH
source ~/.bashrc' > clone.sh && source clone.sh
```

#### "I already have ROS and just want to peek in"

If you already have ROS installed and if you are fluent with *workspaces*, *.bashrc*, *catkin tools*, etc., feel free to clone our repositories individually.
The [uav_core](https://github.com/ctu-mrs/uav_core) repository integrates our UAV control system.
Please follow its README for further instructions on how to install its particular dependencies.

The [simulation](https://github.com/ctu-mrs/simulation) repository provides resources for *Gazebo/ROS* simulation, including px4 Simulation-in-the-Loop (SITL), UAV models and useful sensor plugins.
Please follow its README for further instructions on how to install prerequisities.

#### "I want the Linux environment people from MRS works with"

Great! In that case you want to install Tomas's Linux-setup.
Expand Down
13 changes: 0 additions & 13 deletions dependencies/git_lfs.sh

This file was deleted.

26 changes: 0 additions & 26 deletions dependencies/gitman.sh

This file was deleted.

34 changes: 0 additions & 34 deletions dependencies/ros.sh

This file was deleted.

Loading

0 comments on commit d54d222

Please sign in to comment.