Fix regarding sensor issues

Signed-off-by: Mustafa Ozcelikors <[email protected]>

CMakeLists.txt

@@ -10,8 +10,8 @@
 cmake_minimum_required (VERSION 2.8.11)
 project (roverapp)
 
-# Use C++11 and Supress some warnings  -Wno-write-strings -Wno-deprecated-declarations 
-set (CMAKE_CXX_FLAGS "-std=c++11 -Wno-write-strings -Wno-deprecated-declarations ${CMAKE_CXX_FLAGS}")
+# Use C++11 and Supress some warnings  -Wno-write-strings -Wno-deprecated-declarations -Wno-unused-local-typedefs
+set (CMAKE_CXX_FLAGS "-std=c++11 -Wno-write-strings -Wno-deprecated-declarations -Wno-unused-local-typedefs ${CMAKE_CXX_FLAGS}")
 
 # To find modules from other cmake-built projects that are searched with find_package,
 # external cmake modules need to be provided. Those are typically named as Find<package>.cmake or <package>Config.cmake.

src/tasks/temperature_task.cpp

@@ -58,7 +58,7 @@ void *Temperature_Task(void *arg)
 		// TODO: A dirty solution for temperature sensor messing up with the ultrasonic sensor
 		// timing. With this, temperature sensor only works with manual driving, i.e. non- proximity-
 		// sensor-critical driving mode.
-#ifndef SIMULATOR
+#if !SIMULATOR
 		if (driving_mode.get() == MANUAL)
 		{
 			pthread_mutex_lock(&gpio_intensive_operation_lock);

src/tasks/ultrasonic_sensor_grove_task.cpp

@@ -55,7 +55,7 @@ void *Ultrasonic_Sensor_Grove_Task(void *unused)
 		/*pthread_mutex_lock(&distance_grove_lock);
 			distance_grove_shared = getCM_GrooveUltrasonicRanger();
 		pthread_mutex_unlock(&distance_grove_lock);*/
-#ifndef SIMULATOR
+#if !SIMULATOR
 		if (rover_config_obj.USE_GROOVE_SENSOR_C == 1)
 		{
 			pthread_mutex_lock(&gpio_intensive_operation_lock);

src/tasks/ultrasonic_sensor_sr04_back_task.cpp

@@ -71,7 +71,7 @@ void *Ultrasonic_Sensor_SR04_Back_Task (void *unused)
 		ultrasonic_sr04_back_task_tmr.calculatePreviousSlackTime();
 
 		//Task content starts here -----------------------------------------------
-#ifndef SIMULATOR
+#if !SIMULATOR
 		if (rover_config_obj.USE_GROOVE_SENSOR_C == 0)
 		{
 			pthread_mutex_lock(&gpio_intensive_operation_lock);

src/tasks/ultrasonic_sensor_sr04_front_task.cpp

@@ -73,7 +73,7 @@ void *Ultrasonic_Sensor_SR04_Front_Task(void *unused)
 		ultrasonic_sr04_front_task_tmr.calculatePreviousSlackTime();
 
 		//Task content starts here -----------------------------------------------
-#ifndef SIMULATOR
+#if !SIMULATOR
 		pthread_mutex_lock(&gpio_intensive_operation_lock);
 			distance_sr04_front_shared = r_ultrasonicfront.read();
 		pthread_mutex_unlock(&gpio_intensive_operation_lock);