Move datadef.h to the main folder

34 files changed, 39 insertions, 57 deletions

diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject
index de0ecf526..51bd5788b 100644
--- a/Software/Embedded_SW/Embedded/.cproject
+++ b/Software/Embedded_SW/Embedded/.cproject
@@ -88,7 +88,7 @@
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.MAP_FILE.1799717231" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.STACK_SIZE.32186825" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.STACK_SIZE" value="4096" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.HEAP_SIZE.1726613453" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.HEAP_SIZE" value="87574" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE.639816850" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE.639816850" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="&quot;${ProjName}.out&quot;" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.LIBRARY.1644568501" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSTIVAC_LIBRARIES}"/>
 									<listOptionValue builtIn="false" value="libc.a"/>
@@ -159,7 +159,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="src|tm4c129xnczad_startup_ccs.c|Common/Sys_PinOut_Config/MCU_MAIN_pinout.c|Drivers/L6470|Flashstore.c|Configuration.c|Pin_config.c|SlowMotors.c|Profile.c|FastMotors.c|JigCommands.c|Pin.c|USBCDCD.c|ADCLogger.c|ADCUtils.c|PWM.c|Timer.c|Message.c|Communication.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="tm4c129xnczad_startup_ccs.c|Common/Sys_PinOut_Config/MCU_MAIN_pinout.c|Drivers/L6470|Flashstore.c|Configuration.c|Pin_config.c|SlowMotors.c|Profile.c|FastMotors.c|JigCommands.c|Pin.c|USBCDCD.c|ADCLogger.c|ADCUtils.c|PWM.c|Timer.c|Message.c|Communication.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -229,7 +229,7 @@
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.MAP_FILE.846864689" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.STACK_SIZE.117883278" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.STACK_SIZE" value="512" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.HEAP_SIZE.316844057" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.OUTPUT_FILE.876295796" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.OUTPUT_FILE.876295796" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="&quot;${ProjName}.out&quot;" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.LIBRARY.2078449540" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_15.12.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="&quot;libc.a&quot;"/>
 								</option>
@@ -258,7 +258,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -351,7 +351,7 @@
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.MAP_FILE.108194642" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.STACK_SIZE.1408408013" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.STACK_SIZE" value="2048" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.HEAP_SIZE.921158733" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.HEAP_SIZE" value="20240" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE.1341397393" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE.1341397393" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="&quot;${ProjName}.out&quot;" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.LIBRARY.936685154" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_16.9.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSTIVAC_LIBRARIES}"/>
 									<listOptionValue builtIn="false" value="libc.a"/>
@@ -422,7 +422,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="src|tm4c129xnczad_startup_ccs.c|Common/Sys_PinOut_Config/MCU_MAIN_pinout.c|Drivers/L6470|Flashstore.c|Configuration.c|Pin_config.c|SlowMotors.c|Profile.c|FastMotors.c|JigCommands.c|Pin.c|USBCDCD.c|ADCLogger.c|ADCUtils.c|PWM.c|Timer.c|Message.c|Communication.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="tm4c129xnczad_startup_ccs.c|Common/Sys_PinOut_Config/MCU_MAIN_pinout.c|Drivers/L6470|Flashstore.c|Configuration.c|Pin_config.c|SlowMotors.c|Profile.c|FastMotors.c|JigCommands.c|Pin.c|USBCDCD.c|ADCLogger.c|ADCUtils.c|PWM.c|Timer.c|Message.c|Communication.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index 575813bc4..e534b9b2c 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -24,13 +24,13 @@
 
 /*------------- Includes --------------------------------*/
 
+#include <DataDef.h>
 #include <stdio.h>		/* puts(), etc. */
 #include "report.h"
 #include "distributor.h"	/* distibutorInit */
 #include "filter.h"
 #include "include.h"
 
-#include <Modules/Stubs_Handler/DataDef.h>
 #include "PMR/common/MessageContainer.pb-c.h"
 #include "PMR/debugging/DebugLogRequest.pb-c.h"
 #include "PMR/debugging/DebugLogResponse.pb-c.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index 619d8f843..4f0582e50 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -92,7 +92,6 @@ typedef struct //S_SPI
     unsigned int TX_MOSI; //32bit (Master Output Slave Input )
     unsigned int RX_MISO; //24bit (Master Input  Slave Output)
     //unsigned int BUSY;    //32bit
-    unsigned char AMT_OF_Words:3; //The amount of spi words (usually byte sized) per transmission (send 4 to 32bit)
 
 }SPI;//SPI
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/Danser_SSI/SSI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/Danser_SSI/SSI_Comm.c
index ace56ebfd..e9895333d 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Danser_SSI/SSI_Comm.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Danser_SSI/SSI_Comm.c
@@ -45,9 +45,7 @@ up
 
 #include <driverlib/rom.h>
 #include <driverlib/rom_map.h>
-#include <Stubs_Handler/DataDef.h>
-
-//
+#include <DataDef.h>
 #include "driverlib/uart.h"
 typedef struct  // 24bit
 {
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c
index 133bb9ed1..3ce9db930 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c
@@ -1,9 +1,9 @@
+#include <DataDef.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 
 #include "FPGA_COMM.h"
-#include "Stubs_Handler/DataDef.h"
 #include "driverlib/sysctl.h" //for SysCtlDelay
 
 unsigned short GPO_01_Reg;
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c
index 816ca6b2d..795e9263f 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c
@@ -2,8 +2,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <drivers/FPGA/FPGA_Comm.h>
-#include "Stubs_Handler/DataDef.h"
-
+#include <DataDef.h>
 #include "FPGA_SPI_Comm.h"
 #include "drivers/FPGA/Moters_Driver/L6470.h"
 #include "Drivers/Motors/Motor.h"
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Moters_Driver/L6470.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/Moters_Driver/L6470.c
index ad010691f..a39a6b991 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Moters_Driver/L6470.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Moters_Driver/L6470.c
@@ -6,10 +6,9 @@
 */
 //#include "graphics_adapter.h"
 //#include "Embedded/include.h"
+#include <DataDef.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <Stubs_Handler/DataDef.h>
-//#include <drivers/FPGA/FPGA_Comm.h>
 #include "drivers/SPI/SPI_Comm.h"
 #include "inc/hw_memmap.h"
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Moters_Driver/L6470.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/Moters_Driver/L6470.h
index 4838e305a..745a7f753 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Moters_Driver/L6470.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Moters_Driver/L6470.h
@@ -240,7 +240,7 @@
 //@param int MOSI, int MISO, int CS, int CLK, int BUSY, int RESET
 //cL6470(int, int, int, int, int, int);
 
-#include "Stubs_Handler/DataDef.h"
+#include "../../../DataDef.h"
 
 void init();
 unsigned long GetParam(byte);
diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
index beb5cf915..9bbbf97dc 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
@@ -2,6 +2,7 @@
  * Heater.c
  * Heater Driver
  **************************************************************************************************************************/
+#include <DataDef.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -18,7 +19,6 @@
 #include "driverlib/gpio.h"
 #include "driverlib/sysctl.h"
 
-#include <Modules/Stubs_Handler/DataDef.h>
 #include <Modules/Stubs_Handler/User_Leds.h>
 #include "PMR/Hardware/HardwarePIDControl.pb-c.h"
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c b/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c
index 761a8ac41..aa4d89bb0 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c
@@ -11,6 +11,7 @@
  *
  *************************************************************************************************/
 
+#include <DataDef.h>
 #include "include.h"
 #include "motor.h"
 #include "Modules/thread/thread.h"
@@ -23,7 +24,6 @@
 #include "drivers/SPI/SPI_Comm.h"
 #include "drivers/FPGA/FPGA_SPI_Comm.h"
 #include "drivers/FPGA/FPGA_Comm.h"
-#include "Stubs_Handler/DataDef.h"
 #include "drivers/FPGA/Moters_Driver/L6470.h"
 
 /////////////////////////
diff --git a/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c
index 1da7fc0f6..a82ea1fa0 100644
--- a/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c
+++ b/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c
@@ -19,7 +19,7 @@
 
 #include <driverlib/rom.h>
 #include <driverlib/rom_map.h>
-#include <Stubs_Handler/DataDef.h>
+#include <DataDef.h>
 #include "drivers/Motors/Motor.h"
 
 void temp_init_spi2();
diff --git a/Software/Embedded_SW/Embedded/Include.h b/Software/Embedded_SW/Embedded/Include.h
index bfacbff4a..7a9dda68b 100644
--- a/Software/Embedded_SW/Embedded/Include.h
+++ b/Software/Embedded_SW/Embedded/Include.h
@@ -10,7 +10,6 @@
 #include <stdlib.h>     /*malloc*/
 #include <ctype.h>      /* tolower              */
 #include <errno.h>
-#include "./Modules/Stubs_Handler/DataDef.h"
 #include "./common/protobuf-c/protobuf-c.h"
 
 //operation system includes
@@ -51,6 +50,7 @@
 
 #include "Common/Utilities/Utils.h"
 #include "Common/report/report.h"
+#include "DataDef.h"
 
 #define SYS_CLK_FREQ                120000000
 
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index f3693cad1..937a7f524 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -11,7 +11,6 @@
 #include <ti/sysbios/knl/Semaphore.h>
 */
 #include <driverlib/sysctl.h>
-#include <Modules/Stubs_Handler/DataDef.h>
 #include "Drivers/USB_Communication/USBCDCD.h"
 #include "PMR/common/MessageContainer.pb-c.h"
 #include "Common/Sys_PinOut_Config/Pin.h"
@@ -26,6 +25,7 @@
 
 #include "drivers/twine_graphicslib/graphics_adapter.h"
 #include <drivers/Flash_Memory/Flash_Memory.h>
+#include <DataDef.h>
 
 /*
 #include "Drivers/SPI_SDCARD/SDSPI.h"
@@ -89,7 +89,7 @@ void Init_stubs(uint32_t ui32SysClock)
 
     //Danser_ENC:
     SSI1_Init(); // Read dancer ENC SSI
-    Loop_SSI();  // while(1) can't use with usb
+    //Loop_SSI();  // while(1) can't use with usb
 
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index b7f926da6..1ccfd3df8 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -3,13 +3,13 @@
  * Control module
  *
 ************************************************************************************************************************/
+#include <DataDef.h>
 #include "include.h"
 #include "GeneralHardware.h"
 #include "thread/thread.h"
 #include "ids/ids.h"
 #include "control/control.h"
 #include "heaters/heaters_ex.h"
-#include <Modules/Stubs_Handler/DataDef.h>
 #include "PMR/common/MessageContainer.pb-c.h"
 #include "Modules/Stubs_Handler/Container.h"
 #include "PMR/Hardware/UploadHardWareConfigurationRequest.pb-c.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h
index d0bcca682..8deaf7586 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h
@@ -1,8 +1,8 @@
 #ifndef GENERALHARDWARE_H
 #define GENERALHARDWARE_H
 
+#include "../../DataDef.h"
 #include "include.h"
-#include <Modules/Stubs_Handler/DataDef.h>
 #include "PMR/common/MessageContainer.pb-c.h"
 #include "Modules/Stubs_Handler/Container.h"
 
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index dfc00834e..763348254 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -5,10 +5,10 @@
  *      Author: shlomo
  */
 //********************************************************************************************************************
+#include <DataDef.h>
 #include "include.h"
 #include "process.h"
 
-#include <Modules/Stubs_Handler/DataDef.h>
 #include "heaters/heaters_ex.h"
 #include "PMR/Printing/ProcessParameters.pb-c.h"
 #include "PMR/Printing/UploadProcessParametersRequest.pb-c.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
index f908e69fe..d52f5d25f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
@@ -8,12 +8,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////
 #include "include.h"
 
-#include <Modules/Stubs_Handler/DataDef.h>
-//#include "PMR/Hardware/PIDControlConfig.pb-c.h"
-//#include "PMR/Hardware/PIDCluster.pb-c.h"
-//#include "PMR/Hardware/HeaterControl.pb-c.h"
-//#include "PMR/Hardware/HeaterCommandRequest.pb-c.h"
-//#include "PMR/Hardware/HeaterCommandRequest.pb-c.h"
 #include "PMR/Hardware/HardwarePidControl.pb-c.h"
 #include "PMR/Hardware/HardwarePidControlType.pb-c.h"
 #include "PMR/common/MessageContainer.pb-c.h"
@@ -26,6 +20,7 @@
 #include "../control/pidalgo.h"
 #include "include.h"
 #include <driverlib/timer.h>
+#include <DataDef.h>
 
 #include "heaters_ex.h"
 #include "heaters.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 82a3d362c..5dee1301d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -8,8 +8,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////////
 #include "include.h"
 
-#include <Modules/Stubs_Handler/DataDef.h>
-//#include "PMR/Hardware/PIDCluster.pb-c.h"
 #include "PMR/Hardware/HardwarePidControlType.pb-c.h"
 #include "PMR/Hardware/HardwarePidControl.pb-c.h"
 #include "PMR/common/MessageContainer.pb-c.h"
@@ -18,6 +16,7 @@
 #include "../control/pidalgo.h"
 #include "include.h"
 #include <driverlib/timer.h>
+#include <DataDef.h>
 #include <inc/hw_ints.h>
 #include <inc/hw_memmap.h>
 
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
index db4dbb1f0..f4ad58da8 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
@@ -1,10 +1,9 @@
 /************************************************************************************************************************
  **************************************************************************************************************************/
 
+#include <DataDef.h>
 #include "include.h"
 
-#include <Modules/Stubs_Handler/DataDef.h>
-
 #include "ids.h"
 #include "PMR/common/MessageContainer.pb-c.h"
 #include "PMR/Hardware/HardwareDispenser.pb-c.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_ExtFlash.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_ExtFlash.c
index fe8826f81..96a8e9322 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_ExtFlash.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_ExtFlash.c
@@ -5,12 +5,12 @@
 #include <PMR/Stubs/StubExtFlashWriteRequest.pb-c.h>
 #include <PMR/Stubs/StubExtFlashWriteResponse.pb-c.h>
 #include <drivers/Flash_Memory/Flash_Memory.h>
+#include <DataDef.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Modules/Stubs_Handler/DataDef.h>
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGAReadBackReg.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGAReadBackReg.c
index 4daf691ad..90140afbf 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGAReadBackReg.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGAReadBackReg.c
@@ -1,4 +1,5 @@
 
+#include <DataDef.h>
 #include <PMR/Stubs/StubFPGAReadBackRegRequest.pb-c.h>
 #include <PMR/Stubs/StubFPGAReadBackRegResponse.pb-c.h>
 #include <stdbool.h>
@@ -6,7 +7,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Stubs_Handler/DataDef.h>
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGAReadVersion.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGAReadVersion.c
index 50c6a6382..3c719bc59 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGAReadVersion.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_FPGAReadVersion.c
@@ -1,4 +1,5 @@
 
+#include <DataDef.h>
 #include <PMR/Stubs/StubFPGAReadVersionResponse.pb-c.h>
 #include <PMR/Stubs/StubFPGAReadVersionRequest.pb-c.h>
 #include <stdbool.h>
@@ -6,7 +7,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Stubs_Handler/DataDef.h>
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_GPIO.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_GPIO.c
index 017d0786e..362be2ba8 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_GPIO.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_GPIO.c
@@ -1,3 +1,4 @@
+#include <DataDef.h>
 #include "include.h"
 
 #include <PMR/Common/MessageContainer.pb-c.h>
@@ -16,8 +17,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Modules/Stubs_Handler/DataDef.h>
-
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_HW_Version.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_HW_Version.c
index 676937466..7bc1aa857 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_HW_Version.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_HW_Version.c
@@ -1,4 +1,5 @@
 
+#include <DataDef.h>
 #include <PMR/Stubs/StubHWVersionResponse.pb-c.h>
 #include <PMR/Stubs/StubHWVersionRequest.pb-c.h>
 #include <stdbool.h>
@@ -6,7 +7,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Stubs_Handler/DataDef.h>
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Heater.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Heater.c
index 6bd6148d3..80f9cc7c6 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Heater.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Heater.c
@@ -1,5 +1,6 @@
 
 
+#include <DataDef.h>
 #include <PMR/Common/MessageContainer.pb-c.h>
 #include <PMR/Stubs/StubHeaterRequest.pb-c.h>
 #include <PMR/Stubs/StubHeaterResponse.pb-c.h>
@@ -8,8 +9,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Modules/Stubs_Handler/DataDef.h>
-
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_L6470.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_L6470.c
index 4452aef47..1508d2d58 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_L6470.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_L6470.c
@@ -1,4 +1,5 @@
 
+#include <DataDef.h>
 #include <PMR/Stubs/StubL6470DriverResponse.pb-c.h>
 #include <PMR/Stubs/StubL6470DriverRequest.pb-c.h>
 #include <stdbool.h>
@@ -6,7 +7,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Stubs_Handler/DataDef.h>
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
index de3587ff2..3b853193c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
@@ -1,4 +1,5 @@
 
+#include <DataDef.h>
 #include <PMR/Stubs/StubMotorInitRequest.pb-c.h>
 #include <PMR/Stubs/StubMotorInitResponse.pb-c.h>
 #include <PMR/Stubs/StubMotorRunRequest.pb-c.h>
@@ -23,7 +24,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Stubs_Handler/DataDef.h>
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MotorEncoder.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MotorEncoder.c
index 211f44a55..ebc48bf4d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MotorEncoder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MotorEncoder.c
@@ -1,4 +1,5 @@
 
+#include <DataDef.h>
 #include <PMR/Common/MessageContainer.pb-c.h>
 #include <PMR/Stubs/StubMotorEncoderRequest.pb-c.h>
 #include <PMR/Stubs/StubMotorEncoderResponse.pb-c.h>
@@ -7,8 +8,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Modules/Stubs_Handler/DataDef.h>
-
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_OptLimitSwitch.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_OptLimitSwitch.c
index 7c23622a3..84878c660 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_OptLimitSwitch.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_OptLimitSwitch.c
@@ -1,5 +1,6 @@
 
 
+#include <DataDef.h>
 #include <PMR/Common/MessageContainer.pb-c.h>
 #include <PMR/Stubs/StubOptLimitSwitchRequest.pb-c.h>
 #include <PMR/Stubs/StubOptLimitSwitchResponse.pb-c.h>
@@ -8,8 +9,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Modules/Stubs_Handler/DataDef.h>
-
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SteperMotor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SteperMotor.c
index 6e6d71783..8fd6e0484 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SteperMotor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SteperMotor.c
@@ -1,5 +1,6 @@
 
 
+#include <DataDef.h>
 #include <PMR/Common/MessageContainer.pb-c.h>
 #include <PMR/Stubs/StubSteperMotorRequest.pb-c.h>
 #include <PMR/Stubs/StubSteperMotorResponse.pb-c.h>
@@ -8,8 +9,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Modules/Stubs_Handler/DataDef.h>
-
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Valve.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Valve.c
index e6ad7811d..b1cba49e5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Valve.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Valve.c
@@ -1,4 +1,5 @@
 
+#include <DataDef.h>
 #include <PMR/Common/MessageContainer.pb-c.h>
 #include <PMR/Stubs/StubValveRequest.pb-c.h>
 #include <PMR/Stubs/StubValveResponse.pb-c.h>
@@ -7,8 +8,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <Modules/Stubs_Handler/DataDef.h>
-
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "inc/hw_uart.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/User_Leds.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/User_Leds.c
index d06b3aeef..69134cd61 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/User_Leds.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/User_Leds.c
@@ -1,3 +1,4 @@
+#include <DataDef.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -10,7 +11,6 @@
 #include "driverlib/gpio.h"
 #include "driverlib/sysctl.h"
 
-#include <Modules/Stubs_Handler/DataDef.h>
 #include <Modules/Stubs_Handler/User_Leds.h>
 
 void Turn_Green_Led_On()
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
index c9876f89c..8c4b83ec6 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
@@ -1,9 +1,9 @@
 /************************************************************************************************************************
  **************************************************************************************************************************/
 
+#include <DataDef.h>
 #include "include.h"
 
-#include <Modules/Stubs_Handler/DataDef.h>
 #include "PMR/Hardware/HardwareMotor.pb-c.h"
 #include "PMR/Hardware/HardwareDancer.pb-c.h"
 #include "PMR/Hardware/HardwareWinder.pb-c.h"
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index 9a1a938c0..0515b9767 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -21,12 +21,12 @@
 //the state machine operation is used to operate in runtime correct profile flow execution
 //by recieved esign flow of the user from the UI
 ///////////////////////////////////////////////////////////////////////////////////////////
+#include <DataDef.h>
 #include "include.h"
 #include <ti/sysbios/knl/mailbox.h>
 #include <ti/sysbios/knl/Clock.h>
 #include <ti/sysbios/knl/task.h>
 
-#include <Modules/Stubs_Handler/DataDef.h>
 #include "PMR/Printing/JobSegment.pb-c.h"
 #include "PMR/Printing/JobRequest.pb-c.h"
 #include "PMR/Hardware/Hardwaremotor.pb-c.h"