Skip to content

Commit 3f47cc7

Browse files
committed
# Version 3.8.1
## Bugfix - "selectForwardInputToEventPair" only reacts on UI selection - "selectOutputToSetByEventPair" only reacts on UI selection
1 parent 02a0636 commit 3f47cc7

4 files changed

Lines changed: 35 additions & 21 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## Release 3.8.1
5+
6+
### Bugfix
7+
- "selectForwardInputToEventPair" only reacts on UI selection
8+
- "selectOutputToSetByEventPair" only reacts on UI selection
9+
410
## Release 3.8.0
511

612
### Improvements

CSK_Module_DigitalIOManager/project.mf.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -339,12 +339,12 @@ INFO: As this events will be created dynamically, there is no auto completion wi
339339
<desc>Add event to listen to and to trigger digital output.</desc>
340340
</function>
341341
<function name="selectForwardInputToEventPair">
342-
<desc>Select event pair (e.g. in UI table).</desc>
343-
<param desc="Selected pair" multiplicity="1" name="selection" type="string"/>
342+
<desc>Select Input2Event-pair.</desc>
343+
<param desc=" Input2Event-pair to select (via UI selection or port identifier like 'S1DI1')." multiplicity="1" name="selection" type="string"/>
344344
</function>
345345
<function name="selectOutputToSetByEventPair">
346-
<desc>Select output interface to set for trigger event (see "addTriggerEvent").</desc>
347-
<param desc="Interface to select." multiplicity="1" name="selection" type="string"/>
346+
<desc>Select Event2Trigger-pair.</desc>
347+
<param desc="Event2Trigger-pair to select (via UI selection or port identifier like 'S1DO1')." multiplicity="1" name="selection" type="string"/>
348348
</function>
349349
<function name="removeTriggerEvent">
350350
<desc>Remove event to trigger digital output.</desc>
@@ -382,7 +382,7 @@ INFO: As this events will be created dynamically, there is no auto completion wi
382382
</serves>
383383
</crown>
384384
<meta key="author">SICK AG</meta>
385-
<meta key="version">3.8.0</meta>
385+
<meta key="version">3.8.1</meta>
386386
<meta key="priority">low</meta>
387387
<meta key="copy-protected">false</meta>
388388
<meta key="read-protected">false</meta>

CSK_Module_DigitalIOManager/scripts/Configuration/DigitalIOManager/DigitalIOManager_Controller.lua

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,14 +514,22 @@ end
514514
Script.serveFunction("CSK_DigitalIOManager.setDelayForLink", setDelayForLink)
515515

516516
local function selectForwardInputToEventPair(selection)
517-
_G.logger:info(nameOfModule .. ": Select input to forward via event: " .. tostring(selection))
518-
selectedForwardEventPair = setSelection(selection, '"FromInput":"')
517+
if digitalIOManager_Model.parameters.forwardEvent[selection] then
518+
selectedForwardEventPair = selection
519+
else
520+
selectedForwardEventPair = setSelection(selection, '"FromInput":"')
521+
end
522+
_G.logger:info(nameOfModule .. ": Select input to forward via event: " .. tostring(selectedForwardEventPair))
519523
end
520524
Script.serveFunction("CSK_DigitalIOManager.selectForwardInputToEventPair", selectForwardInputToEventPair)
521525

522526
local function selectOutputToSetByEventPair(selection)
523-
_G.logger:info(nameOfModule .. ": Select output to set by event: " .. tostring(selection))
524-
selectedTriggerEventPair = setSelection(selection, '"SetOutput":"')
527+
if digitalIOManager_Model.parameters.triggerEvent[selection] then
528+
selectedTriggerEventPair = selection
529+
else
530+
selectedTriggerEventPair = setSelection(selection, '"SetOutput":"')
531+
end
532+
_G.logger:info(nameOfModule .. ": Select output to set by event: " .. tostring(selectedTriggerEventPair))
525533
end
526534
Script.serveFunction("CSK_DigitalIOManager.selectOutputToSetByEventPair", selectOutputToSetByEventPair)
527535

docu/CSK_Module_DigitalIOManager.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta name="generator" content="Asciidoctor 2.0.12">
88
<meta name="author" content="SICK AG">
9-
<title>Documentation - CSK_Module_DigitalIOManager 3.8.0</title>
9+
<title>Documentation - CSK_Module_DigitalIOManager 3.8.1</title>
1010
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
1111
<style>
1212
/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -615,11 +615,11 @@
615615
</head>
616616
<body class="article toc2 toc-left">
617617
<div id="header">
618-
<h1>Documentation - CSK_Module_DigitalIOManager 3.8.0</h1>
618+
<h1>Documentation - CSK_Module_DigitalIOManager 3.8.1</h1>
619619
<div class="details">
620620
<span id="author" class="author">SICK AG</span><br>
621-
<span id="revnumber">version 3.8.0,</span>
622-
<span id="revdate">2023-07-03</span>
621+
<span id="revnumber">version 3.8.1,</span>
622+
<span id="revdate">2023-07-21</span>
623623
</div>
624624
<div id="toc" class="toc2">
625625
<div id="toctitle">Table of Contents</div>
@@ -754,11 +754,11 @@ <h2 id="_document_metadata">Document metadata</h2>
754754
</tr>
755755
<tr>
756756
<th class="tableblock halign-left valign-top"><p class="tableblock">Version</p></th>
757-
<td class="tableblock halign-left valign-top"><p class="tableblock">3.8.0</p></td>
757+
<td class="tableblock halign-left valign-top"><p class="tableblock">3.8.1</p></td>
758758
</tr>
759759
<tr>
760760
<th class="tableblock halign-left valign-top"><p class="tableblock">Date</p></th>
761-
<td class="tableblock halign-left valign-top"><p class="tableblock">2023-07-03</p></td>
761+
<td class="tableblock halign-left valign-top"><p class="tableblock">2023-07-21</p></td>
762762
</tr>
763763
<tr>
764764
<th class="tableblock halign-left valign-top"><p class="tableblock">Author</p></th>
@@ -1482,7 +1482,7 @@ <h5 id="API:Function:CSK_DigitalIOManager.selectForwardInputToEventPair"><span c
14821482
<div class="sect5">
14831483
<h6 id="_short_description_14">Short description</h6>
14841484
<div class="paragraph">
1485-
<p>Select event pair (e.g. in UI table).</p>
1485+
<p>Select Input2Event-pair.</p>
14861486
</div>
14871487
</div>
14881488
<div class="sect5">
@@ -1507,7 +1507,7 @@ <h6 id="_parameters_3">Parameters</h6>
15071507
<td class="tableblock halign-left valign-top"><p class="tableblock">selection</p></td>
15081508
<td class="tableblock halign-left valign-top"><p class="tableblock">STRING</p></td>
15091509
<td class="tableblock halign-left valign-top"><p class="tableblock">1</p></td>
1510-
<td class="tableblock halign-left valign-top"><p class="tableblock">Selected pair</p></td>
1510+
<td class="tableblock halign-left valign-top"><p class="tableblock">Input2Event-pair to select (via UI selection or port identifier like 'S1DI1').</p></td>
15111511
</tr>
15121512
</tbody>
15131513
</table>
@@ -1658,7 +1658,7 @@ <h5 id="API:Function:CSK_DigitalIOManager.selectOutputToSetByEventPair"><span cl
16581658
<div class="sect5">
16591659
<h6 id="_short_description_18">Short description</h6>
16601660
<div class="paragraph">
1661-
<p>Select output interface to set for trigger event (see "addTriggerEvent").</p>
1661+
<p>Select Event2Trigger-pair.</p>
16621662
</div>
16631663
</div>
16641664
<div class="sect5">
@@ -1683,7 +1683,7 @@ <h6 id="_parameters_7">Parameters</h6>
16831683
<td class="tableblock halign-left valign-top"><p class="tableblock">selection</p></td>
16841684
<td class="tableblock halign-left valign-top"><p class="tableblock">STRING</p></td>
16851685
<td class="tableblock halign-left valign-top"><p class="tableblock">1</p></td>
1686-
<td class="tableblock halign-left valign-top"><p class="tableblock">Interface to select.</p></td>
1686+
<td class="tableblock halign-left valign-top"><p class="tableblock">Event2Trigger-pair to select (via UI selection or port identifier like 'S1DO1').</p></td>
16871687
</tr>
16881688
</tbody>
16891689
</table>
@@ -4732,8 +4732,8 @@ <h3 id="API:Enum:CSK_DigitalIOManager.SignalLogic"><span class="api-enum">CSK_Di
47324732
</div>
47334733
<div id="footer">
47344734
<div id="footer-text">
4735-
Version 3.8.0<br>
4736-
Last updated 2023-07-03 10:51:37 +0200
4735+
Version 3.8.1<br>
4736+
Last updated 2023-07-21 10:17:38 +0200
47374737
</div>
47384738
</div>
47394739
<script type="text/javascript">

0 commit comments

Comments
 (0)