From 728152f3700d5a6d79e2568aa0270a06011523dc Mon Sep 17 00:00:00 2001
From: nithishkumars <nithishkumarnks@gmail.com>
Date: Fri, 8 Dec 2023 14:51:31 +0100
Subject: [PATCH] Updated ros for dev environment and added instructions to
 bringup the package

---
 .docker/Dockerfile | 12 ++++++++++--
 README.md          | 13 +++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 1dfa244..bc42303 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -64,12 +64,19 @@ RUN mkdir /library_pkgs && \
     mv "/scanCONTROL-Linux-SDK/libmescan/builddir/mescan_${SCANCONTROL_SDK_VERSION}-1_amd64.deb" /library_pkgs && \
     mv "/scanCONTROL-Linux-SDK/libllt/builddir/llt_${SCANCONTROL_SDK_VERSION}-1_amd64.deb" /library_pkgs
 
-FROM ros:noetic-ros-core
+FROM osrf/ros:noetic-desktop-full
+ARG USER=user
 ARG SCANCONTROL_SDK_VERSION
 
 RUN apt-get update && apt-get install -y --no-install-recommends\
       intltool \
       pkg-config \
+      git \
+      python3-catkin-tools \
+      ros-noetic-rosserial \ 
+      ros-noetic-actionlib-tools \
+      terminator \
+      python3-pip \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=build ["/library_pkgs", "/library_pkgs"]
@@ -78,5 +85,6 @@ RUN apt-get update && \
     apt install -y /library_pkgs/aravis_0.8.30-1_amd64.deb && \
     apt install /library_pkgs/mescan_${SCANCONTROL_SDK_VERSION}-1_amd64.deb && \
     apt install /library_pkgs/llt_${SCANCONTROL_SDK_VERSION}-1_amd64.deb \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* 
 
+USER ${ROS_USER}
diff --git a/README.md b/README.md
index 7caa940..2ee8a9a 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,10 @@ Run the uninstall script and follow the instruction in the command window:
 #### Building
 
 To build from source, clone the latest version from this repository into your catkin workspace and compile the package using:
-
+	
+	source /opt/ros/noetic/setup.bash
 	cd catkin_ws/src
-	git clone https://github.com/sam-xl/micro_epsilon_scancontrol.git
+	git clone https://github.com/sam-xl/scancontrol.git
 	cd ../
 	catkin build
 
@@ -60,6 +61,14 @@ Run the unit tests with
 
 ## Usage
 
+Source the build packages from the repo:
+
+    source devel/setup.bash
+
+Set the path for libllt binaries:
+
+    export PATH=$PATH:/usr/lib:/lib:/usr/local/lib
+
 Run the main driver node with:
 
 	roslaunch micro_epsilon_scancontrol_driver load_driver.launch