diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-08-12 14:47:12 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-08-12 14:47:12 +0300 |
| commit | 90d56e2812004dacd6d932a3dfda87ada65bb888 (patch) | |
| tree | 9cd8f0d55fb940930bba2f4a137e3a0ad8e16be0 /Software/Embedded_SW/Embedded/Drivers/FPGA | |
| parent | 4b802d50505ef42f19dc9345ac5cffc0db674419 (diff) | |
| download | Tango-90d56e2812004dacd6d932a3dfda87ada65bb888.tar.gz Tango-90d56e2812004dacd6d932a3dfda87ada65bb888.zip | |
Add reading of spare LS for 4 winders demo
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers/FPGA')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h | 18 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h index aaf623b0d..9ced24880 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h @@ -761,6 +761,24 @@ #define F3_LOw_Cart_Led3 F3_low_var_SPARE2_2 #define F3_High_Cart_Led3 F3_high_var_SPARE2_2 +//F3_LS_01_Direct +typedef union +{ + struct + { + bool F3_LS_SPARE2_4 : 1; //0 + bool F3_LS_SPARE2_3 : 1; //1 + bool F3_LS_SPARE2_2 : 1; //2 + bool F3_LS_SPARE2_1 : 1; //3 + bool F3_LS_SPARE1_4 : 1; //4 + bool F3_LS_SPARE1_3 : 1; //5 + bool F3_LS_SPARE1_2 : 1; //6 + bool F3_LS_SPARE1_1 : 1; //7 + char F3_LS_01_RESERVE : 8; //8-16 + }bits; + unsigned short ushort; +}F3_LS_01; + //F3_GPI_02_Direct typedef union { 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 303d5a43d..1528473a1 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 @@ -120,6 +120,7 @@ LS_DISPENSER_3_4 LS_Dispenser_3_4; LS_DISPENSER_5_6 LS_Dispenser_5_6; LS_DISPENSER_7_8 LS_Dispenser_7_8; LS_DRYER_DH Ls_Dryer_Dh; +F3_LS_01 LS_Spare; void FPGA_Read_LS_Safty_Ind_Reg() { @@ -133,6 +134,7 @@ void FPGA_Read_LS_Safty_Ind_Reg() LS_Dispenser_5_6.ushort = F2_LS_03_Direct; LS_Dispenser_7_8.ushort = F2_LS_04_Direct; Ls_Dryer_Dh.ushort = F1_GPI_LS1_D; //F1_LS_01_Direct + LS_Spare.ushort = F3_LS_01_Direct; /* temp[0] = LS_Dispenser_1_2.bits.F2_LS_DISPENSER_DOWN_1 + LS_Dispenser_1_2.bits.F2_LS_DISPENSER_50_1 + LS_Dispenser_1_2.bits.F2_LS_DISPENSER_75_1 + LS_Dispenser_1_2.bits.F2_LS_DISPENSER_UP_1; |
