From 5cd51ad442a6e03b867625eaaebf0028670ec400 Mon Sep 17 00:00:00 2001 From: Ken Lauer Date: Tue, 15 Aug 2023 04:21:12 -0700 Subject: [PATCH] Updated projects on Tue Aug 15 04:21:00 PDT 2023 --- docs/source/axes.rst | 16 +++++- docs/source/ethercat.rst | 39 ++++++++++++- docs/source/index.rst | 5 +- docs/source/versions.rst | 117 ++++++++++++++++++++++++++++++++++++++- plcs/lcls-plc-tmo-motion | 2 +- 5 files changed, 174 insertions(+), 5 deletions(-) diff --git a/docs/source/axes.rst b/docs/source/axes.rst index 5a5c4ef..ab898db 100644 --- a/docs/source/axes.rst +++ b/docs/source/axes.rst @@ -809,6 +809,20 @@ Version `cbb42b9 `_ - `Documentation `_ + +.. list-table:: pcdshub/lcls-plc-motion-test-stand Axes + :header-rows: 1 + + * - Axis ID + - Axis Name + + * - Axis 1 + - Axis 1 + pcdshub/lcls-plc-mrco-motion ---------------------------- @@ -1192,7 +1206,7 @@ Version `fd2d640 `_ - `Documentation `_ +Version `v1.1.0-119-g7abc07c `_ - `Documentation `_ .. list-table:: pcdshub/lcls-plc-tmo-motion Axes :header-rows: 1 diff --git a/docs/source/ethercat.rst b/docs/source/ethercat.rst index 77f53be..ce5a2b4 100644 --- a/docs/source/ethercat.rst +++ b/docs/source/ethercat.rst @@ -9313,6 +9313,43 @@ Version `cbb42b9 `_ - `Documentation `_ + + +#. **Term 1 (EK1200) [ID: 1]** + EK1200-5000 EtherCAT Power supply (2A E-Bus) + + #. M1-EL7031 [ID: 2] + EL7031 1Ch. Stepper motor output stage (24V, 1.5A) + + + + #. M1-EL1084 [ID: 3] + EL1084 4Ch. Dig. Input 24V, 3ms, negative + + + + #. M1-EL5042 [ID: 4] + EL5042 2Ch. BiSS-C Encoder + + + + #. M1-EL5021 [ID: 5] + EL5021 1Ch. Sin/Cos Encoder + + + + #. M1-EL9011 [ID: 6] + EL9011 End Terminal + + + + + + pcdshub/lcls-plc-mrco-motion ---------------------------- @@ -11855,7 +11892,7 @@ Version `fd2d640 `_ - `Documentation `_ +Version `v1.1.0-119-g7abc07c `_ - `Documentation `_ #. **Power (EK1200) [ID: 1]** diff --git a/docs/source/index.rst b/docs/source/index.rst index 08a328f..2a42945 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -105,6 +105,9 @@ This summary was generated |today|. * - `pcdshub/lcls-plc-mini-powermeter-calib `_ - `cbb42b9 `_ - `pcdshub/lcls-plc-mini-powermeter-calib Docs `_ + * - `pcdshub/lcls-plc-motion-test-stand `_ + - `2cbcf23 `_ + - `pcdshub/lcls-plc-motion-test-stand Docs `_ * - `pcdshub/lcls-plc-mrco-motion `_ - `d21f111 `_ - `pcdshub/lcls-plc-mrco-motion Docs `_ @@ -136,7 +139,7 @@ This summary was generated |today|. - `fd2d640 `_ - `pcdshub/lcls-plc-sxr-satt Docs `_ * - `pcdshub/lcls-plc-tmo-motion `_ - - `v1.1.0-116-g0955b49 `_ + - `v1.1.0-119-g7abc07c `_ - `pcdshub/lcls-plc-tmo-motion Docs `_ * - `pcdshub/lcls-plc-tmo-optics `_ - `v3.1.0~1 `_ diff --git a/docs/source/versions.rst b/docs/source/versions.rst index d98e848..e63a18b 100644 --- a/docs/source/versions.rst +++ b/docs/source/versions.rst @@ -3838,6 +3838,48 @@ Version `cbb42b9 `_ - `Documentation `_ + +.. list-table:: pcdshub/lcls-plc-motion-test-stand: Motion_Test_Stand + :header-rows: 1 + + * - Dependency + - Library + - Placeholder + - Resolution + + * - Tc2_Standard + - + + - ``*`` Beckhoff + + - + + * - Tc2_System + - + + - ``*`` Beckhoff + + - + + * - Tc3_Module + - + + - ``*`` Beckhoff + + - + + * - lcls-twincat-motion + - + + - ``*`` SLAC + + - + + pcdshub/lcls-plc-mrco-motion: mrco_motion ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -4842,7 +4884,7 @@ Version `fd2d640 `_ - `Documentation `_ +Version `v1.1.0-119-g7abc07c `_ - `Documentation `_ .. list-table:: pcdshub/lcls-plc-tmo-motion: tmo_motion :header-rows: 1 @@ -6206,6 +6248,7 @@ L2SI Vacuum Library + * - pcdshub/lcls-plc-lfe-gem:plc_lfe_gem @@ -6362,6 +6405,7 @@ LCLS General + * - pcdshub/lcls-plc-polycapillary:plc-polycap-01 - @@ -6659,6 +6703,7 @@ LCLS Vacuum + * - pcdshub/lcls-plc-crixs-vac:PLC_CRIX_VAC - @@ -6936,6 +6981,14 @@ lcls-twincat-motion + * - pcdshub/lcls-plc-motion-test-stand:Motion_Test_Stand + - + + - ``*``, SLAC + + - + + * - pcdshub/lcls-plc-mrco-motion:mrco_motion - @@ -7145,6 +7198,7 @@ lcls-twincat-optics + * - pcdshub/lcls-plc-qrix-motion:PLC_QRIX_MOT @@ -7275,6 +7329,7 @@ lcls-twincat-physics + * - pcdshub/lcls-plc-txi-hxr-motion:txi_hxr_motion @@ -7381,6 +7436,7 @@ lcls2-cc-lib + * - pcdshub/lcls-plc-rixs-optics:rixs_optics @@ -7492,6 +7548,7 @@ LCLSVacuumLib + * - pcdshub/lcls-plc-xcs-per-vac:XCS_PER_PLC @@ -7554,6 +7611,7 @@ LCLSVacuumSerialDriverLib + * - pcdshub/lcls-plc-crixs-vac:PLC_CRIX_VAC - @@ -7785,6 +7843,7 @@ PMPS + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -8052,6 +8111,7 @@ SysDir + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -8263,6 +8323,7 @@ SysFile + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -8449,6 +8510,7 @@ Tc2_BABasic + * - pcdshub/lcls-plc-las-lps-01:opcpa_lps_plc_01 @@ -8556,6 +8618,7 @@ Tc2_ControllerToolbox + * - pcdshub/lcls-plc-kfe-gatt:plc_kfe_gatt - @@ -8673,6 +8736,7 @@ Tc2_DataExchange + * - pcdshub/lcls-plc-crixs-vac:PLC_CRIX_VAC - @@ -8888,6 +8952,7 @@ Tc2_EtherCAT + * - pcdshub/lcls-plc-las-lps-01:opcpa_lps_plc_01 - @@ -9143,6 +9208,7 @@ Tc2_IoFunctions + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -9375,6 +9441,7 @@ Tc2_Math + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -9639,6 +9706,7 @@ Tc2_MC2 + * - pcdshub/lcls-plc-mrco-motion:mrco_motion - @@ -9863,6 +9931,7 @@ Tc2_ModbusRTU + * - pcdshub/lcls-plc-las-lps-01:opcpa_lps_plc_01 @@ -9994,6 +10063,7 @@ Tc2_ModbusSrv + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -10261,6 +10331,7 @@ Tc2_SerialCom + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -10630,6 +10701,14 @@ Tc2_Standard - + * - pcdshub/lcls-plc-motion-test-stand:Motion_Test_Stand + - + + - ``*``, Beckhoff + + - + + * - pcdshub/lcls-plc-mrco-motion:mrco_motion - @@ -10991,6 +11070,7 @@ Tc2_SUPS + * - pcdshub/lcls-plc-sample-delivery-system:SDSPLC @@ -11192,6 +11272,14 @@ Tc2_System - + * - pcdshub/lcls-plc-motion-test-stand:Motion_Test_Stand + - + + - ``*``, Beckhoff + + - + + * - pcdshub/lcls-plc-mrco-motion:mrco_motion - @@ -11580,6 +11668,7 @@ Tc2_SystemCX + Tc2_TcpIp @@ -11659,6 +11748,7 @@ Tc2_TcpIp + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -11930,6 +12020,7 @@ Tc2_Utilities + * - pcdshub/lcls-plc-mrco-motion:mrco_motion - @@ -12235,6 +12326,7 @@ Tc3_EventLogger + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -12440,6 +12532,7 @@ Tc3_Interfaces + * - pcdshub/lcls-plc-crixs-vac:PLC_CRIX_VAC - @@ -12636,6 +12729,7 @@ Tc3_JsonXml + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -12970,6 +13064,14 @@ Tc3_Module - + * - pcdshub/lcls-plc-motion-test-stand:Motion_Test_Stand + - + + - ``*``, Beckhoff + + - + + * - pcdshub/lcls-plc-mrco-motion:mrco_motion - @@ -13352,6 +13454,7 @@ TcUnit + * - pcdshub/lcls-plc-crixs-motion:PLC_CRIX_MOT - @@ -13587,6 +13690,7 @@ UML Statechart Types + * - pcdshub/lcls-plc-xcs-per-vac:XCS_PER_PLC @@ -13638,6 +13742,7 @@ Vacuum System Simulator Library + * - pcdshub/lcls-plc-kfe-gmd-vac:plc_kfe_gmd_vac_sim @@ -13762,6 +13867,7 @@ VisuDialogs + * - pcdshub/lcls-plc-sxr-satt:SolidAttenuatorPLC @@ -13838,6 +13944,7 @@ VisuElemMeter + * - pcdshub/lcls-plc-kfe-gmd-vac:plc_kfe_gmd_vac_sim - @@ -13944,6 +14051,7 @@ VisuElems + * - pcdshub/lcls-plc-kfe-gmd-vac:plc_kfe_gmd_vac_sim - @@ -14050,6 +14158,7 @@ VisuElemsSpecialControls + * - pcdshub/lcls-plc-kfe-gmd-vac:plc_kfe_gmd_vac_sim - @@ -14156,6 +14265,7 @@ VisuElemsWinControls + * - pcdshub/lcls-plc-kfe-gmd-vac:plc_kfe_gmd_vac_sim - @@ -14262,6 +14372,7 @@ VisuElemTextEditor + * - pcdshub/lcls-plc-kfe-gmd-vac:plc_kfe_gmd_vac_sim - @@ -14384,6 +14495,7 @@ visuinputs + * - pcdshub/lcls-plc-sxr-satt:SolidAttenuatorPLC @@ -14460,6 +14572,7 @@ VisuNativeControl + * - pcdshub/lcls-plc-kfe-gmd-vac:plc_kfe_gmd_vac_sim - @@ -14568,6 +14681,7 @@ VisuSymbols + * - pcdshub/lcls-plc-sxr-satt:SolidAttenuatorPLC @@ -14653,6 +14767,7 @@ VisuUserMgmt + * - pcdshub/lcls-plc-sxr-satt:SolidAttenuatorPLC diff --git a/plcs/lcls-plc-tmo-motion b/plcs/lcls-plc-tmo-motion index 0955b49..7abc07c 160000 --- a/plcs/lcls-plc-tmo-motion +++ b/plcs/lcls-plc-tmo-motion @@ -1 +1 @@ -Subproject commit 0955b4928f3ded6468fada583b8027dacb9cc003 +Subproject commit 7abc07c3deee075dea4e8db428c61bfcfc883c2c