From d7e484a764d761afa0a55efd82e1fd2c3b338270 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 14 May 2018 13:38:20 +0300 Subject: PID&dancers --- .../Embedded/Drivers/Danser_SSI/SSI_Comm.c | 4 +- .../Embedded/Drivers/FPGA/FPGA_SPI_Comm.c | 180 +++++---------------- .../Embedded/Drivers/FPGA/FPGA_SSI_Comm.c | 10 +- .../Embedded/Drivers/FPGA/FPGA_SSI_Comm.h | 2 +- .../Embedded/Modules/Stubs_Handler/Stub_Dancer.c | 2 +- .../Embedded/Modules/Thread/Thread_print.c | 2 + 6 files changed, 52 insertions(+), 148 deletions(-) (limited to 'Software/Embedded_SW/Embedded') 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 5c6055fe7..b9d488231 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Danser_SSI/SSI_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/Danser_SSI/SSI_Comm.c @@ -230,10 +230,10 @@ uint32_t Read_Dancer_Position (HardwareDancerType DancerId) SSIDisable(SSI1_BASE); return SSI_enc.Position; #else - // must call FPGA_SSI_Transnit first! + // must call FPGA_SSI_Transmit first! HardwareDancerType Dancer_Id = (HardwareDancerType)DancerId;//to remove warning FPGA_SSI_Receive(Dancer_Id); - FPGA_SSI_Transnit(Dancer_Id); + FPGA_SSI_Transmit(Dancer_Id); return DANCER_ENC[Dancer_Id].Position; #endif } 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 91e9c644a..0b28af921 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c @@ -204,146 +204,46 @@ void FPGA_GetBusy() F2_SPI_BUSY2.ushort = F2_SPI_Busy2_D; //F3_SPI_BUSY1.ushort = F3_SPI_Busy1_D; - for spare motors - for(i=0; i= MotorsControl[index].pvinputfilterfactormode) MotorSamplePointer[index] = 0; -- cgit v1.3.1