Skip to content
Snippets Groups Projects
Commit ec5eafdd authored by Jonas Kvarnström's avatar Jonas Kvarnström
Browse files

Instruction updates

parent dd6cbe15
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ A number of development environments have been set up, adapted to different task ...@@ -4,7 +4,7 @@ A number of development environments have been set up, adapted to different task
Please note that the instructions for the development environments are written for developers. They do not necessarily explain every step in detail and have not necessarily been tested on every combination of hardware, operating system, software setup and so on. You are welcome to contact us for assistance in troubleshooting problems that may arise. Please note that the instructions for the development environments are written for developers. They do not necessarily explain every step in detail and have not necessarily been tested on every combination of hardware, operating system, software setup and so on. You are welcome to contact us for assistance in troubleshooting problems that may arise.
To install a development environment, follow these steps: To install and configure a development environment, follow these steps:
- [Ensure that you have a supported operating system](doc/install_os.md), directly on your hardware or in a virtual machine - [Ensure that you have a supported operating system](doc/install_os.md), directly on your hardware or in a virtual machine
...@@ -14,19 +14,11 @@ To install a development environment, follow these steps: ...@@ -14,19 +14,11 @@ To install a development environment, follow these steps:
- [Install Nvidia Docker drivers](doc/docker_nvidia.md) if you have an Nvidia graphics card and you are not using a virtual machine - [Install Nvidia Docker drivers](doc/docker_nvidia.md) if you have an Nvidia graphics card and you are not using a virtual machine
-
## Development Environments ## Development Environments
- [Using a Local ROS Installation with LRS Docker Modules](doc/local_ros_installation.md) - [Using a Local ROS Installation with LRS Docker Modules](doc/local_ros_installation.md)
The basic idea is that the developer already has a Linux Ubuntu ROS installation
and then either checks out publicly available ROS package repos or
uses Docker to get access to the software that is not publicly available.
When you have a ROS machine,
For more information on how to integrate your code we have split the information in different sub-areas: For more information on how to integrate your code we have split the information in different sub-areas:
- [Development Environment: Gränsö](https://gitlab.liu.se/lrs/lrs_devenv_granso): Sensor simulation in Gränsö doe DJI, MQTT interface also to images - [Development Environment: Gränsö](https://gitlab.liu.se/lrs/lrs_devenv_granso): Sensor simulation in Gränsö doe DJI, MQTT interface also to images
......
...@@ -68,6 +68,16 @@ git pull ...@@ -68,6 +68,16 @@ git pull
ansible-playbook -i hosts playbooks/wara_develop.yml -e user=${USER} -e install_user=${USER} -e ansible_sudo_pass=****** ansible-playbook -i hosts playbooks/wara_develop.yml -e user=${USER} -e install_user=${USER} -e ansible_sudo_pass=******
``` ```
Among other things, this will:
- Install certain software such as cmake, g++, gcc, git, screen, joe if not already installed
- Install the [DJI SDK](https://github.com/dji-sdk/Onboard-SDK.git)
- Install Docker
- Install [ROS 1](https://www.ros.org/)
- Install a number of development repositories for the ROS-based LRS system
- Compile a number of source files
## Finishing Up ## Finishing Up
Add the following commands at the end of the ```~/.bashrc``` file on your development system: Add the following commands at the end of the ```~/.bashrc``` file on your development system:
......
...@@ -70,7 +70,7 @@ docker exec -it lrsdevel "$@" ...@@ -70,7 +70,7 @@ docker exec -it lrsdevel "$@"
### wgrun ### wgrun
Start a docker container named lrsdevel and run the commands there. Use this if you have NVIDIA graphics. Start a docker container named `lrsdevel` and run the commands there. Use this if you have NVIDIA graphics.
```bash ```bash
#!/bin/bash #!/bin/bash
...@@ -225,7 +225,7 @@ Gränsö: ...@@ -225,7 +225,7 @@ Gränsö:
wexec roslaunch lrs_dji_sim rviz_granso.launch wexec roslaunch lrs_dji_sim rviz_granso.launch
``` ```
Geneneral, uses the location given to config. Currently only Gränsö ortho photo installed. Geneneral, uses the location given to config. Currently only Gränsö orthophoto installed.
```bash ```bash
wexec roslaunch lrs_launch rviz_outside.launch wexec roslaunch lrs_launch rviz_outside.launch
``` ```
...@@ -251,7 +251,7 @@ wexec rosrun lrs_tst tstcommand.py --fly -x 100 -y 100 -z 12 --speed 3 --exec __ ...@@ -251,7 +251,7 @@ wexec rosrun lrs_tst tstcommand.py --fly -x 100 -y 100 -z 12 --speed 3 --exec __
## Flying with Gamepad ## Flying with Gamepad
For this case it is more convenient to runt the roscore on the local machine: For this case it is more convenient to run the roscore on the local machine:
```bash ```bash
roscore roscore
``` ```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment