Release 2.1.1

# Release 2.1.1

## Bugfix
- Error if writing of process data and parameters (fix needs CSK_ModuleIODDInterpreter version >= 2.1.1)

Author: teplymaSICKAG

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Release 2.1.1
+
+### Bugfixes
+writing of process data and parameters is available again
+
 ## Release 2.1.0
 
 ### New features

CSK_Module_MultiIOLinkSMI/project.mf.xml

@@ -1056,7 +1056,7 @@ Provide IOLink data via event.</desc>
             </crown>
         </crown>
         <meta key="author">SICK AG</meta>
-        <meta key="version">2.1.0</meta>
+        <meta key="version">2.1.1</meta>
         <meta key="priority">low</meta>
         <meta key="copy-protected">false</meta>
         <meta key="read-protected">false</meta>

CSK_Module_MultiIOLinkSMI/scripts/CSK_MultiIOLinkSMI_Processing.lua

@@ -107,7 +107,7 @@ end
 ---@param jsonDataPointInfo string JSON table containing process data info from IODD file
 ---@return string? convertedResult JSON table with interpted read data
 local function readProcessDataIODD(jsonDataPointInfo)
-  local dataPointInfo = converter.renameDatatype(json.decode(jsonDataPointInfo))
+  local dataPointInfo = json.decode(jsonDataPointInfo)
   local success, readData = readProcessData(dataPointInfo)
   if not success then
     return nil
@@ -179,7 +179,7 @@ end
 ---@return bool success Success of writing.
 ---@return string? details Detailed error if writing is not successful.
 local function writeProcessDataIODD(jsonDataPointInfo, jsonData)
-  local dataPointInfo = converter.renameDatatype(json.decode(jsonDataPointInfo))
+  local dataPointInfo = json.decode(jsonDataPointInfo)
   return writeProcessData(dataPointInfo, json.decode(jsonData))
 end
 Script.serveFunction('CSK_MultiIOLinkSMI.writeProcessDataIODD_' .. multiIOLinkSMIInstanceNumberString, writeProcessDataIODD, 'string:1:,string:1:', 'bool:1:,string:?:')
@@ -246,7 +246,7 @@ end
 ---@param jsonDataPointInfo string JSON table containing parameter info from IODD file.
 ---@return string? jsonData JSON table with interpted parameter value.
 local function readParameterIODD(index, subindex, jsonDataPointInfo)
-  local dataPointInfo = converter.renameDatatype(json.decode(jsonDataPointInfo))
+  local dataPointInfo = json.decode(jsonDataPointInfo)
   dataPointInfo.index = index
   dataPointInfo.subindex = subindex
   local success, readData = readParameter(dataPointInfo)
@@ -316,7 +316,11 @@ local function writeParameter(dataPointInfo, dataToWrite)
     _G.logger:warning(nameOfModule..': failed to convert parameter for writing on port ' .. tostring(processingParams.port) .. ' instancenumber ' .. multiIOLinkSMIInstanceNumberString ..'; datapoint info: ' .. tostring(json.encode(dataPointInfo)) .. '; data: ' .. tostring(json.encode(dataToWrite)))
     return false, 'failed to convert data'
   end
-  return writeBinaryServiceData(tonumber(dataPointInfo.index), tonumber(dataPointInfo.subindex), binDataToWrite)
+  if not dataPointInfo.info.subindex then
+    return writeBinaryServiceData(tonumber(dataPointInfo.info.index), 0, binDataToWrite)
+  else
+    return writeBinaryServiceData(tonumber(dataPointInfo.info.index), tonumber(dataPointInfo.subindex), binDataToWrite)
+  end
 end
 
 --Write parameter with provided info from IODD interpreter and data to write (as JSON tables).
@@ -327,7 +331,7 @@ end
 ---@return bool success Success of writing.
 ---@return string? details Detailed error if writing is not successful.
 local function writeParameterIODD(index, subindex, jsonDataPointInfo, jsonDataToWrite)
-  local dataPointInfo = converter.renameDatatype(json.decode(jsonDataPointInfo))
+  local dataPointInfo = json.decode(jsonDataPointInfo)
   dataPointInfo.index = index
   dataPointInfo.subindex = subindex
   return writeParameter(dataPointInfo, json.decode(jsonDataToWrite))
@@ -610,19 +614,6 @@ Script.serveFunction('CSK_MultiIOLinkSMI.writeIODDMessage' .. multiIOLinkSMIInst
 local function updateIODDWriteMessages()
   ioddWriteMessagesResults = {}
   ioddLatesWriteMessages = {}
-  for messageName, messageInfo in pairs(ioddWriteMessages) do
-    if helperFuncs.getTableSize(messageInfo.dataInfo) == 0 then
-      goto nextMessage
-    end
-    for dataMode, dataModeInfo in pairs(messageInfo.dataInfo) do
-      if dataMode == "ProcessData" or dataMode == "Parameters" then
-        for dataPointID, dataPointInfo in pairs(dataModeInfo) do
-          ioddWriteMessages[messageName].dataInfo[dataMode][dataPointID] = converter.renameDatatype(dataPointInfo)
-        end
-      end
-    end
-    ::nextMessage::
-  end
   local queueFunctions = {}
   for messageName, messageInfo in pairs(ioddWriteMessages) do
     local function writeDestinations(jsonDataToWrite)

CSK_Module_MultiIOLinkSMI/scripts/Communication/MultiIOLinkSMI/helper/DataConverter.lua

@@ -237,26 +237,15 @@ converter.getParameterReadFunctions = getParameterReadFunctions
 -- Convert a raw binary data from IO-Link device to a meaningful Lua table
 local function getReadServiceDataResult(binData, parameterInfo)
   local Result = {}
-  if parameterInfo.Datatype.type == 'ArrayT' then
-    local simpleDataBitLength = getDatatypeBitlength(parameterInfo.Datatype.Datatype)
-    local bitIndexer = 0
-    for i = 1, parameterInfo.Datatype.count do
-      local simpleBinaryData = disassembleData(binData, bitIndexer, simpleDataBitLength)
-      bitIndexer = bitIndexer + simpleDataBitLength
-      Result["element_" .. tostring(i)] = {
-        value = toDataType(simpleBinaryData, parameterInfo.Datatype.Datatype.type)
-      }
-    end
-  elseif parameterInfo.Datatype.type == 'RecordT' then
-    for _, SingleItem in ipairs(parameterInfo.Datatype.RecordItem) do
-      local binaryData = disassembleData(binData, tonumber(SingleItem.bitOffset), getDatatypeBitlength(SingleItem.Datatype))
-
-      Result[SingleItem.Name] = {
-        value = toDataType(binaryData, SingleItem.Datatype.type)
+  if parameterInfo.info.type == 'ArrayT' or parameterInfo.info.type == 'RecordT' then
+    for _, SingleItem in pairs(parameterInfo.subindeces) do
+      local binaryData = disassembleData(binData, tonumber(SingleItem.info.bitOffset), getDatatypeBitlength(SingleItem.info))
+      Result[SingleItem.info.Name] = {
+        value = toDataType(binaryData, SingleItem.info.type)
       }
     end
-  elseif parameterInfo.Datatype then
-    Result.value = toDataType(binData, parameterInfo.Datatype.type)
+  elseif parameterInfo.info then
+    Result.value = toDataType(binData, parameterInfo.info.type)
   end
   return Result
 end
@@ -267,11 +256,11 @@ converter.getReadServiceDataResult = getReadServiceDataResult
 local function getReadProcessDataResult(binData, processDataInfo)
   local resultData = {}
   for dataPointID, dataPointInfo in pairs(processDataInfo) do
-    if dataPointInfo.Datatype.type == 'RecordT' or dataPointInfo.Datatype.type == 'ArrayT' then
+    if dataPointInfo.info.type == 'RecordT' or dataPointInfo.info.type == 'ArrayT' then
       resultData[dataPointID] = getReadServiceDataResult(binData, dataPointInfo)
     else
-      local offsetData = disassembleData(binData, tonumber(dataPointInfo.bitOffset), getDatatypeBitlength(dataPointInfo.Datatype))
-      resultData[dataPointID] = {value = toDataType(offsetData, dataPointInfo.Datatype.type)}
+      local offsetData = disassembleData(binData, tonumber(dataPointInfo.info.bitOffset), getDatatypeBitlength(dataPointInfo.info))
+      resultData[dataPointID] = {value = toDataType(offsetData, dataPointInfo.info.type)}
     end
   end
   return resultData
@@ -281,15 +270,9 @@ converter.getReadProcessDataResult = getReadProcessDataResult
 --Return a JSON payload of expacted format filled with null values in case reading of a Parameter has failed 
 local function getFailedReadServiceDataResult(parameterInfo)
   local Result = {}
-  if parameterInfo.Datatype.type == 'ArrayT' then
-    for i = 1, parameterInfo.Datatype.count do
-      Result["element_" .. tostring(i)] = {
-        value = "null"
-      }
-    end
-  elseif parameterInfo.Datatype.type == 'RecordT' then
-    for _, SingleItem in ipairs(parameterInfo.Datatype.RecordItem) do
-      Result[SingleItem.Name] = {
+  if parameterInfo.info.type == 'ArrayT' or parameterInfo.info.type == 'RecordT' then
+    for _, SingleItem in pairs(parameterInfo.subindeces) do
+      Result[SingleItem.info.Name] = {
         value = "null"
       }
     end
@@ -384,34 +367,18 @@ end
 -- Conver Lua table of a complex type (array or record) to a binary data for writing to IO-Link device
 local function getComplexServiceDataToWrite(parameterInfo, data)
     local bitArray
-    local byteLength = math.ceil(getDatatypeBitlength(parameterInfo.Datatype) / 8)
-    if parameterInfo.Datatype.type == 'ArrayT' then
-      bitArray = makeEmptyBitArray(getDatatypeBitlength(parameterInfo.Datatype))
-
-      local simpleDataBitLength = getDatatypeBitlength(parameterInfo.Datatype.Datatype)
-      local bitIndexer = 0
-      for i = 1, tonumber(parameterInfo.Datatype.count) do
-        insertIntoBitArray(
-          bitArray,
-          data[i].value,
-          parameterInfo.Datatype.Datatype.type,
-          bitIndexer*simpleDataBitLength,
-          simpleDataBitLength
-        )
-        bitIndexer = bitIndexer + 1
-      end
-    elseif parameterInfo.Datatype.type == 'RecordT' then
-      bitArray = makeEmptyBitArray(getDatatypeBitlength(parameterInfo.Datatype))
-      for _, SingleItem in ipairs(parameterInfo.Datatype.RecordItem) do
+    local byteLength = math.ceil(getDatatypeBitlength(parameterInfo.info) / 8)
+    if parameterInfo.info.type == 'ArrayT' or parameterInfo.info.type == 'RecordT' then
+      bitArray = makeEmptyBitArray(getDatatypeBitlength(parameterInfo.info))
+      for _, SingleItem in pairs(parameterInfo.subindeces) do
         insertIntoBitArray(
           bitArray,
-          data[SingleItem.Name].value,
-          SingleItem.Datatype.type,
-          tonumber(SingleItem.bitOffset),
-          getDatatypeBitlength(SingleItem.Datatype)
+          data[SingleItem.info.Name].value,
+          SingleItem.info.type,
+          tonumber(SingleItem.info.bitOffset),
+          getDatatypeBitlength(SingleItem.info)
         )
       end
-
     end
     local bin = ''
     for i = 1, byteLength do
@@ -422,58 +389,16 @@ local function getComplexServiceDataToWrite(parameterInfo, data)
 end
 converter.getComplexServiceDataToWrite = getComplexServiceDataToWrite
 
-
-
 -------------------------------------------------------------------------------------
--- Conver Lua table to a binary data for writing to IO-Link device
+-- Convert Lua table to a binary data for writing to IO-Link device
 local function getBinaryDataToWrite(dataPointInfoInfo, data)
-  if dataPointInfoInfo.Datatype.type == 'ArrayT' or dataPointInfoInfo.Datatype.type == 'RecordT' then
+  if dataPointInfoInfo.info.type == 'ArrayT' or dataPointInfoInfo.info.type == 'RecordT' then
     return getComplexServiceDataToWrite(dataPointInfoInfo, data)
   else
-    return toBinaryData(dataPointInfoInfo.Datatype.type, math.ceil(getDatatypeBitlength(dataPointInfoInfo.Datatype)/8), data.value)
+    local test = toBinaryData(dataPointInfoInfo.info.type, math.ceil(getDatatypeBitlength(dataPointInfoInfo.info)/8), data.value)
+    return test
   end
 end
 converter.getBinaryDataToWrite = getBinaryDataToWrite
 
---changing ["xsi:type"] to more convenient .type key
-local function renameDatatype(dataPointInfo)
-  if dataPointInfo.SimpleDatatype then
-    dataPointInfo.Datatype = helperFuncs.copy(dataPointInfo.SimpleDatatype)
-    dataPointInfo.SimpleDatatype = nil
-  elseif dataPointInfo.Datatype.SimpleDatatype then
-    dataPointInfo.Datatype.Datatype = helperFuncs.copy(dataPointInfo.Datatype.SimpleDatatype)
-    dataPointInfo.Datatype.SimpleDatatype = nil
-    if dataPointInfo.Datatype.Datatype["xsi:type"] then
-      dataPointInfo.Datatype.Datatype.type = dataPointInfo.Datatype.Datatype["xsi:type"]
-      dataPointInfo.Datatype.Datatype["xsi:type"] = nil
-    end
-  elseif dataPointInfo.Datatype.RecordItem then
-    for recordItemID, recordItemInfo in ipairs(dataPointInfo.Datatype.RecordItem) do
-      if recordItemInfo.SimpleDatatype then
-        dataPointInfo.Datatype.RecordItem[recordItemID].Datatype = helperFuncs.copy(recordItemInfo.SimpleDatatype)
-        dataPointInfo.Datatype.RecordItem[recordItemID].SimpleDatatype = nil
-        if recordItemInfo.Datatype["xsi:type"] then
-          dataPointInfo.Datatype.RecordItem[recordItemID].Datatype.type = recordItemInfo.Datatype["xsi:type"]
-          dataPointInfo.Datatype.RecordItem[recordItemID].Datatype["xsi:type"] = nil
-        end
-      end
-    end
-  end
-  if dataPointInfo.Datatype["xsi:type"] then
-    dataPointInfo.Datatype.type = dataPointInfo.Datatype["xsi:type"]
-    dataPointInfo.Datatype["xsi:type"] = nil
-  end
-  return dataPointInfo
-end
-converter.renameDatatype = renameDatatype
-
---changing ["xsi:type"] to more convenient .type key
-local function renameDatamode(dataModeTable)
-  for dataPointID, dataPointInfo in ipairs(dataModeTable) do
-    dataModeTable[dataPointID] = renameDatatype(dataPointInfo)
-  end
-  return dataModeTable
-end
-converter.renameDatamode = renameDatamode
-
 return converter

README.md

@@ -59,6 +59,7 @@ Tested on
 
 |Device|Firmware version|Module version|
 |--|--|--|
+|SIM1012|V2.4.2|V2.1.1|
 |SIM1012|V2.4.2|V2.1.0|
 |SIM1012|V2.4.2|V2.0.0|
 |SICK AppEngine|V1.7.0|V2.0.0|

docu/CSK_Module_MultiIOLinkSMI.html

@@ -6,7 +6,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="generator" content="Asciidoctor 2.0.12">
 <meta name="author" content="SICK AG">
-<title>Documentation - CSK_Module_MultiIOLinkSMI 2.1.0</title>
+<title>Documentation - CSK_Module_MultiIOLinkSMI 2.1.1</title>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 <style>
 /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -615,10 +615,10 @@
 </head>
 <body class="article toc2 toc-left">
 <div id="header">
-<h1>Documentation - CSK_Module_MultiIOLinkSMI 2.1.0</h1>
+<h1>Documentation - CSK_Module_MultiIOLinkSMI 2.1.1</h1>
 <div class="details">
 <span id="author" class="author">SICK AG</span><br>
-<span id="revnumber">version 2.1.0,</span>
+<span id="revnumber">version 2.1.1,</span>
 <span id="revdate">2025-01-22</span>
 </div>
 <div id="toc" class="toc2">
@@ -860,7 +860,7 @@ <h2 id="_document_metadata">Document metadata</h2>
 </tr>
 <tr>
 <th class="tableblock halign-left valign-top"><p class="tableblock">Version</p></th>
-<td class="tableblock halign-left valign-top"><p class="tableblock">2.1.0</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">2.1.1</p></td>
 </tr>
 <tr>
 <th class="tableblock halign-left valign-top"><p class="tableblock">Date</p></th>
@@ -10048,7 +10048,7 @@ <h6 id="_sample_auto_generated_172">Sample (auto-generated)</h6>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 2.1.0<br>
+Version 2.1.1<br>
 Last updated 2025-01-22 12:19:50 +0100
 </div>
 </div>