Release 6.1.1 (#3)

# Release 6.1.1

# Bugfix
- Issue to create new instances (introduced with v6.1.0)

Author: golluroSICKAG

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Release 6.1.1
+
+### Bugfix
+- Issue to create new instances (introduced with v6.1.0)
+
 ## Release 6.1.0
 
 ### New features

CSK_Module_MultiRemoteCamera/project.mf.xml

@@ -640,7 +640,7 @@ According to the selected model it will use some predefined GigE Vision paramete
             </crown>
         </crown>
         <meta key="author">SICK AG</meta>
-        <meta key="version">6.1.0</meta>
+        <meta key="version">6.1.1</meta>
         <meta key="priority">low</meta>
         <meta key="copy-protected">false</meta>
         <meta key="read-protected">false</meta>

CSK_Module_MultiRemoteCamera/scripts/CSK_MultiRemoteCamera_ImageProcessing.lua

@@ -212,6 +212,8 @@ local function handleOnNewImageProcessingParameter(cameraNo, parameter, value)
     end
   elseif parameter == 'activeInUI' then
     imageProcessingParams[parameter] = false
+    viewer:clear()
+    viewer:present()
   end
 end
 Script.register("CSK_MultiRemoteCamera.OnNewImageProcessingParameter", handleOnNewImageProcessingParameter)

CSK_Module_MultiRemoteCamera/scripts/Sensors/MultiRemoteCamera/MultiRemoteCamera_Controller.lua

@@ -1024,7 +1024,7 @@ local function loadParameters()
       _G.logger:info(nameOfModule .. ": Loaded parameters from CSK_PersistentData module.")
       multiRemoteCamera_Instances[selectedInstance].parameters = helperFuncs.convertContainer2Table(data)
 
-      multiRemoteCamera_Instances[selectedInstance].parameters = helperFuncs.checkParameters(multiRemoteCamera_Instances[selectedInstance].parameters, helperFuncs.defaultParameters)
+      multiRemoteCamera_Instances[selectedInstance].parameters = helperFuncs.checkParameters(multiRemoteCamera_Instances[selectedInstance].parameters, helperFuncs.defaultParameters.getParameters())
 
       multiRemoteCamera_Instances[selectedInstance]:setNewConfig()
       updateImageProcessingParameter()

CSK_Module_MultiRemoteCamera/scripts/Sensors/MultiRemoteCamera/MultiRemoteCamera_Model.lua

@@ -87,7 +87,7 @@ function multiRemoteCamera.create(cameraNo)
   self.triggerFunction = nil -- Internally used function to SW trigger the camera
 
   self.parameters = {}
-  self.parameters = require('Sensors/MultiRemoteCamera/MultiRemoteCamera_Parameters') -- Load default parameters
+  self.parameters = self.helperFuncs.defaultParameters.getParameters() -- Load default parameters
 
   -- Instance specific parameters
   self.parameters.cameraNo = cameraNo -- Instance no of this camera

CSK_Module_MultiRemoteCamera/scripts/Sensors/MultiRemoteCamera/MultiRemoteCamera_Parameters.lua

@@ -5,47 +5,55 @@
 -- for this module and its default values
 --***************************************************************
 
-local multiRemoteCameraParameters = {}
-multiRemoteCameraParameters.cameraNo = 1 -- Instance no of this camera (must be set individually)
-multiRemoteCameraParameters.camSum = 1 -- Amount of all cameras (must be set individually)
-multiRemoteCameraParameters.cameraIP = '192.168.1.100' -- IP of camera (must be set individually)
-
-if _G.availableAPIs.GigEVision == true then
-  multiRemoteCameraParameters.gigEvision = true -- Use GigE Vision camera
-else
-  multiRemoteCameraParameters.gigEvision = false -- Use GigE Vision camera
+local functions = {}
+
+local function getParameters()
+
+  local multiRemoteCameraParameters = {}
+  multiRemoteCameraParameters.cameraNo = 1 -- Instance no of this camera (must be set individually)
+  multiRemoteCameraParameters.camSum = 1 -- Amount of all cameras (must be set individually)
+  multiRemoteCameraParameters.cameraIP = '192.168.1.100' -- IP of camera (must be set individually)
+
+  if _G.availableAPIs.GigEVision == true then
+    multiRemoteCameraParameters.gigEvision = true -- Use GigE Vision camera
+  else
+    multiRemoteCameraParameters.gigEvision = false -- Do not use GigE Vision camera
+  end
+
+  multiRemoteCameraParameters.flowConfigPriority = CSK_FlowConfig ~= nil or false -- Status if FlowConfig should have priority for FlowConfig relevant configurations
+  multiRemoteCameraParameters.switchMode = false -- Is camera connected via switch to SIM?
+  multiRemoteCameraParameters.shutterTime = 20000 -- Shutter time to use
+  multiRemoteCameraParameters.gain = 1.0 -- Gain
+  multiRemoteCameraParameters.framerate = 1 -- Frame rate in "FIXED_FREQUENCY" mode
+  multiRemoteCameraParameters.acquisitionMode = 'SOFTWARE_TRIGGER' -- 'FIXED_FREQUENCY' / 'SOFTWARE_TRIGGER' / 'HARDWARE_TRIGGER'
+  multiRemoteCameraParameters.swTriggerEvent = '' -- Opt. event to trigger camera in SW mode
+  multiRemoteCameraParameters.hardwareTriggerDelay = 0 -- Opt. delay for HW trigger
+  multiRemoteCameraParameters.triggerDelayBlockName = nil -- Name of specific delay bock within cFlow
+  multiRemoteCameraParameters.colorMode = 'MONO8' --'COLOR8' / 'MONO8' / 'RAW8'
+  multiRemoteCameraParameters.xStartFOV = 0 -- Field of view xStart
+  multiRemoteCameraParameters.xEndFOV = 100 -- Field of view xEnd
+  multiRemoteCameraParameters.yStartFOV = 0 -- Field of view yStart
+  multiRemoteCameraParameters.yEndFOV = 100 -- Field of view yEnd
+  multiRemoteCameraParameters.imagePoolSize = 10 -- Image pool size
+  multiRemoteCameraParameters.processingFile = 'CSK_MultiRemoteCamera_ImageProcessing' -- Script to use for processing in thread
+  multiRemoteCameraParameters.monitorCamera = false -- Opt. monitor camera status in "CameraOverview" UI
+  multiRemoteCameraParameters.customGigEVisionConfig = {} -- Custom GigEVision setting, content are 3 tables ".parameter", ".type", ".value"
+  multiRemoteCameraParameters.cameraModel = "PicoMidiCam2" -- 'a2A1920-51gcBAS', 'CustomConfig'
+
+  -- Image processing parameters
+  multiRemoteCameraParameters.processingMode = "BOTH" -- 'SCRIPT', 'APP', 'BOTH' --> see "setProcessingMode"
+  multiRemoteCameraParameters.maxImageQueueSize = 5 -- max. size of image queue
+  multiRemoteCameraParameters.savingImagePath = '/public/' -- path of images to save (SD or public)
+  multiRemoteCameraParameters.imageFilePrefix = 'Image_' -- prefix for images to be saved
+  multiRemoteCameraParameters.saveAllImages = false -- Save all incoming images
+  multiRemoteCameraParameters.tempSaveImage = false -- Save latest image to opt. save it later
+  multiRemoteCameraParameters.resizeFactor = 1.0 -- factor to resize the incoming image, 0.1 - 1.0
+  multiRemoteCameraParameters.imageSaveFormat = 'bmp' -- bmp / jpg / png
+  multiRemoteCameraParameters.imageSaveJpgFormatCompression = 90
+  multiRemoteCameraParameters.imageSavePngFormatCompression = 6
+
+  return multiRemoteCameraParameters
 end
+functions.getParameters = getParameters
 
-multiRemoteCameraParameters.flowConfigPriority = CSK_FlowConfig ~= nil or false -- Status if FlowConfig should have priority for FlowConfig relevant configurations
-multiRemoteCameraParameters.switchMode = false -- Is camera connected via switch to SIM?
-multiRemoteCameraParameters.shutterTime = 20000 -- Shutter time to use
-multiRemoteCameraParameters.gain = 1.0 -- Gain
-multiRemoteCameraParameters.framerate = 1 -- Frame rate in "FIXED_FREQUENCY" mode
-multiRemoteCameraParameters.acquisitionMode = 'SOFTWARE_TRIGGER' -- 'FIXED_FREQUENCY' / 'SOFTWARE_TRIGGER' / 'HARDWARE_TRIGGER'
-multiRemoteCameraParameters.swTriggerEvent = '' -- Opt. event to trigger camera in SW mode
-multiRemoteCameraParameters.hardwareTriggerDelay = 0 -- Opt. delay for HW trigger
-multiRemoteCameraParameters.triggerDelayBlockName = nil -- Name of specific delay bock within cFlow
-multiRemoteCameraParameters.colorMode = 'MONO8' --'COLOR8' / 'MONO8' / 'RAW8'
-multiRemoteCameraParameters.xStartFOV = 0 -- Field of view xStart
-multiRemoteCameraParameters.xEndFOV = 100 -- Field of view xEnd
-multiRemoteCameraParameters.yStartFOV = 0 -- Field of view yStart
-multiRemoteCameraParameters.yEndFOV = 100 -- Field of view yEnd
-multiRemoteCameraParameters.imagePoolSize = 10 -- Image pool size
-multiRemoteCameraParameters.processingFile = 'CSK_MultiRemoteCamera_ImageProcessing' -- Script to use for processing in thread
-multiRemoteCameraParameters.monitorCamera = false -- Opt. monitor camera status in "CameraOverview" UI
-multiRemoteCameraParameters.customGigEVisionConfig = {} -- Custom GigEVision setting, content are 3 tables ".parameter", ".type", ".value"
-multiRemoteCameraParameters.cameraModel = "PicoMidiCam2" -- 'a2A1920-51gcBAS', 'CustomConfig'
-
--- Image processing parameters
-multiRemoteCameraParameters.processingMode = "BOTH" -- 'SCRIPT', 'APP', 'BOTH' --> see "setProcessingMode"
-multiRemoteCameraParameters.maxImageQueueSize = 5 -- max. size of image queue
-multiRemoteCameraParameters.savingImagePath = '/public/' -- path of images to save (SD or public)
-multiRemoteCameraParameters.imageFilePrefix = 'Image_' -- prefix for images to be saved
-multiRemoteCameraParameters.saveAllImages = false -- Save all incoming images
-multiRemoteCameraParameters.tempSaveImage = false -- Save latest image to opt. save it later
-multiRemoteCameraParameters.resizeFactor = 1.0 -- factor to resize the incoming image, 0.1 - 1.0
-multiRemoteCameraParameters.imageSaveFormat = 'bmp' -- bmp / jpg / png
-multiRemoteCameraParameters.imageSaveJpgFormatCompression = 90
-multiRemoteCameraParameters.imageSavePngFormatCompression = 6
-
-return multiRemoteCameraParameters
+return functions

README.md

@@ -18,6 +18,7 @@ Tested on
 
 |Device|Firmware|Module version|
 |--|--|--|
+|SIM2x00|V1.8.0|V6.1.1|
 |SIM2x00|V1.8.0|V6.1.0|
 |SIM1012|V2.4.2|V6.1.0|
 |SIM1012|V2.4.2|V6.0.0|

docu/CSK_Module_MultiRemoteCamera.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_MultiRemoteCamera 6.1.0</title>
+<title>Documentation - CSK_Module_MultiRemoteCamera 6.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_MultiRemoteCamera 6.1.0</h1>
+<h1>Documentation - CSK_Module_MultiRemoteCamera 6.1.1</h1>
 <div class="details">
 <span id="author" class="author">SICK AG</span><br>
-<span id="revnumber">version 6.1.0,</span>
+<span id="revnumber">version 6.1.1,</span>
 <span id="revdate">2025-02-05</span>
 </div>
 <div id="toc" class="toc2">
@@ -835,7 +835,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">6.1.0</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">6.1.1</p></td>
 </tr>
 <tr>
 <th class="tableblock halign-left valign-top"><p class="tableblock">Date</p></th>
@@ -7708,7 +7708,7 @@ <h3 id="API:Enum:CSK_MultiRemoteCamera.ProcessingMode"><span class="api-enum">CS
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 6.1.0<br>
+Version 6.1.1<br>
 Last updated 2025-02-05 15:50:14 +0100
 </div>
 </div>