diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-06-21 10:00:13 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-06-21 10:00:13 +0300 |
| commit | 49d033e9abb82d2d2853f4e1ddacb37abedd9fda (patch) | |
| tree | bd00d123f0c4441c33002fcd807a8332819ac2d1 /Software | |
| parent | c1cf0d6a3c788bb48d4dec57520c57476d4ac988 (diff) | |
| parent | a6ace283b5f59f9913b5f0468b417ebd8856b821 (diff) | |
| download | Tango-49d033e9abb82d2d2853f4e1ddacb37abedd9fda.tar.gz Tango-49d033e9abb82d2d2853f4e1ddacb37abedd9fda.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c | 24 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Main.c | 1 |
2 files changed, 17 insertions, 8 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c index e05979f6e..758a41788 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c @@ -31,9 +31,9 @@ void Read_FPGA_GPI_Rgisters() FPGA_Gpi.Reg.LS_01 = F2_LS_01_Direct; - FPGA_Gpi.Reg.LS_01 = F2_LS_01_Direct; - FPGA_Gpi.Reg.LS_01 = F2_LS_01_Direct; - FPGA_Gpi.Reg.LS_01 = F2_LS_01_Direct; + FPGA_Gpi.Reg.LS_02 = F2_LS_02_Direct; + FPGA_Gpi.Reg.LS_03 = F2_LS_03_Direct; + FPGA_Gpi.Reg.LS_04 = F2_LS_04_Direct; FPGA_Gpi.Reg.GPI_EXTWINDER = F1_GPI_EXTWINDER_D; @@ -60,8 +60,8 @@ void test_fpga_gpi() { int nop = 0; -//while(1) -//{ +while(1) +{ Read_FPGA_GPI_Rgisters(); if( //FPGA_Gpi_Buf[GPI_LS_LPIVOT_UP] | @@ -79,8 +79,16 @@ void test_fpga_gpi() // // FPGA_Gpi_Buf[GPI_LS_SCREW_RIGHT] | //FPGA_Gpi_Buf[GPI_LS_SCREW_LEFT] // | - FPGA_Gpi_Buf[GPI_F1_GPI_TFEED_BREAK_2] - == LIMIT) +// FPGA_Gpi_Buf[GPI_F1_GPI_TFEED_BREAK_2] +// == LIMIT) + + FPGA_Gpi_Buf[GPI_LS_DISPENSER_DOWN_7] + == LIMIT) + +// GPI_LS_DISPENSER_DOWN_7, //98 +// GPI_LS_DISPENSER_75_7, //99 +// GPI_LS_DISPENSER_25_7, //100 +// GPI_LS_DISPENSER_UP_7, //101 { nop += 1; } @@ -89,7 +97,7 @@ void test_fpga_gpi() nop += 2; } -//} +} } diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c index 368802730..c57cd969d 100644 --- a/Software/Embedded_SW/Embedded/Main.c +++ b/Software/Embedded_SW/Embedded/Main.c @@ -176,6 +176,7 @@ int main(void) //test_fpga_gpi(); //FPGA_Read_limit_Switches_Registers(); + //test_fpga_gpi(); //Run_I2C(/*ui32SysClock*/); //----------------------------------------------------------- |