Skip to content

Commit

Permalink
Auto-update from Github Actions Workflow
Browse files Browse the repository at this point in the history
Deployed from commit 17a2a1a (refs/heads/master)
  • Loading branch information
github-actions committed Sep 15, 2023
1 parent a9254e3 commit 919edfd
Show file tree
Hide file tree
Showing 24 changed files with 10,521 additions and 894 deletions.
2,053 changes: 2,040 additions & 13 deletions master/_sources/lcls-plc-lamp-motion_boxes.rst.txt

Large diffs are not rendered by default.

67 changes: 66 additions & 1 deletion master/_sources/lcls-plc-lamp-motion_ethercat.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,72 @@ Box Hierarchy



#. VaccumMotion-EK1110 [ID: 27]
#. Term 56 (EL9410) [ID: 56]
EL9410 E-Bus Power Supplier (Diagnostics)



#. Term 57 (EL7041) [ID: 57]
EL7041 1Ch. Stepper motor output stage (50V, 5A)



#. Term 58 (EL5021) [ID: 58]
EL5021 1K. Sin/Cos Encoder



#. Term 59 (EL1084) [ID: 59]
EL1084 4Ch. Dig. Input 24V, 3ms, negative



#. Term 60 (EL7041) [ID: 60]
EL7041 1Ch. Stepper motor output stage (50V, 5A)



#. Term 61 (EL5021) [ID: 61]
EL5021 1Ch. Sin/Cos Encoder



#. Term 69 (EL9011) [ID: 69]
EL9011 End Terminal





#. **TIXEL (EK1100) [ID: 62]**
EK1100 EtherCAT Coupler (2A E-Bus)

#. TIXELX-EL7041 [ID: 63]
EL7041 1Ch. Stepper motor output stage (50V, 5A)



#. TIXELXY_ENC-EL5042 [ID: 64]
EL5042 2Ch. BiSS-C Encoder



#. TIXELY-EL7041 [ID: 65]
EL7041 1Ch. Stepper motor output stage (50V, 5A)



#. TIXELZ-EL7041 [ID: 66]
EL7041 1Ch. Stepper motor output stage (50V, 5A)



#. TIXELZ_ENC-EL5042 [ID: 67]
EL5042 2Ch. BiSS-C Encoder



#. Term 68 (EK1110) [ID: 68]
EK1110 EtherCAT extension


Expand Down
36 changes: 36 additions & 0 deletions master/_sources/lcls-plc-lamp-motion_lamp_motion_source.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,29 @@ Main
'}
M9 : DUT_MotionStage := (bPowerSelf:=TRUE); // Sample Paddle Z

// ...//
// TIXEL
{attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[TIXELX-EL7041]^STM Status^Status^Digital input 1;
.bLimitBackwardEnable:=TIIB[TIXELX-EL7041]^STM Status^Status^Digital input 2'}
{attribute 'pytmc' := '
pv: TMO:LAMP:MMS:14
'}
M14 : DUT_MotionStage := (bPowerSelf:=TRUE, nEnableMode:=ENUM_StageEnableMode.DURING_MOTION); // TIXEL X

{attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[TIXELY-EL7041]^STM Status^Status^Digital input 1;
.bLimitBackwardEnable:=TIIB[TIXELY-EL7041]^STM Status^Status^Digital input 2'}
{attribute 'pytmc' := '
pv: TMO:LAMP:MMS:15
'}
M15 : DUT_MotionStage := (bPowerSelf:=TRUE, nEnableMode:=ENUM_StageEnableMode.DURING_MOTION); // TIXEL Y

{attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[TIXELZ-EL7041]^STM Status^Status^Digital input 1;
.bLimitBackwardEnable:=TIIB[TIXELZ-EL7041]^STM Status^Status^Digital input 2'}
{attribute 'pytmc' := '
pv: TMO:LAMP:MMS:16
'}
M16 : DUT_MotionStage := (bPowerSelf:=TRUE, nEnableMode:=ENUM_StageEnableMode.DURING_MOTION); // TIXEL Z


fbMotionStageM1 : FB_MotionStage;
fbMotionStageM2 : FB_MotionStage;
Expand All @@ -111,6 +134,10 @@ Main
fbMotionStageM7 : FB_MotionStage;
fbMotionStageM8 : FB_MotionStage;
fbMotionStageM9 : FB_MotionStage;
//...//
fbMotionStageM14 : FB_MotionStage;
fbMotionStageM15 : FB_MotionStage;
fbMotionStageM16 : FB_MotionStage;
END_VAR
// Hardware Enable
// Gas Jet
Expand Down Expand Up @@ -140,6 +167,15 @@ Main
//fbMotionStageM8(stMotionStage:=M8);
//fbMotionStageM9(stMotionStage:=M9);

// TIXEL
M14.bHardwareEnable := TRUE;
M15.bHardwareEnable := TRUE;
M16.bHardwareEnable := TRUE;

fbMotionStageM14(stMotionStage:=M14);
fbMotionStageM15(stMotionStage:=M15);
fbMotionStageM16(stMotionStage:=M16);

END_PROGRAM


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Settings
Pragmas
-------

Total pragmas found: 18
Total pragmas found: 24
Total linter errors: 0


Expand Down
158 changes: 156 additions & 2 deletions master/_sources/lcls-plc-lamp-motion_links.rst.txt

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions master/_sources/lcls-plc-lamp-motion_nc.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ NC Settings
11, FlowCellY
12, FlowCellZ
13, FlowCellTheta
14, TIXELX
15, TIXELY
16, TIXELZ



Expand Down Expand Up @@ -342,3 +345,84 @@ Axis 13: FlowCellTheta
Velo:Maximum, 10



Axis 14: TIXELX
^^^^^^^^^^^^^^^

.. csv-table::
:header: Setting, Value
:align: center

Axis ID, 14
Name, TIXELX
AxisType, 1
CreateSymbols, true
Dynamic:Acceleration, 2
Dynamic:Deceleration, 2
Dynamic:DelayTime, 0.008
Enc:EncType, 4
Enc:Inc:RefSoftSyncMask, #x0000ffff
Enc:Inverse, true
Enc:MaxCount, #x0000ffff
Enc:ScaleFactorNumerator, 3.90625e-05
Enc:SoftEndMaxControl:Range, 2
Enc:SoftEndMinControl:Range, -2
Id, 14
OtherSettings:AllowMotionCmdToSlave, true
Velo:Maximum, 1



Axis 15: TIXELY
^^^^^^^^^^^^^^^

.. csv-table::
:header: Setting, Value
:align: center

Axis ID, 15
Name, TIXELY
AxisType, 1
CreateSymbols, true
Dynamic:Acceleration, 2
Dynamic:Deceleration, 2
Dynamic:DelayTime, 0.008
Enc:EncType, 4
Enc:Inc:RefSoftSyncMask, #x0000ffff
Enc:Inverse, true
Enc:MaxCount, #x0000ffff
Enc:ScaleFactorNumerator, 3.90625e-05
Enc:SoftEndMaxControl:Range, 2
Enc:SoftEndMinControl:Range, -2
Id, 15
OtherSettings:AllowMotionCmdToSlave, true
Velo:Maximum, 1



Axis 16: TIXELZ
^^^^^^^^^^^^^^^

.. csv-table::
:header: Setting, Value
:align: center

Axis ID, 16
Name, TIXELZ
AxisType, 1
CreateSymbols, true
Dynamic:Acceleration, 2
Dynamic:Deceleration, 2
Dynamic:DelayTime, 0.008
Enc:EncType, 4
Enc:Inc:RefSoftSyncMask, #x0000ffff
Enc:Inverse, true
Enc:MaxCount, #x0000ffff
Enc:ScaleFactorNumerator, 3.90625e-05
Enc:SoftEndMaxControl:Range, 2
Enc:SoftEndMinControl:Range, -2
Id, 16
OtherSettings:AllowMotionCmdToSlave, true
Velo:Maximum, 1


4 changes: 2 additions & 2 deletions master/_sources/lcls-plc-lamp-motion_pragmas.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Pragmas
:header: PLC Name, Total Pragmas, Errors
:align: center

:ref:`lamp_motion <lamp_motion_overview_pragmas>`, 18, 0
:ref:`lamp_motion <lamp_motion_overview_pragmas>`, 24, 0


.. _lamp_motion_overview_pragmas:
Expand All @@ -15,7 +15,7 @@ Pragmas
lamp_motion
^^^^^^^^^^^

Total pragmas found: 18
Total pragmas found: 24
Total linter errors: 0


22 changes: 22 additions & 0 deletions master/_static/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ a.headerlink {
visibility: hidden;
}

a:visited {
color: #551A8B;
}

h1:hover > a.headerlink,
h2:hover > a.headerlink,
h3:hover > a.headerlink,
Expand Down Expand Up @@ -670,6 +674,16 @@ dd {
margin-left: 30px;
}

.sig dd {
margin-top: 0px;
margin-bottom: 0px;
}

.sig dl {
margin-top: 0px;
margin-bottom: 0px;
}

dl > dd:last-child,
dl > dd:last-child > :last-child {
margin-bottom: 0;
Expand Down Expand Up @@ -738,6 +752,14 @@ abbr, acronym {
cursor: help;
}

.translated {
background-color: rgba(207, 255, 207, 0.2)
}

.untranslated {
background-color: rgba(255, 207, 207, 0.2)
}

/* -- code displays --------------------------------------------------------- */

pre {
Expand Down
3 changes: 1 addition & 2 deletions master/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
const DOCUMENTATION_OPTIONS = {
VERSION: '',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
Expand Down
1 change: 1 addition & 0 deletions master/_static/pygments.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
.highlight .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
.highlight .gd { color: #A00000 } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
.highlight .gr { color: #E40000 } /* Generic.Error */
.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
.highlight .gi { color: #008400 } /* Generic.Inserted */
Expand Down
26 changes: 17 additions & 9 deletions master/_static/searchtools.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ const _removeChildren = (element) => {
const _escapeRegExp = (string) =>
string.replace(/[.*+\-?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string

const _displayItem = (item, searchTerms) => {
const _displayItem = (item, searchTerms, highlightTerms) => {
const docBuilder = DOCUMENTATION_OPTIONS.BUILDER;
const docUrlRoot = DOCUMENTATION_OPTIONS.URL_ROOT;
const docFileSuffix = DOCUMENTATION_OPTIONS.FILE_SUFFIX;
const docLinkSuffix = DOCUMENTATION_OPTIONS.LINK_SUFFIX;
const showSearchSummary = DOCUMENTATION_OPTIONS.SHOW_SEARCH_SUMMARY;
const contentRoot = document.documentElement.dataset.content_root;

const [docName, title, anchor, descr, score, _filename] = item;

Expand All @@ -75,20 +75,24 @@ const _displayItem = (item, searchTerms) => {
if (dirname.match(/\/index\/$/))
dirname = dirname.substring(0, dirname.length - 6);
else if (dirname === "index/") dirname = "";
requestUrl = docUrlRoot + dirname;
requestUrl = contentRoot + dirname;
linkUrl = requestUrl;
} else {
// normal html builders
requestUrl = docUrlRoot + docName + docFileSuffix;
requestUrl = contentRoot + docName + docFileSuffix;
linkUrl = docName + docLinkSuffix;
}
let linkEl = listItem.appendChild(document.createElement("a"));
linkEl.href = linkUrl + anchor;
linkEl.dataset.score = score;
linkEl.innerHTML = title;
if (descr)
if (descr) {
listItem.appendChild(document.createElement("span")).innerHTML =
" (" + descr + ")";
// highlight search terms in the description
if (SPHINX_HIGHLIGHT_ENABLED) // set in sphinx_highlight.js
highlightTerms.forEach((term) => _highlightText(listItem, term, "highlighted"));
}
else if (showSearchSummary)
fetch(requestUrl)
.then((responseData) => responseData.text())
Expand All @@ -97,6 +101,9 @@ const _displayItem = (item, searchTerms) => {
listItem.appendChild(
Search.makeSearchSummary(data, searchTerms)
);
// highlight search terms in the summary
if (SPHINX_HIGHLIGHT_ENABLED) // set in sphinx_highlight.js
highlightTerms.forEach((term) => _highlightText(listItem, term, "highlighted"));
});
Search.output.appendChild(listItem);
};
Expand All @@ -115,14 +122,15 @@ const _finishSearch = (resultCount) => {
const _displayNextItem = (
results,
resultCount,
searchTerms
searchTerms,
highlightTerms,
) => {
// results left, load the summary and display it
// this is intended to be dynamic (don't sub resultsCount)
if (results.length) {
_displayItem(results.pop(), searchTerms);
_displayItem(results.pop(), searchTerms, highlightTerms);
setTimeout(
() => _displayNextItem(results, resultCount, searchTerms),
() => _displayNextItem(results, resultCount, searchTerms, highlightTerms),
5
);
}
Expand Down Expand Up @@ -360,7 +368,7 @@ const Search = {
// console.info("search results:", Search.lastresults);

// print the results
_displayNextItem(results, results.length, searchTerms);
_displayNextItem(results, results.length, searchTerms, highlightTerms);
},

/**
Expand Down
Loading

0 comments on commit 919edfd

Please sign in to comment.