Skip to content

Commit

Permalink
Updated projects on Wed Oct 18 04:20:47 PDT 2023
Browse files Browse the repository at this point in the history
  • Loading branch information
@klauer
klauer committed Oct 18, 2023
1 parent be92d61 commit 7c6acfc
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/source/axes.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ Version `8335d3d <https://github.com/pcdshub/lcls-plc-rix-sds-injector/tree/8335
pcdshub/lcls-plc-rixs-optics
----------------------------

Version `v2.2.3~1 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/7e0a3ba94a33b53e9be3156cdc5a68167866855c>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_
Version `v2.2.4~1 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/0260caad5aa5c9da25ed159f69f9340681bbe01c>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_

.. list-table:: pcdshub/lcls-plc-rixs-optics Axes
:header-rows: 1
Expand Down
2 changes: 1 addition & 1 deletion docs/source/ethercat.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11025,7 +11025,7 @@ Version `8335d3d <https://github.com/pcdshub/lcls-plc-rix-sds-injector/tree/8335
pcdshub/lcls-plc-rixs-optics
----------------------------

Version `v2.2.3~1 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/7e0a3ba94a33b53e9be3156cdc5a68167866855c>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_
Version `v2.2.4~1 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/0260caad5aa5c9da25ed159f69f9340681bbe01c>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_


#. **Term 1 (EK1200) [ID: 1]**
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ This summary was generated |today|.
- `8335d3d <https://github.com/pcdshub/lcls-plc-rix-sds-injector/tree/8335d3d02a08af0d4e803ec1fa12e74f2e5f172f>`_
- `pcdshub/lcls-plc-rix-sds-injector Docs <https://pcdshub.github.io/lcls-plc-rix-sds-injector>`_
* - `pcdshub/lcls-plc-rixs-optics <https://github.com/pcdshub/lcls-plc-rixs-optics>`_
- `v2.2.3~1 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/7e0a3ba94a33b53e9be3156cdc5a68167866855c>`_
- `v2.2.4~1 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/0260caad5aa5c9da25ed159f69f9340681bbe01c>`_
- `pcdshub/lcls-plc-rixs-optics Docs <https://pcdshub.github.io/lcls-plc-rixs-optics>`_
* - `pcdshub/lcls-plc-roving-spectrometer <https://github.com/pcdshub/lcls-plc-roving-spectrometer>`_
- `v0.1.0-7-gefe2857 <https://github.com/pcdshub/lcls-plc-roving-spectrometer/tree/efe2857f39add982601ac2bda0900c58fd69f642>`_
Expand Down
6 changes: 3 additions & 3 deletions docs/source/versions.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4506,7 +4506,7 @@ Version `8335d3d <https://github.com/pcdshub/lcls-plc-rix-sds-injector/tree/8335
pcdshub/lcls-plc-rixs-optics: rixs_optics
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Version `v2.2.3~1 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/7e0a3ba94a33b53e9be3156cdc5a68167866855c>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_
Version `v2.2.4~1 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/0260caad5aa5c9da25ed159f69f9340681bbe01c>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_

.. list-table:: pcdshub/lcls-plc-rixs-optics: rixs_optics
:header-rows: 1
Expand All @@ -4521,7 +4521,7 @@ Version `v2.2.3~1 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/7e0a3ba9

- ``*`` SLAC

- ``2.7.0`` SLAC
- ``2.10.0`` SLAC

* - PMPS
-
Expand Down Expand Up @@ -6749,7 +6749,7 @@ LCLS General

- ``*``, SLAC

- ``2.7.0``, SLAC
- ``2.10.0``, SLAC


* - pcdshub/lcls-plc-rix-sds-injector:sdsinjector
Expand Down
2 changes: 1 addition & 1 deletion plcs/lcls-plc-rixs-optics
Submodule lcls-plc-rixs-optics updated 70 files
+9 −9 GratingMonoScope/VSSettings/.vsm
+1 −1 lcls-plc-rixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122).xti
+1 −1 ...rixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/SL1K2-EXIT (EK1100)/EL2004_SL1K2.xti
+1 −1 ...xs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/SL1K2-EXIT (EK1100)/EL3201_SL1K2_1.xti
+1 −1 ...xs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/SL1K2-EXIT (EK1100)/EL3201_SL1K2_2.xti
+1 −1 ...xs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/SL1K2-EXIT (EK1100)/EL3201_SL1K2_3.xti
+1 −1 ...xs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/SL1K2-EXIT (EK1100)/EL3201_SL1K2_4.xti
+1 −1 ...rixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/SL1K2-EXIT (EK1100)/EL4004_SL1K2.xti
+1 −1 ...ptics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/X1 SP1K1-MONO(EK1100)/SP1K1-EL1004-E17.xti
+1 −1 ...ptics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/X1 SP1K1-MONO(EK1100)/SP1K1-EL3202-E13.xti
+1 −1 ...ptics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/X1 SP1K1-MONO(EK1100)/SP1K1-EL3202-E14.xti
+1 −1 ...ptics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/X1 SP1K1-MONO(EK1100)/SP1K1-EL3204-E15.xti
+1 −1 ...ptics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/X1 SP1K1-MONO(EK1100)/SP1K1-EL3204-E16.xti
+1 −1 ...optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/E5 (EK1122)/X1 SP1K1-MONO(EK1100)/SP1K1-EL9410-E1.xti
+1 −1 lcls-plc-rixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/PMPS_FFO.xti
+1 −1 ...-rixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_M1K2/EL1004_M1K2_STO.xti
+1 −1 ...optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_M1K2/Term 18 (EL3202-0010).xti
+1 −1 ...optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_M1K2/Term 19 (EL3202-0010).xti
+1 −1 ...optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_M1K2/Term 20 (EL3202-0010).xti
+1 −1 ...-rixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_M1K2/Term 7 (EL9410).xti
+1 −1 ...rixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1/EL1004_M1K1_STO.xti
+1 −1 ...ptics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1/EL6001_M1K1_PitchFine.xti
+1 −1 ...ixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1/Term 64 (EL9410).xti
+1 −1 ...ptics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1/Term 75 (EL3202-0010).xti
+1 −1 ...ptics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1/Term 76 (EL3202-0010).xti
+1 −1 ..._Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1_BEND/EL1004_M1K1_BENDER_STO.xti
+1 −1 ...fig/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1_BEND/EL2024-0010_M1K1_BEND_LED1.xti
+1 −1 ...fig/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1_BEND/EL2024-0010_M1K1_BEND_LED2.xti
+1 −1 ...ig/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1_BEND/EL3202-0010_M1K1DS2_M1K1DS3.xti
+1 −1 ...ig/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1_BEND/EL3202-0010_M1K1US1_M1K1US2.xti
+1 −1 ...ig/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1_BEND/EL3202-0010_M1K1US3_M1K1DS1.xti
+1 −1 ...Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1_BEND/EL9576_M1K1_BEND_DS_PWR.xti
+1 −1 ...Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1_BEND/EL9576_M1K1_BEND_US_PWR.xti
+1 −1 ...ptics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_MR1K1_BEND/Term 54 (EL9512).xti
+1 −1 ...ixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 5 (EK1122)/EK1100_ST1K2_ZOS/ST1K1-EL2008.xti
+1 −1 ...rixs-optics/_Config/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010).xti
+1 −1 ...g/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 307 (EL2202).xti
+1 −1 ...g/IO/Device 1 (EtherCAT)/Term 1 (EK1200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 309 (EL6695).xti
+1 −1 ...200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2/Term 124 (EL9221-5000).xti
+1 −1 ... (EK1200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2/Term 142 (EL9410).xti
+1 −1 ...200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2/Term 143 (EL3204)_RTDs.xti
+1 −1 ...Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2/Term 144 (EL3202-0010)_RTDs.xti
+1 −1 ...200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/EL1004_M3K2_STO.xti
+1 −1 ...9 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/EL2024-0010_M3K2_BEND_LED1.xti
+1 −1 ...9 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/EL2024-0010_M3K2_BEND_LED2.xti
+1 −1 ... (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/EL3202-0010_M3K2US3_M3K2DS1.xti
+1 −1 ...m 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/EL9576_M3K2_BEND_DS_PWR.xti
+1 −1 ...m 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/EL9576_M3K2_BEND_US_PWR.xti
+1 −1 ...0)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/Term 156 (EL3054).xti
+1 −1 ...0)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/Term 158 (EL9512).xti
+1 −1 ... (EK1200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2/Term 100 (EL9410).xti
+1 −1 ...200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2/Term 102 (EL3204)_RTDs.xti
+1 −1 ...Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2/Term 103 (EL3202-0010)_RTDs.xti
+1 −1 ...1200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2/Term 96 (EL9221-5000).xti
+1 −1 ...200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2_BENDER/EL1004_M4K2_STO.xti
+1 −1 ...9 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2_BENDER/EL2024-0010_M4K2_BEND_LED1.xti
+1 −1 ...9 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2_BENDER/EL2024-0010_M4K2_BEND_LED2.xti
+1 −1 ... (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2_BENDER/EL3202-0010_M4K2US1_M4K2US2.xti
+1 −1 ... (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2_BENDER/EL3202-0010_M4K2US3_M4K2DS1.xti
+1 −1 ...m 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2_BENDER/EL9576_M4K2_BEND_DS_PWR.xti
+1 −1 ...m 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2_BENDER/EL9576_M4K2_BEND_US_PWR.xti
+1 −1 ...0)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2_BENDER/Term 115 (EL3054).xti
+1 −1 ...0)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 322 (EK1122)/EK1100_MR4K2_BENDER/Term 117 (EL9512).xti
+154 −179 lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti
+1 −1 lcls-plc-rixs-optics/lcls-plc-rixs-optics.tsproj
+3 −3 lcls-plc-rixs-optics/rixs_optics/POUs/PRG_MR1K1_BEND.TcPOU
+23 −0 lcls-plc-rixs-optics/rixs_optics/POUs/PRG_SP1K1_MONO.TcPOU
+13 −10 lcls-plc-rixs-optics/rixs_optics/POUs/PRG_ZeroOrder_PMPS.TcPOU
+1 −1 lcls-plc-rixs-optics/rixs_optics/rixs_optics.plcproj
+841 −81,921 lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc
2 changes: 1 addition & 1 deletion support/lcls-twincat-vacuum
Submodule lcls-twincat-vacuum updated 4 files
+31 −29 L2SIVacuum/L2SIVacuum.tmc
+9 −12 L2SIVacuum/POUs/Functions/Valves/FB_VFS_2OO3.TcPOU
+22 −4 L2SIVacuum/POUs/Functions/Valves/Interfaces/FB_VFS_2OO3Interface.TcPOU
+3 −42 L2SIVacuumLib.tsproj

0 comments on commit 7c6acfc

Please sign in to comment.