Release 4.1.0 (#5)

# Release 4.1.0

## Improvements
- Deactivate signal links for SIM300 (not supported)

## Bugfix
- Reset function did not clear all signal links
- 'OnNewInputState' block of FlowConfig did not work with other blocks if it was used in parallel with the 'Set' block
- Legacy bindings of ValueDisplay elements within UI did not work if deployed with VS Code AppSpace SDK
- UI differs if deployed via Appstudio or VS Code AppSpace SDK
- Fullscreen icon of iFrame was visible

Author: golluroSICKAG

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Release 4.1.0
+
+### Improvements
+- Deactivate signal links for SIM300 (not supported)
+
+### Bugfix
+- Reset function did not clear all signal links
+- 'OnNewInputState' block of FlowConfig did not work with other blocks if it was used in parallel with the 'Set' block
+- Legacy bindings of ValueDisplay elements within UI did not work if deployed with VS Code AppSpace SDK
+- UI differs if deployed via Appstudio or VS Code AppSpace SDK
+- Fullscreen icon of iFrame was visible
+
 ## Release 4.0.0
 
 ### New features

CSK_Module_DigitalIOManager/pages/pages/CSK_Module_DigitalIOManager/CSK_Module_DigitalIOManager.css

@@ -77,5 +77,5 @@
 
 .myCustomButton_CSK_Module_DigitalIOManager {
   border-radius: 30px;
-  padding-right: 0px;
+  padding: 11px;
 }

CSK_Module_DigitalIOManager/pages/pages/CSK_Module_DigitalIOManager/CSK_Module_DigitalIOManager.html

@@ -5,6 +5,14 @@ export function convertToList(value) {
 export function changeStyle(theme) {
   const style: HTMLStyleElement = document.createElement('style');
   style.id ='blub'
+
+  const toggleSW = document.querySelectorAll("davinci-toggle-switch")
+  toggleSW.forEach((userItem) => {
+    const shadowToggle = userItem.shadowRoot
+    const finalToggleSW = shadowToggle?.querySelector('div')
+    finalToggleSW?.classList.add('hasIcon')
+  });
+
   if (theme == 'CSK_Style'){
     var headerToolbar = `.sopasjs-ui-header-toolbar-wrapper { background-color: #FFFFFF; }`
     var uiHeader = `.sopasjs-ui-header>.app-logo { margin-right:0px; }`

CSK_Module_DigitalIOManager/pages/src/converter.ts

@@ -12,6 +12,10 @@ document.addEventListener('sopasjs-ready', () => {
   page_Setup.remove();
 
   setTimeout(() => {
+    const element = document.querySelector("div.sjs-wrapper > div > div.sjs-fullscreen-toggle")
+    if(element) {
+      element.parentElement.removeChild(element)
+    }
     document.title = 'CSK_Module_DigitalIOManager'
   }, 500);
 })

CSK_Module_DigitalIOManager/pages/src/index.ts

@@ -255,6 +255,10 @@ INFO: As this event will be created dynamically, there is no auto completion wit
                     <desc>Notify version of module.</desc>
                     <param desc="Version" multiplicity="1" name="version" type="string"/>
                 </event>
+                <event name="OnNewStatusSignalLinksSupport">
+                    <desc>Notify status if signal link feature is supported on device.</desc>
+                    <param desc="Status" multiplicity="1" name="status" type="bool"/>
+                </event>
                 <function name="setParameterName">
                     <desc>Function to set the name of the parameters if saved/loaded via the CSK_PersistentData module.</desc>
                     <param desc="Name of the parameter." multiplicity="1" name="name" type="string"/>
@@ -488,7 +492,7 @@ INFO: Recommended to leave it switched off, if not essentially required!</desc>
             </crown>
         </crown>
         <meta key="author">SICK AG</meta>
-        <meta key="version">4.0.0</meta>
+        <meta key="version">4.1.0</meta>
         <meta key="priority">low</meta>
         <meta key="copy-protected">false</meta>
         <meta key="read-protected">false</meta>

CSK_Module_DigitalIOManager/project.mf.xml

@@ -61,6 +61,7 @@ Script.serveEvent("CSK_DigitalIOManager.OnNewInputSelection", "DigitalIOManager_
 Script.serveEvent("CSK_DigitalIOManager.OnNewOutputSelection", "DigitalIOManager_OnNewOutputSelection")
 
 -- Links
+Script.serveEvent('CSK_DigitalIOManager.OnNewStatusSignalLinksSupport', 'DigitalIOManager_OnNewStatusSignalLinksSupport')
 Script.serveEvent("CSK_DigitalIOManager.OnNewLinkList", "DigitalIOManager_OnNewLinkList")
 Script.serveEvent("CSK_DigitalIOManager.OnNewLinkSelected", "DigitalIOManager_DigitalIOManager_OnNewLinkSelected")
 Script.serveEvent("CSK_DigitalIOManager.OnNewInputPortList", "DigitalIOManager_OnNewInputPortList")
@@ -188,6 +189,7 @@ local function handleOnExpiredTmrDigitalIOManager()
   Script.notifyEvent("DigitalIOManager_OnNewOutputForLinkSelected", selectedOutputForLink)
   Script.notifyEvent("DigitalIOManager_OnNewLinkDelay", presetDelay)
 
+  Script.notifyEvent("DigitalIOManager_OnNewStatusSignalLinksSupport", _G.availableAPIs.signalLinkSupport)
   Script.notifyEvent("DigitalIOManager_OnNewLinkList", digitalIOManager_Model.helperFuncs.createJsonList('links', digitalIOManager_Model.parameters.links))
 
   Script.notifyEvent("DigitalIOManager_OnNewInputSelection", selectedInputInterface)
@@ -468,32 +470,36 @@ end
 Script.serveFunction("CSK_DigitalIOManager.setOutputForLink", setOutputForLink)
 
 local function addLink()
+  if _G.availableAPIs.signalLinkSupport then
 
-  if checkConfig(selectedInputForLink, selectedOutputForLink) == true and checkConfig(selectedInputForLink) == true and checkConfig(selectedOutputForLink) == true then
+    if checkConfig(selectedInputForLink, selectedOutputForLink) == true and checkConfig(selectedInputForLink) == true and checkConfig(selectedOutputForLink) == true then
 
-    _G.logger:fine(nameOfModule .. ": Add link.")
-    local tempLink = {}
-    tempLink.input = selectedInputForLink
-    tempLink.output = selectedOutputForLink
-    tempLink.delay = presetDelay
+      _G.logger:fine(nameOfModule .. ": Add link.")
+      local tempLink = {}
+      tempLink.input = selectedInputForLink
+      tempLink.output = selectedOutputForLink
+      tempLink.delay = presetDelay
 
-    table.insert(digitalIOManager_Model.parameters.links, tempLink)
+      table.insert(digitalIOManager_Model.parameters.links, tempLink)
 
-    digitalIOManager_Model.parameters.mode[selectedInputForLink] = 'FLOW'
-    digitalIOManager_Model.parameters.mode[selectedOutputForLink] = 'FLOW'
+      digitalIOManager_Model.parameters.mode[selectedInputForLink] = 'FLOW'
+      digitalIOManager_Model.parameters.mode[selectedOutputForLink] = 'FLOW'
 
-    digitalIOManager_Model.parameters.active[selectedInputForLink] = true
-    digitalIOManager_Model.parameters.active[selectedOutputForLink] = true
+      digitalIOManager_Model.parameters.active[selectedInputForLink] = true
+      digitalIOManager_Model.parameters.active[selectedOutputForLink] = true
 
-    digitalIOManager_Model.helperFuncs.createJsonList('links', digitalIOManager_Model.parameters.links)
+      digitalIOManager_Model.helperFuncs.createJsonList('links', digitalIOManager_Model.parameters.links)
 
-    Script.notifyEvent('DigitalIOManager_OnShowInternalMessages', 'false')
-    activateNewSetup()
+      Script.notifyEvent('DigitalIOManager_OnShowInternalMessages', 'false')
+      activateNewSetup()
+    else
+      Script.notifyEvent('DigitalIOManager_OnShowInternalMessages', 'true')
+      Script.notifyEvent('DigitalIOManager_OnNewMessageType', 'warning')
+      Script.notifyEvent('DigitalIOManager_OnNewInternalMessage', 'Current setting of (optional) ports not correct. Please check first')
+      _G.logger:warning(nameOfModule .. ": Current setting of (optional) ports not correct. Please check first.")
+    end
   else
-    Script.notifyEvent('DigitalIOManager_OnShowInternalMessages', 'true')
-    Script.notifyEvent('DigitalIOManager_OnNewMessageType', 'warning')
-    Script.notifyEvent('DigitalIOManager_OnNewInternalMessage', 'Current setting of (optional) ports not correct. Please check first')
-    _G.logger:warning(nameOfModule .. ": Current setting of (optional) ports not correct. Please check first.")
+    _G.logger:info(nameOfModule .. ": Signal link feature not available on device (no cFlow IO handling support).")
   end
 end
 Script.serveFunction("CSK_DigitalIOManager.addLink", addLink)
@@ -727,8 +733,8 @@ local function clearFlowConfigRelevantConfiguration()
       selectInputInterface(key)
       setActiveStatusInput(false)
     end
-    for key, value in ipairs(digitalIOManager_Model.parameters.links) do
-      selectedLink = key
+    for currentLink=#digitalIOManager_Model.parameters.links, 1, -1  do
+      selectedLink = tostring(currentLink)
       removeLink()
     end
   end

CSK_Module_DigitalIOManager/scripts/Configuration/DigitalIOManager/DigitalIOManager_Controller.lua

@@ -42,6 +42,7 @@ digitalIOManager_Model.sensorStatus = {} -- Status of sensor's measurement
 digitalIOManager_Model.forwardFunctions = {} -- List of functions to be used to forward incoming trigger via DigitalIn as events
 digitalIOManager_Model.triggerFunctions = {} -- List of functions to be used to forward incoming events to trigger DigitalOut
 digitalIOManager_Model.trackingFunctions = {} -- List of functions to be used to track input states of signal links
+digitalIOManager_Model.forwardLinksFunctions = {} -- List of functions to be used to forward status of DigitalIn used in signal links
 
 -- Create parameters / instances for this module
 digitalIOManager_Model.parameters = {}
@@ -80,14 +81,25 @@ local function trackInputState(status, source)
   Script.notifyEvent("DigitalIOManager_OnNewInputPortTable", digitalIOManager_Model.helperFuncs.createJsonList('input', digitalIOManager_Model.parameters.inDebounceMode, digitalIOManager_Model.parameters.active, digitalIOManager_Model.parameters.inDebounceMode, digitalIOManager_Model.parameters.inDebounceValue, digitalIOManager_Model.parameters.inputLogic, nil, digitalIOManager_Model.parameters.mode, digitalIOManager_Model.sensorStatus))
 end
 
+--- Function to forward input states of signal links
+---@param status boolean Status of input port to track
+---@param source string Name of input port
+local function forwardSignalLinkInputState(status, source)
+  if digitalIOManager_Model.parameters.forwardEvent[source] ~= nil and digitalIOManager_Model.parameters.forwardEvent[source] ~= '' then
+    Script.notifyEvent(digitalIOManager_Model.parameters.forwardEvent[source], status)
+  end
+end
+
 --- Function to set DigitalOutputs if received related event
 ---@param newState boolean Status of port
 ---@param port string Name of port
 local function setOutputViaEvent(newState, port)
   _G.logger:fine(nameOfModule .. ': Set digital output ' .. tostring(port))
   Connector.DigitalOut.set(digitalIOManager_Model.handles[port], newState)
   if newState and digitalIOManager_Model.parameters.outActivationValue[port] ~= 0 then
-    Connector.DigitalOut.set(digitalIOManager_Model.handles[port], not newState)
+    if _G.availableAPIs.signalLinkSupport then
+      Connector.DigitalOut.set(digitalIOManager_Model.handles[port], not newState)
+    end
   end
 end
 
@@ -115,6 +127,11 @@ if _G.availableAPIs.specific then
       trackInputState(status,value)
     end
     digitalIOManager_Model.trackingFunctions[value] = trackInput
+
+    local function forwardSignalLinkInput(status)
+      forwardSignalLinkInputState(status,value)
+    end
+    digitalIOManager_Model.forwardLinksFunctions[value] = forwardSignalLinkInput
   end
 
   -- Create functions to set DigitalOutputs if received related event
@@ -266,6 +283,8 @@ local function setupAll()
         digitalIOManager_Model.flow:addConsumerBlock('DigitalInEvent'..input, 'Engine.Event.notify')
         digitalIOManager_Model.flow:setInitialParameter('DigitalInEvent'..input, 'EventName', "CSK_DigitalIOManager.OnNewFlowInputState" .. input)
 
+        Script.register("CSK_DigitalIOManager.OnNewFlowInputState" .. input, digitalIOManager_Model.forwardLinksFunctions[input])
+
         -- Optionally track input state of signal links to e.g. show them on UI
         if digitalIOManager_Model.trackStatus then
           Script.register("CSK_DigitalIOManager.OnNewFlowInputState" .. input, digitalIOManager_Model.trackingFunctions[input])

CSK_Module_DigitalIOManager/scripts/Configuration/DigitalIOManager/DigitalIOManager_Model.lua

@@ -12,7 +12,7 @@ local function setStatus(handle, source)
   local port = Container.get(handle, 'Port')
   local eventToLink, endPos = string.find(source, 'CSK_DigitalIOManager.OnNewInputState')
 
-  if eventToLink then
+  if eventToLink and _G.availableAPIs.signalLinkSupport then
     local inputPort = string.sub(source, endPos+1, #source)
     CSK_DigitalIOManager.setInputForLink(inputPort)
     CSK_DigitalIOManager.setOutputForLink(port)

CSK_Module_DigitalIOManager/scripts/Configuration/DigitalIOManager/FlowConfig/DigitalIOManager_Set.lua

@@ -27,6 +27,8 @@ local function loadAPIs()
       CSK_UserManagement = require 'API.CSK_UserManagement'
     elseif appList[i] == 'CSK_Module_FlowConfig' then
       CSK_FlowConfig = require 'API.CSK_FlowConfig'
+    elseif appList[i] == 'CSK_Module_MultiIOLinkSMI' then
+      CSK_MultiIOLinkSMI = require 'API.CSK_MultiIOLinkSMI'
     end
   end
 end
@@ -41,8 +43,21 @@ local function loadSpecificAPIs()
   Connector.DigitalOut = require 'API.Connector.DigitalOut'
 end
 
+-- Function to check signal link feature (cFlow IO handling)
+local function checkSignalLinkSupport()
+  local deviceName = Engine.getTypeName()
+  local isSIM300 = string.find(deviceName, 'SIG300') or string.find(deviceName, 'SIM300')
+  if isSIM300 then
+    return false
+  else
+    return true
+  end
+end
+
 availableAPIs.default = xpcall(loadAPIs, debug.traceback) -- TRUE if all default APIs were loaded correctly
 availableAPIs.specific = xpcall(loadSpecificAPIs, debug.traceback) -- TRUE if all specific APIs were loaded correctly
+availableAPIs.signalLinkSupport = checkSignalLinkSupport() -- TRUE if device supports signal link feature (cFlow IO handling)
+availableAPIs.SGI = xpcall(loadSGIAPIs, debug.traceback) -- TRUE if SGI CROWN exists
 
 return availableAPIs
 --**************************************************************************