Merge remote-tracking branch 'origin/master' into feature/realrobot

.devcontainer/Dockerfile

-FROM osrf/ros:melodic-desktop-full-bionic
-
-RUN apt-get update && apt-get install -q -y \
-    openssh-client
-
-RUN echo 'source /opt/ros/melodic/setup.bash' >> /root/.bashrc
\ No newline at end of file

.devcontainer/devcontainer.json

-{
-    "name": "panda_simulation-dev",
-    "dockerFile": "Dockerfile",
-    "extensions": [
-        "ms-vscode.cpptools",
-        "ms-iot.vscode-ros"
-    ],
-    "runArgs": [
-        "--cap-add=SYS_PTRACE",
-        "--security-opt",
-        "seccomp=unconfined",
-        "-v",
-        "${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
-    ],
-    "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash"
-    },
-    "postCreateCommand": "bash /catkin_ws/src/panda_simulation/scripts/docker-setup.sh",
-    "workspaceMount": "src=/Users/pekel/code/ros/panda_simulation,dst=/catkin_ws/src/panda_simulation,type=bind,consistency=cached",
-    "workspaceFolder": "/catkin_ws"
-}
\ No newline at end of file

README.md

@@ -31,6 +31,7 @@ Depending on your operating systems language you might need to export the numeri
 ```
 export LC_NUMERIC="en_US.UTF-8"
 ```
+==== BASE ====
 Otherwise, the robot will appear in rviz in a collapsed state.
 
 

package.xml

@@ -7,7 +7,7 @@
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
-  <maintainer email="erdal@todo.todo">erdal</maintainer>
+  <maintainer email="st@todo.todo">ST-Chair</maintainer>
 
 
   <!-- One license tag required, multiple allowed, one license per tag -->

scripts/docker-setup.sh

-#!/bin/bash
-
-REPOSITORY_DIR=$(pwd)
-WORKSPACE_DIR=/catkin_ws
-DEPENDENCIES_DIR=$WORKSPACE_DIR/dependencies
-APP_DIR=/root/.panda_simulation
-
-# Install libfranka
-mkdir $DEPENDENCIES_DIR && cd $DEPENDENCIES_DIR
-git clone --recursive https://github.com/frankaemika/libfranka
-cd libfranka
-git checkout 0.5.0
-git submodule update
-mkdir build && cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=0 ..
-cmake --build . -- -j$(nproc)
-
-# Clone the franka_ros and panda_moveit_config repositories for simulating Panda robot
-cd $WORKSPACE_DIR/src
-git clone https://github.com/erdalpekel/panda_moveit_config.git
-git clone --branch simulation https://github.com/erdalpekel/franka_ros.git
-
-# Install package dependencies with rosdep
-cd $WORKSPACE_DIR
-rosdep install --from-paths src --ignore-src -y --skip-keys libfranka --skip-keys moveit_perception
-
-# Clone the Visual-Studio-Code-ROS repository into the workspace directory /catkin_ws
-cd $WORKSPACE_DIR
-git clone git@github.com:erdalpekel/Visual-Studio-Code-ROS.git
-mv Visual-Studio-Code-ROS .vscode
-
-# create app directory for config files
-mkdir $APP_DIR
\ No newline at end of file