diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-05-08 14:26:40 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-05-08 14:26:40 +0300 |
| commit | db0c657de9daf7f4d99e3167a337ebcd79771d8e (patch) | |
| tree | f5c99ac8e967bc7d3f513d7a47640f5e96f041cc /Software/Embedded_SW/Embedded/Drivers | |
| parent | dc911b096b06388d9bf84d86d35c8d19c84d6e4b (diff) | |
| parent | 706b7f128efe759c7f8efe5379b572aca45e8c7e (diff) | |
| download | Tango-db0c657de9daf7f4d99e3167a337ebcd79771d8e.tar.gz Tango-db0c657de9daf7f4d99e3167a337ebcd79771d8e.zip | |
Merge trial
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h | 6 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c index 2b3631128..52a4ffe12 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c @@ -147,7 +147,7 @@ void Init_FPGA() // temp = (volatile uint32_t *) (EPI0_BASE+0x10); // Set EPI Mode - EPIConfigGPModeSet(EPI0_BASE, EPI_GPMODE_CLKPIN |EPI_GPMODE_FRAME50 | EPI_GPMODE_ASIZE_12 | EPI_GPMODE_DSIZE_16, 4, 0); + EPIConfigGPModeSet(EPI0_BASE, EPI_GPMODE_CLKPIN |EPI_GPMODE_WRITE2CYCLE |EPI_GPMODE_FRAME50 | EPI_GPMODE_ASIZE_12 | EPI_GPMODE_DSIZE_16, 4, 0); //Set EPI CLK EPIDividerSet(EPI0_BASE, 10);//60MHz diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h index dd3c8497e..4c83ab565 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h @@ -6,9 +6,9 @@ #define BASE 0x60000000 //0x00 << 12 //TODO -#define FPGA1_BASE (BASE | ((0x00 << 0x09)* Word1OrByte2)) -#define FPGA2_BASE (BASE | ((0x01 << 0x09)* Word1OrByte2)) -#define FPGA3_BASE (BASE | ((0x02 << 0x09)* Word1OrByte2)) +#define FPGA1_BASE (BASE | ((0x00 << 0x09)* Word1OrByte2)) //0x60000000 +#define FPGA2_BASE (BASE | ((0x01 << 0x09)* Word1OrByte2)) //0x60000400 +#define FPGA3_BASE (BASE | ((0x02 << 0x09)* Word1OrByte2)) //0x60000800 //TODO update the addresses Word1OrByte2 !!! #define Word1OrByte2 0x02//0x01 for Word, 0x02 for Byte 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 4de85aab0..b2e75fb2e 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c @@ -478,7 +478,9 @@ void FPGA_SetMotStop(TimerMotors_t _motorId) Fpga_Spi[_motorId].TX_MOSI = x_HARD_STOP; //TODO which default value? break; } - Fpga_Spi[_motorId].AMT_OF_Words = 1; + + Fpga_Spi[_motorId].TX_MOSI = Fpga_Spi[_motorId].TX_MOSI << 8;// move the command to the MSB TODO necessary??? + Fpga_Spi[_motorId].AMT_OF_Words = 1;//TODO ? FPGA_SPI_Transnit(_motorId); } |