From cfd5d9ffa46286f27d8523d7fd4cc524d267da8a Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 22 Nov 2018 14:34:02 +0200 Subject: Version 1.1.4.4: waste valve handling, L6470 errate fix, and other bugs --- Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c | 6 ++++-- Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Drivers') diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c index f661afb2f..649de045e 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c @@ -83,6 +83,7 @@ int FPGA_ReadVersion(unsigned char FPGA_NUM, unsigned char *Version, unsigned c { VER1 Ver1; VER2 Ver2; +#ifndef EVALUATION_BOARD switch(FPGA_NUM) { @@ -112,7 +113,7 @@ int FPGA_ReadVersion(unsigned char FPGA_NUM, unsigned char *Version, unsigned c *Day = Ver1.bytes.Day; *Year = Ver2.bytes.Year; // to check how many digits is needed *Version = Ver2.bytes.Ver_num; - +#endif return PASSED; } @@ -193,6 +194,7 @@ uint32_t Read_Fans_Tacho() { uint32_t Status = 0; uint32_t Drawer_Fan_Speed_RPM = 0; +#ifndef EVALUATION_BOARD // The big Fan in the drawer Drawer_Fan_Speed_RPM = Calculate_Tacho_Fan_Speed(25000000, 0X02, F1_Prescaler1_reg5, F1_Tacho_reg0); @@ -237,7 +239,7 @@ uint32_t Read_Fans_Tacho() else Status&= ~(0x01<<4);//working } - +#endif return Status; } diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c index 25b18e48a..9bc8f3db6 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SSI_Comm.c @@ -70,16 +70,19 @@ static FpgaDancerMap_t FpgaSpeedSensorMap = uint8_t FPGA_SSI_Speed_Sensor_Transnit() { +#ifndef EVALUATION_BOARD //if(*FpgaSpeedSensorMap.SSI_Busy == NOTBUSY) { uint32_t SSI_Dummy_TX= 0x123456; // Dummy *FpgaSpeedSensorMap.TX_Reg = SSI_Dummy_TX ; } +#endif return OK; } uint32_t FPGA_SSI_Speed_Sensor_Receive() { +#ifndef EVALUATION_BOARD INT2SHORT Int2Short; //unsigned int temp; @@ -88,7 +91,7 @@ uint32_t FPGA_SSI_Speed_Sensor_Receive() Int2Short.ushort.MSB = *FpgaSpeedSensorMap.RX_M; //temp = Int2Short.uint; SpeedSensorResponseS.Speed = Int2Short.uint; - +#endif //return OK; return SpeedSensorResponseS.Speed; } -- cgit v1.3.1