A4MCAR - Python file headers and calling by script have been changed to make processes more traceable
This makes process names visible to TraceCompass.
Signed-off-by: Mustafa Ozcelikors <mozcelikors@gmail.com>
diff --git a/a4mcar/high_level_applications/apps/core_recorder/core_recorder.py b/a4mcar/high_level_applications/apps/core_recorder/core_recorder.py
index 47bcd5a..b430bd5 100644
--- a/a4mcar/high_level_applications/apps/core_recorder/core_recorder.py
+++ b/a4mcar/high_level_applications/apps/core_recorder/core_recorder.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load100.py b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load100.py
index 500d614..53dcf6e 100644
--- a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load100.py
+++ b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load100.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_1.py b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_1.py
index bcfad07..fc11e55 100644
--- a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_1.py
+++ b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_2.py b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_2.py
index fde174b..0230657 100644
--- a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_2.py
+++ b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_3.py b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_3.py
index 4e12db8..979a301 100644
--- a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_3.py
+++ b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_4.py b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_4.py
index 7aa1bf8..8210f63 100644
--- a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_4.py
+++ b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_4.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_5.py b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_5.py
index 09fcf9c..2ee28b4 100644
--- a/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_5.py
+++ b/a4mcar/high_level_applications/apps/dummy_loads/dummy_load25_5.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/ethernet_client/ethernet_client.py b/a4mcar/high_level_applications/apps/ethernet_client/ethernet_client.py
index cc98695..65c076e 100644
--- a/a4mcar/high_level_applications/apps/ethernet_client/ethernet_client.py
+++ b/a4mcar/high_level_applications/apps/ethernet_client/ethernet_client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/initialize/initialize.py b/a4mcar/high_level_applications/apps/initialize/initialize.py
index ba983a2..c03df0d 100644
--- a/a4mcar/high_level_applications/apps/initialize/initialize.py
+++ b/a4mcar/high_level_applications/apps/initialize/initialize.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/touchscreen_display/aprocess.py b/a4mcar/high_level_applications/apps/touchscreen_display/aprocess.py
index 0989f23..dc8e4c8 100644
--- a/a4mcar/high_level_applications/apps/touchscreen_display/aprocess.py
+++ b/a4mcar/high_level_applications/apps/touchscreen_display/aprocess.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
diff --git a/a4mcar/high_level_applications/apps/touchscreen_display/touchscreen_display.py b/a4mcar/high_level_applications/apps/touchscreen_display/touchscreen_display.py
index 329f37d..e4462bc 100644
--- a/a4mcar/high_level_applications/apps/touchscreen_display/touchscreen_display.py
+++ b/a4mcar/high_level_applications/apps/touchscreen_display/touchscreen_display.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
# All rights reserved. This program and the accompanying materials
@@ -67,14 +67,14 @@
aprocess_list.append(aprocess.aprocess("Xtightvnc", 0, "None", 1, "VNC Server", "cd ../../scripts/tightvnc/ && sudo bash tightvnc_start.sh &", 0))
aprocess_list.append(aprocess.aprocess("mjpg_streamer", 0, "None",1, "Camera Stream", "cd ../../scripts/camera_start/ && sudo bash raspberrypi_camera_start.sh &", 0))
aprocess_list.append(aprocess.aprocess("touchscreen_display", 1, "../../logs/timing/touchscreen_display_timing.inc", 1, "Display", "None", 0))
-aprocess_list.append(aprocess.aprocess("ethernet_client", 1, "../../logs/timing/ethernet_client_timing.inc", 1, "Ethernet App", "cd ../ethernet_client/ && sudo python ethernet_client.py &", 0))
-aprocess_list.append(aprocess.aprocess("core_recorder", 1, "../../logs/timing/core_recorder_timing.inc", 1, "Core Recorder", "cd ../core_recorder/ && sudo python core_recorder.py &", 0))
-aprocess_list.append(aprocess.aprocess("dummy_load25_1", 1, "../../logs/timing/dummy_load25_1_timing.inc", 1, "Cycler25_1", "cd ../dummy_loads/ && sudo python dummy_load25_1.py &", 0))
-aprocess_list.append(aprocess.aprocess("dummy_load25_2", 1, "../../logs/timing/dummy_load25_2_timing.inc", 1, "Cycler25_2", "cd ../dummy_loads/ && sudo python dummy_load25_2.py &", 0))
-aprocess_list.append(aprocess.aprocess("dummy_load25_3", 1, "../../logs/timing/dummy_load25_3_timing.inc", 1, "Cycler25_3", "cd ../dummy_loads/ && sudo python dummy_load25_3.py &", 0))
-aprocess_list.append(aprocess.aprocess("dummy_load25_4", 1, "../../logs/timing/dummy_load25_4_timing.inc", 1, "Cycler25_4", "cd ../dummy_loads/ && sudo python dummy_load25_4.py &", 0))
-#aprocess_list.append(aprocess.aprocess("dummy_load25_5", 1, "../../logs/timing/dummy_load25_5_timing.inc", 1, "Cycler25_5", "cd ../dummy_loads/ && sudo python dummy_load25_5.py &", 0))
-#aprocess_list.append(aprocess.aprocess("dummy_load100", 1, "../../logs/timing/dummy_load100_timing.inc", 1, "Cycler100", "cd ../dummy_loads/ && sudo python dummy_load100.py &", 0))
+aprocess_list.append(aprocess.aprocess("ethernet_client", 1, "../../logs/timing/ethernet_client_timing.inc", 1, "Ethernet App", "cd ../ethernet_client/ && sudo ./ethernet_client.py &", 0))
+aprocess_list.append(aprocess.aprocess("core_recorder", 1, "../../logs/timing/core_recorder_timing.inc", 1, "Core Recorder", "cd ../core_recorder/ && sudo ./core_recorder.py &", 0))
+aprocess_list.append(aprocess.aprocess("dummy_load25_1", 1, "../../logs/timing/dummy_load25_1_timing.inc", 1, "Cycler25_1", "cd ../dummy_loads/ && sudo ./dummy_load25_1.py &", 0))
+aprocess_list.append(aprocess.aprocess("dummy_load25_2", 1, "../../logs/timing/dummy_load25_2_timing.inc", 1, "Cycler25_2", "cd ../dummy_loads/ && sudo ./dummy_load25_2.py &", 0))
+aprocess_list.append(aprocess.aprocess("dummy_load25_3", 1, "../../logs/timing/dummy_load25_3_timing.inc", 1, "Cycler25_3", "cd ../dummy_loads/ && sudo ./dummy_load25_3.py &", 0))
+aprocess_list.append(aprocess.aprocess("dummy_load25_4", 1, "../../logs/timing/dummy_load25_4_timing.inc", 1, "Cycler25_4", "cd ../dummy_loads/ && sudo ./dummy_load25_4.py &", 0))
+#aprocess_list.append(aprocess.aprocess("dummy_load25_5", 1, "../../logs/timing/dummy_load25_5_timing.inc", 1, "Cycler25_5", "cd ../dummy_loads/ && sudo ./dummy_load25_5.py &", 0))
+#aprocess_list.append(aprocess.aprocess("dummy_load100", 1, "../../logs/timing/dummy_load100_timing.inc", 1, "Cycler100", "cd ../dummy_loads/ && sudo ./dummy_load100.py &", 0))
aprocess_list.append(aprocess.aprocess("apache2", 0, "None", 1, "Apache Server", "sudo service apache2 start", 0))
aprocess_list.append(aprocess.aprocess("image_processing", 1, "../../logs/timing/image_processing_timing.inc", 1, "ImageProcess", "cd ../image_processing/ && sudo -E ./image_processing &", 0))
aprocess_list_len = len(aprocess_list)
diff --git a/a4mcar/high_level_applications/setup_high_level_applications.sh b/a4mcar/high_level_applications/setup_high_level_applications.sh
new file mode 100644
index 0000000..b2209a7
--- /dev/null
+++ b/a4mcar/high_level_applications/setup_high_level_applications.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+#Script Description:
+# A4MCAR Project - Script that sets up high_level_applications module dependencies.
+#
+#Author:
+# M. Ozcelikors <mozcelikors@gmail.com>, Fachhochschule Dortmund
+#
+#Disclaimer:
+# Copyright (c) 2017 Eclipse Foundation and FH Dortmund.
+# All rights reserved. This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+
+echo "### Setting high_level_applications..."
+CURRENT_USER=$(whoami)
+
+#Getting the script directory
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do
+ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ SOURCE="$(readlink "$SOURCE")"
+ [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+echo "### Updating repository list..."
+sudo apt-get update
+
+echo "### Cloning external frameworks and libraries..."
+cd ~/Downloads
+sudo git clone https://gitlab.pimes.fh-dortmund.de/RPublic/a4mcar_required_modules.git
+
+echo "### Copying downloaded libraries into high_level_applications directory..."
+sudo cp -r ~/Downloads/a4mcar_required_modules/high_level_applications/virtkeyboard/* $DIR/apps/touchscreen_display/
+
+echo "### Installing psutil..."
+sudo apt-get install build-essential python-dev python3-dev python-pkg-resources python3-pkg-resources python-pip
+sudo easy_install pip==1.5.6
+sudo pip install ~/Downloads/a4mcar_required_modules/high_level_applications/psutil/
+
+echo "### Installing mjpg_streamer and its dependencies..."
+sudo apt-get install libjpeg8-dev imagemagick libv4l-dev
+sudo ln -s /usr/include/linux/videodev2.h /usr/include/linux/videodev.h
+sudo mkdir /home/pi/newmjpg-streamer/mjpg-streamer/
+sudo cp -r ~/Downloads/a4mcar_required_modules/high_level_applications/mjpg-streamer/* /home/pi/newmjpg-streamer/mjpg-streamer/
+cd /home/pi/newmjpg-streamer/mjpg-streamer/mjpg-streamer-experimental
+sudo make clean
+sudo rm -rf CMakeCache.txt
+sudo cmake .
+sudo make install
+sudo cp mjpg_streamer /usr/local/bin/
+sudo cp output_http.so input_raspicam.so input_uvc.so /usr/local/lib/
+sudo chmod 777 /usr/local/lib/*.so
+sudo chmod 777 /usr/local/bin/mjpg_streamer
+
+echo "### Clearing downloaded files..."
+sudo rm -rf ~/Downloads/a4mcar_required_modules/
+
+echo "### Making all python scripts executable"
+sudo chmod +x $DIR/apps/touchscreen_display/touchscreen_display.py
+sudo chmod +x $DIR/apps/ethernet_client/ethernet_client.py
+sudo chmod +x $DIR/apps/dummy_loads/dummy_load25_1.py
+sudo chmod +x $DIR/apps/dummy_loads/dummy_load25_2.py
+sudo chmod +x $DIR/apps/dummy_loads/dummy_load25_3.py
+sudo chmod +x $DIR/apps/dummy_loads/dummy_load25_4.py
+sudo chmod +x $DIR/apps/dummy_loads/dummy_load25_5.py
+sudo chmod +x $DIR/apps/dummy_loads/dummy_load100.py
+sudo chmod +x $DIR/apps/core_recorder/core_recorder.py
+
+echo "### WHAT TO DO NEXT? ###"
+echo "Please install opencv-3.0.0 and raspicam-0.1.3 to proceed with the optional image_processing module"
+echo "Before the image_processing module is built, the following variables should be exported"
+echo "export OpenCV_DIR=/home/pi/opencv_workspace/opencv/build/"
+echo "export raspicam_DIR=/home/pi/raspicam-0.1.3/build/"
+echo "### Finished."
\ No newline at end of file
