Add EDGE_DETECTOR_XX_EN to declare which model will be used

Add EDGE_DETECTOR_PV_EN safeguard to avoid duplication of functions

Author: jgavillalobos

modules/edge-detector/Makefile

@@ -26,6 +26,24 @@ ifdef TEST_NORMALIZE_MAGNITUDE
 	LFLAGS += -DTEST_NORMALIZE_MAGNITUDE
 endif # TEST_NORMALIZE_MAGNITUDE
 
+# Defining preprocessor directive for using PV model
+ifdef EDGE_DETECTOR_PV_EN
+	CFLAGS += -DEDGE_DETECTOR_PV_EN
+	LFLAGS += -DEDGE_DETECTOR_PV_EN
+endif # EDGE_DETECTOR_PV_EN
+
+# Defining preprocessor directive for using PV model
+ifdef EDGE_DETECTOR_LT_EN
+	CFLAGS += -DEDGE_DETECTOR_LT_EN
+	LFLAGS += -DEDGE_DETECTOR_LT_EN
+endif # EDGE_DETECTOR_LT_EN
+
+# Defining preprocessor directive for using PV model
+ifdef EDGE_DETECTOR_AT_EN
+	CFLAGS += -DEDGE_DETECTOR_AT_EN
+	LFLAGS += -DEDGE_DETECTOR_AT_EN
+endif # EDGE_DETECTOR_AT_EN
+
 # Run the compiled file
 run:
 	@./test

modules/edge-detector/include/sobel_edge_detector_pv_model.hpp

@@ -1,3 +1,4 @@
+#ifdef EDGE_DETECTOR_PV_EN
 #ifndef SOBEL_EDGE_DETECTOR_HPP
 #define SOBEL_EDGE_DETECTOR_HPP
 
@@ -36,3 +37,4 @@ SC_MODULE(Edge_Detector)
 };
 
 #endif // SOBEL_EDGE_DETECTOR_HPP
+#endif // EDGE_DETECTOR_PV_EN

modules/edge-detector/src/sobel_edge_detector_pv_model.cpp

@@ -1,3 +1,7 @@
+#ifdef EDGE_DETECTOR_PV_EN
+#ifndef SOBEL_EDGE_DETECTOR_CPP
+#define SOBEL_EDGE_DETECTOR_CPP
+
 #include "sobel_edge_detector_pv_model.hpp"
 
 void Edge_Detector::set_local_window(int window[3][3])
@@ -50,3 +54,6 @@ int Edge_Detector::obtain_sobel_gradient_y()
 
   return this->resultSobelGradientY;
 }
+
+#endif // SOBEL_EDGE_DETECTOR_CPP
+#endif // EDGE_DETECTOR_PV_EN

modules/edge-detector/src/tb_edge_detector.cpp

@@ -11,7 +11,12 @@
 
 #include <cmath>
 
+#ifdef EDGE_DETECTOR_PV_EN
 #include "sobel_edge_detector_pv_model.hpp"
+#elif defined(EDGE_DETECTOR_LT_EN)
+#include "sobel_edge_detector_lt_model.hpp"
+#error "No EDGE_DETECTOR macro is defined. Please define one of EDGE_DETECTOR_AT_EN (Not yet implemented), EDGE_DETECTOR_LT_EN, or EDGE_DETECTOR_PV_EN."
+#endif // EDGE_DETECTOR_XX_EN
 
 using namespace cv;