Move datadef.h to the main folder

21 files changed, 20 insertions, 158 deletions

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/DataDef.h b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/DataDef.h
deleted file mode 100644
index 619d8f843..000000000
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/DataDef.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef DATADEF_H
-#define DATADEF_H
-
-#define EVALUATION_BOARD // to use the LCD only when using the evaluation board
-#define USE_HIGH_SPEED_GPIO // to use AHB GPIO (A..J) ports A-J APB or AHB, ports K-Q on AHB only
-
-#define ON  1
-#define OFF 0
-
-enum
-{
-    PASSED = 0,
-    FAILED = 1,
-    NOT_SUPPORTED = 254,
-    VERIFIED = 255
-};
-
-
-#define OK     0
-#define ERROR  1
-
-#define ENABLE  0
-#define DISABLE 1
-
-#define NEW  0
-#define USED 1
-
-#define START 0
-#define STOP  1
-#define NOSTOP     2
-#define CONTINUE   2
-
-#define NOTBUSY 0
-#define BUSY 1
-//
-// motor direction
-#define CW  0 // clockwise
-#define CCW 1 // counter clockwise
-
-#define TRUE  1
-#define FALSE 0
-
-#define INPUT 0x0
-#define OUTPUT 0x1
-
-#define PULLDOWN 0
-#define PULLUP   1
-
-#define TX 0
-#define RX 1
-#define TXRX 2
-#define ODD         0
-#define EVEN        1
-
-#define READY       0
-#define NOTREADY    1
-#define WAIT        2
-
-#define LOW  0x0
-#define HIGH 0x1
-
-#define WR          0
-#define RD          1
-
-#define FLAGSTART   1
-#define FLAGSET     1
-#define FLAGCLEAR   0
-
-#define IN              2
-#define OUT             3
-
-#define INIT 1
-#define SKIP_INIT 0
-
-#define byte uint8_t//char
-#define boolean bool
-
-#define SERIAL  0x0
-#define DISPLAY 0x1
-
-#define LSBFIRST 0
-#define MSBFIRST 1
-
-#define CHANGE 1
-#define FALLING 2
-#define RISING 3
-
-//SPI
-typedef struct //S_SPI
-{
-    unsigned char MotID;
-    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
-
-//---------------------------------------------------------------------
-#pragma diag_suppress 169 /*  Avoid warnings on VOID * conversions (protobuf issue)
-The warning:
-#169-D argument of type "size_t (*)(const CalculateResponse *, uint8_t *)" is incompatible with parameter of type "size_t (*)(void *, uint8_t *)"   Calculate.c /twine_usblib_demo/PMR/Stubs    line 53 C/C++ Problem
-
-
-//#pragma diag_suppress 190 // Avoid the warning - #190-D enumerated type mixed with another type    protobuf-c.c
- *
-or in the environment add command line:
-
-Project -> properties ->
-Press on show advanced settings
-CCS Build ->
-Advanced Options ->
-Diagnistic Options ->
-Add the warning number in
-Supports diagnostic <id> (--diag_suppress, - pds)
-169
-190
-*/
-
-//Project Properties->Build->Compiler->Include Options
-//There may be paths there relative to a build variable, rather than hard-coded paths, that may be triggering the error.
-
-
-
-#endif /* DATADEF_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"