ROVER - Synced with the working github repo - raspicam library header inclusion changed, core usage script location changed.
Signed-off-by: Mustafa Ozcelikors <mozcelikors@gmail.com>
diff --git a/rover/scripts/read_core_usage.py b/rover/scripts/read_core_usage.py
index c3a3a53..037aacc 100644
--- a/rover/scripts/read_core_usage.py
+++ b/rover/scripts/read_core_usage.py
@@ -12,7 +12,7 @@
# M. Ozcelikors <mozcelikors@gmail.com>
#
# Installation:
-# Install/copy this file to /opt/rover-app/scripts/
+# Install/copy this file to /opt/rover-app/scripts
import psutil
import time
@@ -29,4 +29,4 @@
sys.exit(os.EX_SOFTWARE)
if (__name__=="__main__"):
- main()
\ No newline at end of file
+ main()
diff --git a/rover/src/tasks/cpu_logger_task.cpp b/rover/src/tasks/cpu_logger_task.cpp
index acdb6e6..c36aa15 100644
--- a/rover/src/tasks/cpu_logger_task.cpp
+++ b/rover/src/tasks/cpu_logger_task.cpp
@@ -9,7 +9,7 @@
* CPU Utilization Logger Task for Rover / Raspberry Pi - uses external python script
*
* Note:
- * read_core_usage.py must be installed to /opt/read_core_usage.py
+ * read_core_usage.py must be installed to /opt/rover-app/scripts/read_core_usage.py
*
* Authors:
* M. Ozcelikors, R.Hottger
@@ -43,13 +43,13 @@
size_t bytes_read;
/* Execute the command */
- fp = popen("python /opt/read_core_usage.py ","r");
+ fp = popen("python /opt/rover-app/scripts/read_core_usage.py ","r");
/* Read to buffer */
bytes_read = fread(buffer, 1, sizeof(buffer), fp);
if (bytes_read == 0 || bytes_read == sizeof(buffer))
- perror("Can't read from /opt/read_core_usage.py");
+ perror("Can't read from /opt/rover-app/scripts/read_core_usage.py");
buffer[bytes_read] = '\0';
diff --git a/rover/src/tasks/image_processing_task.cpp b/rover/src/tasks/image_processing_task.cpp
index 08070d2..4e9961f 100644
--- a/rover/src/tasks/image_processing_task.cpp
+++ b/rover/src/tasks/image_processing_task.cpp
@@ -48,15 +48,13 @@
#include <iostream>
#include <fstream>
-/* OpenCV 2.4.9 libraries, Includes (-I) are in /workspace, include paths are specified for "g++"!! */
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/core/core.hpp>
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/opencv.hpp>
-/* raspicam-0.1.3 libraries, Includes (-I) are in /workspace, include paths are specified for "g++"!! */
-#include <raspicam.h>
-#include <raspicam_cv.h>
+#include <raspicam/raspicam.h>
+#include <raspicam/raspicam_cv.h>
using namespace cv;
using namespace std;
@@ -70,7 +68,6 @@
imgproc_task_tmr.setTaskID("ImgPr");
imgproc_task_tmr.setDeadline(1);
imgproc_task_tmr.setPeriod(1);
-
/*
char key;
char* output_window_name = "Camera Output";
