Skip to content

Commit

Permalink
Updated projects on Fri Aug 25 04:27:04 PDT 2023
Browse files Browse the repository at this point in the history
  • Loading branch information
@klauer
klauer committed Aug 25, 2023
1 parent 7f4ae57 commit dfa4ae3
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions docs/source/axes.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Version `b4ba7a2 <https://github.com/pcdshub/lcls-plc-bergmann-kohzu/tree/b4ba7a
pcdshub/lcls-plc-crixs-motion
-----------------------------

Version `059a55f <https://github.com/pcdshub/lcls-plc-crixs-motion/tree/059a55f019bc246492ea808dd5d7d89b40d15853>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-crixs-motion>`_
Version `8a67cdc <https://github.com/pcdshub/lcls-plc-crixs-motion/tree/8a67cdc486a3cf566c92197735aac115673e40d9>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-crixs-motion>`_

.. list-table:: pcdshub/lcls-plc-crixs-motion Axes
:header-rows: 1
Expand Down Expand Up @@ -1046,7 +1046,7 @@ Version `8335d3d <https://github.com/pcdshub/lcls-plc-rix-sds-injector/tree/8335
pcdshub/lcls-plc-rixs-optics
----------------------------

Version `endrun18-134-g2602783 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/26027836ff88b37f68bd3d01f228879da30d635a>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_
Version `endrun18-139-g9860ead <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/9860eadbdf1982da542908046559918a0fb5cb38>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_

.. list-table:: pcdshub/lcls-plc-rixs-optics Axes
:header-rows: 1
Expand Down Expand Up @@ -1206,7 +1206,7 @@ Version `fd2d640 <https://github.com/pcdshub/lcls-plc-sxr-satt/tree/fd2d640c2d18
pcdshub/lcls-plc-tmo-motion
---------------------------

Version `v1.1.0-125-g36921a6 <https://github.com/pcdshub/lcls-plc-tmo-motion/tree/36921a6833c7f46d107c2bba5a14633b4073c6d4>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-tmo-motion>`_
Version `v1.1.0-128-g27c4924 <https://github.com/pcdshub/lcls-plc-tmo-motion/tree/27c4924220dac9d9c9e714d7a2726a45a2db6f4c>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-tmo-motion>`_

.. list-table:: pcdshub/lcls-plc-tmo-motion Axes
:header-rows: 1
Expand Down
26 changes: 13 additions & 13 deletions docs/source/ethercat.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Version `b4ba7a2 <https://github.com/pcdshub/lcls-plc-bergmann-kohzu/tree/b4ba7a
pcdshub/lcls-plc-crixs-motion
-----------------------------

Version `059a55f <https://github.com/pcdshub/lcls-plc-crixs-motion/tree/059a55f019bc246492ea808dd5d7d89b40d15853>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-crixs-motion>`_
Version `8a67cdc <https://github.com/pcdshub/lcls-plc-crixs-motion/tree/8a67cdc486a3cf566c92197735aac115673e40d9>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-crixs-motion>`_


#. **Term 5 (EK1200) [ID: 5]**
Expand Down Expand Up @@ -375,40 +375,40 @@ Version `059a55f <https://github.com/pcdshub/lcls-plc-crixs-motion/tree/059a55f0
EK1122 2 port EtherCAT junction

#. **CryoStat (EK1101) [ID: 84]**
EK1101 EtherCAT Coupler (2A E-Bus, ID switch)
( **SyncUnit=Cryostat** ) EK1101 EtherCAT Coupler (2A E-Bus, ID switch)

#. Cryo X (EL7041) [ID: 85]
EL7041 1Ch. Stepper motor output stage (50V, 5A)
( **SyncUnit=Cryostat** ) EL7041 1Ch. Stepper motor output stage (50V, 5A)



#. Cryo X/Cryo Y Enc (EL5042) [ID: 86]
EL5042 2Ch. BiSS-C Encoder
( **SyncUnit=Cryostat** ) EL5042 2Ch. BiSS-C Encoder



#. Cryo Y (EL7041) [ID: 87]
EL7041 1Ch. Stepper motor output stage (50V, 5A)
( **SyncUnit=Cryostat** ) EL7041 1Ch. Stepper motor output stage (50V, 5A)



#. Cryo Z (EL7041) [ID: 88]
EL7041 1Ch. Stepper motor output stage (50V, 5A)
( **SyncUnit=Cryostat** ) EL7041 1Ch. Stepper motor output stage (50V, 5A)



#. Cryo Z/Cryo rY Enc (EL5042) [ID: 89]
EL5042 2Ch. BiSS-C Encoder
( **SyncUnit=Cryostat** ) EL5042 2Ch. BiSS-C Encoder



#. Cryo rY (EL7041) [ID: 90]
EL7041 1Ch. Stepper motor output stage (50V, 5A)
( **SyncUnit=Cryostat** ) EL7041 1Ch. Stepper motor output stage (50V, 5A)



#. Term 158 (EL4004) [ID: 158]
EL4004 4Ch. Ana. Output 0-10V, 12bit
( **SyncUnit=Cryostat** ) EL4004 4Ch. Ana. Output 0-10V, 12bit



Expand Down Expand Up @@ -10960,7 +10960,7 @@ Version `8335d3d <https://github.com/pcdshub/lcls-plc-rix-sds-injector/tree/8335
pcdshub/lcls-plc-rixs-optics
----------------------------

Version `endrun18-134-g2602783 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/26027836ff88b37f68bd3d01f228879da30d635a>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_
Version `endrun18-139-g9860ead <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/9860eadbdf1982da542908046559918a0fb5cb38>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_


#. **Term 1 (EK1200) [ID: 1]**
Expand Down Expand Up @@ -11506,7 +11506,7 @@ Version `endrun18-134-g2602783 <https://github.com/pcdshub/lcls-plc-rixs-optics/


#. **EK1100_MR3K2 [ID: 121]**
(**Disabled**) EK1100 EtherCAT Coupler (2A E-Bus)
EK1100 EtherCAT Coupler (2A E-Bus)

#. EL5042_M3K2X_M3K2Y [ID: 122]
EL5042 2Ch. BiSS-C Encoder
Expand Down Expand Up @@ -11566,7 +11566,7 @@ Version `endrun18-134-g2602783 <https://github.com/pcdshub/lcls-plc-rixs-optics/


#. **EK1100_MR3K2_BENDER [ID: 146]**
(**Disabled**) EK1100 EtherCAT Coupler (2A E-Bus)
EK1100 EtherCAT Coupler (2A E-Bus)

#. EL5042_M3K2_BEND_USDS [ID: 148]
EL5042 2Ch. BiSS-C Encoder
Expand Down Expand Up @@ -12022,7 +12022,7 @@ Version `fd2d640 <https://github.com/pcdshub/lcls-plc-sxr-satt/tree/fd2d640c2d18
pcdshub/lcls-plc-tmo-motion
---------------------------

Version `v1.1.0-125-g36921a6 <https://github.com/pcdshub/lcls-plc-tmo-motion/tree/36921a6833c7f46d107c2bba5a14633b4073c6d4>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-tmo-motion>`_
Version `v1.1.0-128-g27c4924 <https://github.com/pcdshub/lcls-plc-tmo-motion/tree/27c4924220dac9d9c9e714d7a2726a45a2db6f4c>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-tmo-motion>`_


#. **Power (EK1200) [ID: 1]**
Expand Down
6 changes: 3 additions & 3 deletions docs/source/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This summary was generated |today|.
- `b4ba7a2 <https://github.com/pcdshub/lcls-plc-bergmann-kohzu/tree/b4ba7a2b2ad6e14db0fb9639d23d6271eb7e25f0>`_
- `pcdshub/lcls-plc-bergmann-kohzu Docs <https://pcdshub.github.io/lcls-plc-bergmann-kohzu>`_
* - `pcdshub/lcls-plc-crixs-motion <https://github.com/pcdshub/lcls-plc-crixs-motion>`_
- `059a55f <https://github.com/pcdshub/lcls-plc-crixs-motion/tree/059a55f019bc246492ea808dd5d7d89b40d15853>`_
- `8a67cdc <https://github.com/pcdshub/lcls-plc-crixs-motion/tree/8a67cdc486a3cf566c92197735aac115673e40d9>`_
- `pcdshub/lcls-plc-crixs-motion Docs <https://pcdshub.github.io/lcls-plc-crixs-motion>`_
* - `pcdshub/lcls-plc-crixs-vac <https://github.com/pcdshub/lcls-plc-crixs-vac>`_
- `v2.1.0~1 <https://github.com/pcdshub/lcls-plc-crixs-vac/tree/dc91a7b6438ae5725209d53feab5414815f018b9>`_
Expand Down 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>`_
- `endrun18-134-g2602783 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/26027836ff88b37f68bd3d01f228879da30d635a>`_
- `endrun18-139-g9860ead <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/9860eadbdf1982da542908046559918a0fb5cb38>`_
- `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 All @@ -139,7 +139,7 @@ This summary was generated |today|.
- `fd2d640 <https://github.com/pcdshub/lcls-plc-sxr-satt/tree/fd2d640c2d18c3e72a25fcf554a8024229021546>`_
- `pcdshub/lcls-plc-sxr-satt Docs <https://pcdshub.github.io/lcls-plc-sxr-satt>`_
* - `pcdshub/lcls-plc-tmo-motion <https://github.com/pcdshub/lcls-plc-tmo-motion>`_
- `v1.1.0-125-g36921a6 <https://github.com/pcdshub/lcls-plc-tmo-motion/tree/36921a6833c7f46d107c2bba5a14633b4073c6d4>`_
- `v1.1.0-128-g27c4924 <https://github.com/pcdshub/lcls-plc-tmo-motion/tree/27c4924220dac9d9c9e714d7a2726a45a2db6f4c>`_
- `pcdshub/lcls-plc-tmo-motion Docs <https://pcdshub.github.io/lcls-plc-tmo-motion>`_
* - `pcdshub/lcls-plc-tmo-optics <https://github.com/pcdshub/lcls-plc-tmo-optics>`_
- `v3.1.0~1 <https://github.com/pcdshub/lcls-plc-tmo-optics/tree/fa9989e531f47c1dd5648c66bbf786fa86ed28ef>`_
Expand Down
14 changes: 7 additions & 7 deletions docs/source/versions.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Version `b4ba7a2 <https://github.com/pcdshub/lcls-plc-bergmann-kohzu/tree/b4ba7a
pcdshub/lcls-plc-crixs-motion: PLC_CRIX_MOT
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Version `059a55f <https://github.com/pcdshub/lcls-plc-crixs-motion/tree/059a55f019bc246492ea808dd5d7d89b40d15853>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-crixs-motion>`_
Version `8a67cdc <https://github.com/pcdshub/lcls-plc-crixs-motion/tree/8a67cdc486a3cf566c92197735aac115673e40d9>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-crixs-motion>`_

.. list-table:: pcdshub/lcls-plc-crixs-motion: PLC_CRIX_MOT
:header-rows: 1
Expand Down 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 `endrun18-134-g2602783 <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/26027836ff88b37f68bd3d01f228879da30d635a>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_
Version `endrun18-139-g9860ead <https://github.com/pcdshub/lcls-plc-rixs-optics/tree/9860eadbdf1982da542908046559918a0fb5cb38>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-rixs-optics>`_

.. list-table:: pcdshub/lcls-plc-rixs-optics: rixs_optics
:header-rows: 1
Expand Down Expand Up @@ -4905,7 +4905,7 @@ Version `fd2d640 <https://github.com/pcdshub/lcls-plc-sxr-satt/tree/fd2d640c2d18
pcdshub/lcls-plc-tmo-motion: tmo_motion
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Version `v1.1.0-125-g36921a6 <https://github.com/pcdshub/lcls-plc-tmo-motion/tree/36921a6833c7f46d107c2bba5a14633b4073c6d4>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-tmo-motion>`_
Version `v1.1.0-128-g27c4924 <https://github.com/pcdshub/lcls-plc-tmo-motion/tree/27c4924220dac9d9c9e714d7a2726a45a2db6f4c>`_ - `Documentation <https://pcdshub.github.io/lcls-plc-tmo-motion>`_

.. list-table:: pcdshub/lcls-plc-tmo-motion: tmo_motion
:header-rows: 1
Expand All @@ -4920,7 +4920,7 @@ Version `v1.1.0-125-g36921a6 <https://github.com/pcdshub/lcls-plc-tmo-motion/tre

- ``*`` SLAC

- ``2.8.2`` SLAC
- ``2.9.0`` SLAC

* - PMPS
-
Expand Down Expand Up @@ -5053,7 +5053,7 @@ Version `v1.1.0-125-g36921a6 <https://github.com/pcdshub/lcls-plc-tmo-motion/tre

- ``*`` SLAC

- ``2.0.0`` SLAC
- ``2.1.0`` SLAC


pcdshub/lcls-plc-tmo-optics: tmo_optics
Expand Down Expand Up @@ -6633,7 +6633,7 @@ LCLS General

- ``*``, SLAC

- ``2.8.2``, SLAC
- ``2.9.0``, SLAC


* - pcdshub/lcls-plc-tmo-optics:tmo_optics
Expand Down Expand Up @@ -7490,7 +7490,7 @@ lcls2-cc-lib

- ``*``, SLAC

- ``2.0.0``, SLAC
- ``2.1.0``, SLAC


* - pcdshub/lcls-plc-tmo-optics:tmo_optics
Expand Down
2 changes: 1 addition & 1 deletion plcs/lcls-plc-crixs-motion
Submodule lcls-plc-crixs-motion updated 9 files
+28 −28 lcls-plc-crixs-motion/PLC_CRIX_MOT/PLC_CRIX_MOT.tmc
+2 −0 lcls-plc-crixs-motion/_Config/IO/Device 1 (EtherCAT).xti
+2 −0 ...CAT)/Term 5 (EK1200)/Term 6 (EK1122-0080)/DRL02-EK0 (EK1101-0080)/DRL02-ECJ1 (EK1122)/CryoStat (EK1101).xti
+1 −0 ...200)/Term 6 (EK1122-0080)/DRL02-EK0 (EK1101-0080)/DRL02-ECJ1 (EK1122)/CryoStat (EK1101)/Cryo X (EL7041).xti
+1 −0 ...K1122-0080)/DRL02-EK0 (EK1101-0080)/DRL02-ECJ1 (EK1122)/CryoStat (EK1101)/Cryo X%_2FCryo Y Enc (EL5042).xti
+1 −0 ...200)/Term 6 (EK1122-0080)/DRL02-EK0 (EK1101-0080)/DRL02-ECJ1 (EK1122)/CryoStat (EK1101)/Cryo Y (EL7041).xti
+1 −0 ...200)/Term 6 (EK1122-0080)/DRL02-EK0 (EK1101-0080)/DRL02-ECJ1 (EK1122)/CryoStat (EK1101)/Cryo Z (EL7041).xti
+1 −0 ...1122-0080)/DRL02-EK0 (EK1101-0080)/DRL02-ECJ1 (EK1122)/CryoStat (EK1101)/Cryo Z%_2FCryo rY Enc (EL5042).xti
+1 −0 ...00)/Term 6 (EK1122-0080)/DRL02-EK0 (EK1101-0080)/DRL02-ECJ1 (EK1122)/CryoStat (EK1101)/Cryo rY (EL7041).xti
2 changes: 1 addition & 1 deletion plcs/lcls-plc-rixs-optics
Submodule lcls-plc-rixs-optics updated 9 files
+1 −1 ... (EtherCAT)/Term 1 (EK1200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2.xti
+1 −1 ...CAT)/Term 1 (EK1200)/Term 79 (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER.xti
+3 −1 ... (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/EL3202-0010_M3K2DS2_M3K2DS3.xti
+2 −1 ... (EK1521-0010)/Term 306 (EK1501-0010)/Term 310 (EK1122)/EK1100_MR3K2_BENDER/EL3202-0010_M3K2US1_M3K2US2.xti
+2 −5 lcls-plc-rixs-optics/_Config/NC/Axes/M3K2-BEND-DS.xti
+2 −5 lcls-plc-rixs-optics/_Config/NC/Axes/M3K2-BEND-US.xti
+50 −50 lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti
+2 −2 lcls-plc-rixs-optics/rixs_optics/POUs/PRG_MR3K2_KBH.TcPOU
+2,732 −2,582 lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc
2 changes: 1 addition & 1 deletion plcs/lcls-plc-tmo-motion
Submodule lcls-plc-tmo-motion updated 7 files
+54 −27 plc-tmo-motion/_Config/PLC/tmo_motion.xti
+2 −1 plc-tmo-motion/tmo_motion/POUs/PRG_IM3K4_PPM.TcPOU
+3 −1 plc-tmo-motion/tmo_motion/POUs/PRG_IM4K4_PPM.TcPOU
+3 −1 plc-tmo-motion/tmo_motion/POUs/PRG_IM5K4_PPM.TcPOU
+3 −1 plc-tmo-motion/tmo_motion/POUs/PRG_IM6K4_PPM.TcPOU
+2 −2 plc-tmo-motion/tmo_motion/tmo_motion.plcproj
+1,418 −1,409 plc-tmo-motion/tmo_motion/tmo_motion.tmc
2 changes: 1 addition & 1 deletion support/lcls-twincat-general
Submodule lcls-twincat-general updated 1 files
+2 −2 LCLSGeneral/LCLSGeneral/DUTs/DUT_EPS.TcDUT

0 comments on commit dfa4ae3

Please sign in to comment.