Merge pull request #300 from lnls-sirius/add-cax-eve-2-timing

Update timing tables with new CAX EVE
lnls-sirius · Sep 5, 2023 · 06ba6cc · 06ba6cc
2 parents 71fcc28 + af22d98
commit 06ba6cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.57.1
+1.58.0
diff --git a/timesys/timing-devices-connection.txt b/timesys/timing-devices-connection.txt
@@ -13,7 +13,7 @@
 
 
 
-# 569
+# 574
 AS-RaMO:TI-EVG:OUT0                 RA-RaMO:CO-DIO:P05
 AS-RaMO:TI-EVG:OUT1                 RA-RaMO:CO-DIO:P01
 AS-RaMO:TI-EVG:OUT2                 RA-RaMO:CO-DIO:P02
@@ -60,6 +60,7 @@ CA-RaTim:TI-Fout-4:OUT3             CA-RaCtrl:CO-DIO-4:P23
 CA-RaTim:TI-Fout-4:OUT4             CA-RaCtrl:CO-DIO-5:P05
 CA-RaTim:TI-Fout-4:OUT5             CA-RaCtrl:CO-DIO-5:P11
 CA-RaTim:TI-Fout-4:OUT6             CA-RaCtrl:CO-DIO-5:P17
+CA-RaTim:TI-Fout-4:OUT7             CA-RaCtrl:CO-DIO-11:P19
 CA-RaTim:TI-Fout-5:OUT0             CA-RaCtrl:CO-DIO-6:P05
 CA-RaTim:TI-Fout-5:OUT1             CA-RaCtrl:CO-DIO-6:P11
 CA-RaTim:TI-Fout-5:OUT2             CA-RaCtrl:CO-DIO-6:P23
@@ -96,6 +97,7 @@ CA-RaCtrl:CO-DIO-4:P23              IA-11RaCtrl:CO-DIO-2:P05
 CA-RaCtrl:CO-DIO-5:P05              IA-12RaCtrl:CO-DIO-2:P05
 CA-RaCtrl:CO-DIO-5:P11              IA-13RaCtrl:CO-DIO-2:P05
 CA-RaCtrl:CO-DIO-5:P17              IA-14RaCtrl:CO-DIO-2:P05
+CA-RaCtrl:CO-DIO-11:P19             BA-CAXA:CO-DIO:P01
 CA-RaCtrl:CO-DIO-6:P05              IA-15RaCtrl:CO-DIO-2:P05
 CA-RaCtrl:CO-DIO-6:P11              IA-16RaCtrl:CO-DIO-2:P05
 CA-RaCtrl:CO-DIO-6:P23              IA-17RaCtrl:CO-DIO-2:P05
@@ -136,6 +138,7 @@ IA-11RaCtrl:CO-DIO-2:P05            IA-11RaBPM:TI-AMCFPGAEVR:SFP8
 IA-12RaCtrl:CO-DIO-2:P05            IA-12RaBPM:TI-AMCFPGAEVR:SFP8
 IA-13RaCtrl:CO-DIO-2:P05            IA-13RaBPM:TI-AMCFPGAEVR:SFP8
 IA-14RaCtrl:CO-DIO-2:P05            IA-14RaBPM:TI-AMCFPGAEVR:SFP8
+BA-CAXA:CO-DIO:P01                  BA-CAXA:TI-EVE:UPLINK
 IA-15RaCtrl:CO-DIO-2:P05            IA-15RaBPM:TI-AMCFPGAEVR:SFP8
 IA-16RaCtrl:CO-DIO-2:P05            IA-16RaBPM:TI-AMCFPGAEVR:SFP8
 IA-17RaCtrl:CO-DIO-2:P05            IA-17RaBPM:TI-AMCFPGAEVR:SFP8
@@ -364,6 +367,7 @@ IA-14RaBPM:TI-AMCFPGAEVR:FMC2CH1    IA-14RaPS01:PS-UDC-SI5:SYNCIN
 IA-14RaBPM:TI-AMCFPGAEVR:FMC2CH2    IA-14RaPS02:PS-UDC-SI1:SYNCIN
 IA-14RaBPM:TI-AMCFPGAEVR:FMC2CH3    IA-14RaPS02:PS-UDC-SI3:SYNCIN
 IA-14RaBPM:TI-AMCFPGAEVR:FMC2CH4    IA-14RaPS02:PS-UDC-SI4:SYNCIN
+BA-CAXA:TI-EVE:OUT0                 BA-CAXB:DI-ScrnCam:TRIGIN
 IA-15RaBPM:TI-AMCFPGAEVR:FMC1CH2    IA-15RaPS01:PS-UDC-SI1:SYNCIN
 IA-15RaBPM:TI-AMCFPGAEVR:FMC1CH3    IA-15RaPS01:PS-UDC-SI2:SYNCIN
 IA-15RaBPM:TI-AMCFPGAEVR:FMC1CH4    IA-15RaPS01:PS-UDC-SI3:SYNCIN
@@ -415,7 +419,7 @@ IA-20RaBPM:TI-AMCFPGAEVR:FMC2CH1    IA-20RaPS01:PS-UDC-SI5:SYNCIN
 IA-20RaBPM:TI-AMCFPGAEVR:FMC2CH2    IA-20RaPS02:PS-UDC-SI1:SYNCIN
 IA-20RaBPM:TI-AMCFPGAEVR:FMC2CH3    IA-20RaPS02:PS-UDC-SI3:SYNCIN
 IA-20RaBPM:TI-AMCFPGAEVR:FMC2CH4    IA-20RaPS02:PS-UDC-SI4:SYNCIN
-IA-07RaCtrl:CO-DIO-2:P24            BA-IMBA:TI-EVR:UPLINK
+IA-07RaCtrl:CO-DIO-2:P24            BA-IMBA:CO-DIO:P01
 LA-MDH01RACK1:TI-OEMultPOF:OUT1     LI-RaMD01:MD-PPS:TRIGIN
 LA-MDH01RACK2:TI-OEMultPOF:OUT1     LI-RaMD02:MD-PPS:TRIGIN
 LA-RFH01RACK1:TI-OEMultPOF:OUT1     LI-RaRF02:RF-SSAmp-1:TRIG500MHZ
@@ -524,6 +528,7 @@ IA-19RaPS02:PS-UDC-SI1:SYNCOUT      IA-19RaPS02:PS-UDC-SI2:SYNCIN
 IA-19RaPS02:PS-UDC-SI4:SYNCOUT      IA-19RaPS02:PS-UDC-SI5:SYNCIN
 IA-20RaPS02:PS-UDC-SI1:SYNCOUT      IA-20RaPS02:PS-UDC-SI2:SYNCIN
 IA-20RaPS02:PS-UDC-SI4:SYNCOUT      IA-20RaPS02:PS-UDC-SI5:SYNCIN
+BA-IMBA:CO-DIO:P01                  BA-IMBA:TI-EVR:UPLINK
 LI-IET01RACK1:CO-DIO:P01            LI-IET01RACK1:TI-OEMultSFP:OE1
 LI-IET01RACK1:CO-DIO:P02            LI-IET01RACK1:TI-OEMultSFP:OE2
 LI-IET01RACK1:CO-DIO:P03            LI-IET01RACK1:TI-OEMultSFP:OE3
@@ -590,11 +595,16 @@ BO-02U:TI-OESglSFP:INTX             IA-20RaDiag01:TI-EVR:INRX1
 
 
 # CONNECTIONS NOT USED
-# 25
+# 30
 # BO-01D:TI-OESglSFPPS-1:PWROUT       BO-01D:TI-OESglSFP-1:PWRIN
 # BO-01D:TI-OESglSFPPS-2:PWROUT       BO-01D:TI-OESglSFP-2:PWRIN
 # BO-02U:TI-OESglSFPPS:PWROUT         BO-02U:TI-OESglSFP:PWRIN
 # BO-50U:TI-OESglSFPPS:PWROUT         BO-50U:TI-OESglSFP:PWRIN
+# CA-RaCtrl:CO-DIO-11:P20             BA-CAXA:CO-DIO:P02
+# CA-RaCtrl:CO-DIO-11:P21             BA-CAXA:CO-DIO:P03
+# CA-RaCtrl:CO-DIO-11:P22             BA-CAXA:CO-DIO:P04
+# CA-RaCtrl:CO-DIO-11:P23             BA-CAXA:CO-DIO:P05
+# CA-RaCtrl:CO-DIO-11:P24             BA-CAXA:CO-DIO:P06
 # CA-RaCtrl:CO-DIO-1:P044             RA-RaSIA01:CO-DIO:P044
 # IA-14RaDiag03:TI-EVE:IN1            SI-14SB:DI-DCCTDig:TRIGOUT
 # IA-14RaDiag03:TI-EVE:IN2            SI-13SA:DI-DCCTDig:TRIGOUT