diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-07-29 16:13:11 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-07-29 16:13:11 +0300 |
| commit | bf989bcfa848e20f8bd27aa71acc2fbdee38f57b (patch) | |
| tree | d68b6d05a5810f34af0d1f97a629c27a61a634ec /Software/Embedded_SW | |
| parent | 0268cfdbfeb55fd970199130d98658845d55eb66 (diff) | |
| download | Tango-bf989bcfa848e20f8bd27aa71acc2fbdee38f57b.tar.gz Tango-bf989bcfa848e20f8bd27aa71acc2fbdee38f57b.zip | |
Add support of LS for ARC:
- I2C_HEADCARD_ARC_LS_ACTUATOR
- I2C_HEADCARD_COVER_LS_ARC
- I2C_HEADCARD_COVER_LS_TUNNEL_ARC
Diffstat (limited to 'Software/Embedded_SW')
3 files changed, 23 insertions, 16 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 6069c78ff..626ad9293 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 @@ -433,17 +433,21 @@ bool FPGA_Read_limit_Switches(FPGA_GPI_ENUM Limit_Switch) LM_Status = LS_Left.bits.F1_LS_LSPARE2; break; case I2C_HEADCARD_COVER_LS_FRONT: - if(Head_Type == HEAD_TYPE_SYLKO) - LM_Status = !(Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT); + case I2C_HEADCARD_ARC_LS_ACTUATOR: + LM_Status = !(Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT_ARC_ACT); break; case I2C_HEADCARD_COVER_LS_REAR: - if(Head_Type == HEAD_TYPE_SYLKO) - LM_Status = !(Head_I2C_EXP4_0x46.bits.INPUT_LS_REAR); + case I2C_HEADCARD_COVER_LS_ARC: + LM_Status = !(Head_I2C_EXP4_0x46.bits.INPUT_LS_REAR_ARC_COVER); break; case I2C_HEADCARD_COVER_LS_UPPER: if(Head_Type == HEAD_TYPE_SYLKO) LM_Status = !(Head_I2C_EXP4_0x46.bits.INPUT_LS_UP); break; + case I2C_HEADCARD_COVER_LS_TUNNEL_ARC: + if(Head_Type == HEAD_TYPE_STAPLE_SPUN) + LM_Status = !(Head_I2C_EXP4_0x46.bits.INPUT_LS_ARC_TUNNEL_COVER); + break; default : LM_Status = NO_LIMIT; break; diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h index 0ff0fa2de..a7999ea2e 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h @@ -162,6 +162,9 @@ typedef enum I2C_HEADCARD_COVER_LS_FRONT, I2C_HEADCARD_COVER_LS_REAR, I2C_HEADCARD_COVER_LS_UPPER, + I2C_HEADCARD_ARC_LS_ACTUATOR, + I2C_HEADCARD_COVER_LS_ARC, + I2C_HEADCARD_COVER_LS_TUNNEL_ARC, //----------------------- MAX_GPI diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h index 33187d1f6..bfaf5937d 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h @@ -138,19 +138,19 @@ typedef union bool IN_ACTLOW_OCUR_BREAK_HTOT2 : 1; //P01 bool IN_ACTLOW_OCUR_BREAK_HTOT3 : 1; //P02 bool IN_ACTLOW_OCUR_BREAK_HTOT4 : 1; //P03 - bool INPUT_BREAK_MIX : 1; //P04 - bool INPUT_ACTLOW_LIMIT_740W : 1; //P05 - bool INPUT_FAN_ALERT : 1; //P06 - bool OUTPUT_ACT_DIR : 1; //P07 + bool INPUT_BREAK_MIX : 1; //P04 + bool INPUT_ACTLOW_LIMIT_740W : 1; //P05 + bool INPUT_FAN_ALERT : 1; //P06 + bool OUTPUT_ACT_DIR : 1; //P07 - bool INPUT_ACTIN_EN : 1; //p10 - bool INPUT_ACTOT_EN : 1; //p11 - bool OUTPUT_ACTLOW_ACTIN_ON : 1; //p12 - bool OUTPUT_ACTLOW_ACTOT_ON : 1; //p13 - bool INPUT_LS_FRONT : 1; //p14 - bool INPUT_LS_REAR : 1; //p15 - bool INPUT_LS_UP : 1; //p16 - bool INPUT_LS_SPARE : 1; //p17 + bool INPUT_ACTIN_EN : 1; //p10 + bool INPUT_ACTOT_EN : 1; //p11 + bool OUTPUT_ACTLOW_ACTIN_ON : 1; //p12 + bool OUTPUT_ACTLOW_ACTOT_ON : 1; //p13 + bool INPUT_LS_FRONT_ARC_ACT : 1; //p14 + bool INPUT_LS_REAR_ARC_COVER : 1; //p15 + bool INPUT_LS_UP : 1; //p16 + bool INPUT_LS_ARC_TUNNEL_COVER : 1; //p17 }bits; unsigned char uchar[2]; unsigned short ushort; |