fix typo + add global index for vme file

16 files changed, 30 insertions, 29 deletions

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 e8b46084c..87a1515af 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c
@@ -3,9 +3,9 @@
 #include <stdbool.h>
 #include <drivers/FPGA/FPGA_Comm.h>
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
+#include <Drivers/FPGA/Motors_Driver/PowerSTEP01.h>
 #include "FPGA_SPI_Comm.h"
-#include "drivers/FPGA/Moters_Driver/L6470.h"
-#include "drivers/FPGA/Moters_Driver/PowerSTEP01.h"
 #include "Drivers/Motors/Motor.h"
 #include "modules/control/millisecTask.h"
 #include "modules/thread/thread.h"
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/ispvm_ui.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/ispvm_ui.c
index c216b9aad..a18d5bb76 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/ispvm_ui.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/ispvm_ui.c
@@ -38,7 +38,7 @@
 * 08/28/08 NN Added Calculate checksum support.
 ***************************************************************/
 
-
+#include "Include.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -53,6 +53,8 @@
 
 FILE * g_pVMEFile = NULL;
 
+uint32_t vme_index = 0;
+
 /***************************************************************
 *
 * Functions declared in this ispvm_ui.c module
@@ -197,6 +199,8 @@ unsigned char GetByte()
 	    ucData = s[0];
 	    ////////
 
+
+
 		//if ( feof( g_pVMEFile ) )  avi-
 	    if(rc == 0) //avi+
 		{
@@ -212,6 +216,11 @@ unsigned char GetByte()
 
 
 		}
+	    else
+	    {
+	        vme_index++;
+	    }
+
 		/***************************************************************
 		*
 		* Calculate the 32-bit CRC if the expected CRC exist.
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/ivm_core.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/ivm_core.c
index 62a2b3b0e..b4613b7d3 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/ivm_core.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/ivm_core.c
@@ -22,7 +22,7 @@
 *        the ispVMLCOUNT function
 * 
 ***************************************************************/
-
+#include "Include.h"
 #include <stdio.h>
 #include <string.h>
 #include "vmopcode.h"
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/vmopcode.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/vmopcode.h
index cdd05fd12..a6b5af2f1 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/vmopcode.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Full_Vme/ispvme/vmopcode.h
@@ -206,3 +206,5 @@ typedef struct {
 	unsigned short usNegativeIndex;
 	unsigned char  ucUpdate;
 } LVDSPair;
+
+extern uint32_t vme_index;
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Motors_Driver/L6470.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/Motors_Driver/L6470.c
index cd0b09b93..f92278657 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Motors_Driver/L6470.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Motors_Driver/L6470.c
@@ -7,6 +7,7 @@
 //#include "graphics_adapter.h"
 //#include "Embedded/include.h"
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include "drivers/SPI/SPI_Comm.h"
@@ -18,9 +19,6 @@
 
 //////////////
 //#include "stdafx.h"
-#include "L6470.h"
-//#include "FPGA_Comm.h"
-// To use time library of C
 #include <time.h>
 
 //int volatile * const MOSI_Reg = (int *)MOSI_BASE;
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/Motors_Driver/PowerSTEP01.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/Motors_Driver/PowerSTEP01.h
index bf1fe91d5..ab99cc340 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/Motors_Driver/PowerSTEP01.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/Motors_Driver/PowerSTEP01.h
@@ -7,8 +7,8 @@
  *      Author: avi
  */
 
-#ifndef DRIVERS_FPGA_MOTERS_DRIVER_POWERSTEP01_H_
-#define DRIVERS_FPGA_MOTERS_DRIVER_POWERSTEP01_H_
+#ifndef DRIVERS_FPGA_MOTORS_DRIVER_POWERSTEP01_H_
+#define DRIVERS_FPGA_MOTORS_DRIVER_POWERSTEP01_H_
 
 
 //powerSTEP01
@@ -165,4 +165,4 @@ typedef enum {
   POWERSTEP01_TDT_4000ns  = (((uint8_t)0x1F)<<POWERSTEP01_TDT_SHIFT)
 } powerstep01_Tdt_t;
 
-#endif /* DRIVERS_FPGA_MOTERS_DRIVER_POWERSTEP01_H_ */
+#endif /* DRIVERS_FPGA_MOTORS_DRIVER_POWERSTEP01_H_ */
diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c b/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c
index aa633483c..b921a883c 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c
@@ -12,6 +12,7 @@
  *************************************************************************************************/
 
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
 #include "include.h"
 #include "motor.h"
 #include "Modules/thread/thread.h"
@@ -25,9 +26,6 @@
 #include "drivers/FPGA/FPGA_SPI_Comm.h"
 #include "drivers/FPGA/FPGA_Comm.h"
 #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
-#include "drivers/FPGA/Moters_Driver/L6470.h"
-
-/////////////////////////
 #include "driverlib/ssi.h"
 
 extern unsigned long Run_Value ;
diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c
index a9cb3b01e..75870d4f7 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c
@@ -12,6 +12,7 @@
  *************************************************************************************************/
 
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
 #include "include.h"
 #include "motor.h"
 #include "Modules/thread/thread.h"
@@ -25,7 +26,6 @@
 #include "drivers/FPGA/FPGA_SPI_Comm.h"
 #include "drivers/FPGA/FPGA_Comm.h"
 #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
-#include "drivers/FPGA/Moters_Driver/L6470.h"
 #include "drivers/SSI_Comm/Dancer/Dancer.h"
 
 /////////////////////////
diff --git a/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c
index 858fc01cb..43174ec89 100644
--- a/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c
+++ b/Software/Embedded_SW/Embedded/Drivers/SPI/SPI_Comm.c
@@ -13,8 +13,6 @@
 #include "utils/uartstdio.h"
 
 //#include "graphics_adapter.h"
-#include "drivers/FPGA/Moters_Driver/L6470.h"
-#include "drivers/FPGA/Moters_Driver/PowerSTEP01.h"
 #include "PMR/Hardware/HardwareMotor.pb-c.h"
 
 //#include "drivers/FPGA/FPGA_Comm.h"
@@ -22,6 +20,8 @@
 #include <driverlib/rom.h>
 #include <driverlib/rom_map.h>
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
+#include <Drivers/FPGA/Motors_Driver/PowerSTEP01.h>
 #include "drivers/Motors/Motor.h"
 
 void temp_init_spi2();
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 94c7614d1..570121f73 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -11,6 +11,7 @@
 
 #include "AlarmHandling.h"
 #include <driverlib/timer.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
 #include <Drivers/SSI_Comm/SSI_Comm.h>
 #include <inc/hw_ints.h>
 
@@ -46,7 +47,6 @@
 
 #include "StateMachines/Printing/PrintingSTM.h"
 
-#include "drivers/FPGA/Moters_Driver/L6470.h"
 #include "drivers/Motors/Motor.h"
 #include "drivers/Heater/TemperatureSensor.h"
 #include "drivers/Flash_ram/FlashProgram.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c
index 61c7afe74..6bfb3f322 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c
@@ -8,6 +8,7 @@
 
 #include <Container.h>
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -30,8 +31,6 @@
 #include "drivers/FPGA/FPGA.h"
 #include "drivers/SPI/SPI_Comm.h"
 
-#include "drivers/FPGA/Moters_Driver/L6470.h"
-
 #include "driverlib/ssi.h"
 #include "drivers/SPI/SPI_Comm.h"
 #include "drivers/FPGA/FPGA_SSI_Comm.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 658205327..636889127 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_L6470.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_L6470.c
@@ -1,6 +1,7 @@
 
 #include <Container.h>
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
 #include <PMR/Stubs/StubL6470DriverResponse.pb-c.h>
 #include <PMR/Stubs/StubL6470DriverRequest.pb-c.h>
 #include <stdbool.h>
@@ -19,8 +20,6 @@
 //#include "drivers/FPGA/FPGA.h"
 #include "drivers/SPI/SPI_Comm.h"
 
-#include "drivers/FPGA/Moters_Driver/L6470.h"
-
 #include "driverlib/ssi.h"
 
     unsigned long Run_Value = 136902 ;
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 65ede8fac..0854aba40 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
@@ -1,6 +1,7 @@
 
 #include <Container.h>
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
 #include <PMR/Stubs/StubMotorInitRequest.pb-c.h>
 #include <PMR/Stubs/StubMotorInitResponse.pb-c.h>
 #include <PMR/Stubs/StubMotorRunRequest.pb-c.h>
@@ -37,8 +38,6 @@
 #include "drivers/FPGA/FPGA.h"
 #include "drivers/SPI/SPI_Comm.h"
 
-#include "drivers/FPGA/Moters_Driver/L6470.h"
-
 #include "driverlib/ssi.h"
 #include "drivers/SPI/SPI_Comm.h"
 #include "Modules/Thread/Thread_ex.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SpeedSensor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SpeedSensor.c
index eea594817..4e6c4cf84 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SpeedSensor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_SpeedSensor.c
@@ -9,6 +9,7 @@
 
 #include <Container.h>
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -28,8 +29,6 @@
 #include "drivers/FPGA/FPGA.h"
 #include "drivers/SPI/SPI_Comm.h"
 
-#include "drivers/FPGA/Moters_Driver/L6470.h"
-
 #include "driverlib/ssi.h"
 #include "drivers/SPI/SPI_Comm.h"
 #include "drivers/FPGA/FPGA_SSI_Comm.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_TempSensor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_TempSensor.c
index f25a79b15..c320cca80 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_TempSensor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_TempSensor.c
@@ -7,6 +7,7 @@
 
 #include <Container.h>
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/L6470.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -29,8 +30,6 @@
 #include "drivers/FPGA/FPGA.h"
 #include "drivers/SPI/SPI_Comm.h"
 
-#include "drivers/FPGA/Moters_Driver/L6470.h"
-
 #include "driverlib/ssi.h"
 #include "drivers/SPI/SPI_Comm.h"
 #include "drivers/FPGA/FPGA_SSI_Comm.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
index a1e91f6fc..c277dd5df 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
@@ -2,6 +2,7 @@
  **************************************************************************************************************************/
 
 #include <DataDef.h>
+#include <Drivers/FPGA/Motors_Driver/PowerSTEP01.h>
 #include "include.h"
 
 #include "PMR/Hardware/UploadHardWareConfigurationRequest.pb-c.h"
@@ -17,8 +18,6 @@
 #include "drivers/Flash_Memory/fatfs/ff.h"
 #include "drivers/SSI_Comm/Dancer/Dancer.h"
 
-#include "drivers/FPGA/Moters_Driver/PowerSTEP01.h"
-
 #include "thread.h"
 MotorDriverConfigStruc  MotorsCfg[NUM_OF_MOTORS]={0};
 HardwarePidControl MotorsControl[MAX_THREAD_MOTORS_NUM] = {0};