Fix allocation of image in memory

Author: jgavillalobos

modules/router/Makefile

@@ -74,6 +74,11 @@ ifdef DISABLE_ROUTER_DEBUG
 	LFLAGS += -DDISABLE_ROUTER_DEBUG
 endif # DISABLE_ROUTER_DEBUG
 
+ifdef DISABLE_VGA_DEBUG
+	CFLAGS += -DDISABLE_VGA_DEBUG
+	LFLAGS += -DDISABLE_VGA_DEBUG
+endif # DISABLE_VGA_DEBUG
+
 ifdef DISABLE_FILTER_DEBUG
 	CFLAGS += -DDISABLE_FILTER_DEBUG
 	LFLAGS += -DDISABLE_FILTER_DEBUG

modules/router/src/tb_edge_detector_tlm.cpp

@@ -330,22 +330,13 @@ SC_MODULE(Tb_top)
     Mat detectedImageAfterMemY(IMAG_ROWS, IMAG_COLS, CV_8UC1);
     Mat detectedImageAfterMem(IMAG_ROWS, IMAG_COLS, CV_8UC1);
 
-    dbgprint("Starting VGA to receive image");
+    dbgprint("Starting receiving of the image through VGA");
 
     unsigned char *vga_start = new unsigned char;
     unsigned char *vga_done;
     *vga_start = 1;
     tb_initiator->write(vga_start, IMG_INPUT_START_ADDRESS_LO, sizeof(char));
 
-    // for (int i = 0; i < IPS_TOTAL_VERTICAL; ++i)
-    // {
-    //   for (int j = 0; j < IPS_TOTAL_HORIZONTAL; ++j)
-    //   {
-    //     // this->vga_DUT->run();
-    //     // Wait 40ns for conversions
-
-    //   }
-    // }
     tb_initiator->read(vga_done, IMG_INPUT_DONE_ADDRESS_LO, sizeof(char));
     while (*vga_done == 0)
     {
@@ -355,7 +346,7 @@ SC_MODULE(Tb_top)
     }
     delete[] vga_done;
 
-    dbgprint("Ending VGA");
+    dbgprint("Finished receiving of the image through VGA");
 
     tb_initiator->read(local_results, IMG_INPUT_ADDRESS_LO, IMAG_ROWS * IMAG_COLS * 3);
 
@@ -370,8 +361,6 @@ SC_MODULE(Tb_top)
       }
     }
 
-    /*
-    
     total_number_of_pixels = IMAG_ROWS * IMAG_COLS;
 
     dbgprint("Starting gray scale conversion");
@@ -844,10 +833,10 @@ SC_MODULE(Tb_top)
     }
 
     dbgprint("Finished with the transmision of the image");
-    */
+    
 
     imwrite("originalImageAfterMem.jpg", originalImageAfterMem);
-    /*
+    
     imwrite("grayImagePrevMem.jpg", grayImagePrevMem);
     imwrite("grayImageAfterMem.jpg", grayImageAfterMem);
     imwrite("filteredImagePrevMem.jpg", filteredImagePrevMem);
@@ -857,7 +846,7 @@ SC_MODULE(Tb_top)
     imwrite("detectedImagePrevMemY.jpg", detectedImagePrevMemY);
     imwrite("detectedImageAfterMemY.jpg", detectedImageAfterMemY);
     imwrite("detectedImagePrevMem.jpg", detectedImagePrevMem);
-    imwrite("detectedImageAfterMem.jpg", detectedImageAfterMem);*/
+    imwrite("detectedImageAfterMem.jpg", detectedImageAfterMem);
 
     sc_stop();
   }

modules/vga/include/vga.hpp

@@ -179,7 +179,7 @@ SC_MODULE(vga)
 
       if (!((IMG_ROW < 0) || (IMG_COL < 0) || (IMG_ROW >= V_ACTIVE) || (IMG_COL >= H_ACTIVE)))
       {
-        const unsigned int INDEX = IMG_ROW * (3 * V_ACTIVE) + 3 * IMG_COL;
+        const unsigned int INDEX = IMG_ROW * (3 * H_ACTIVE) + 3 * IMG_COL;
 
         this->tmp_img[INDEX] = this->red.read();
         this->tmp_img[INDEX + 1] = this->green.read();