Skip to content

Commit 414e9c3

Browse files
Release 6.1.1 (#3)
# Release 6.1.1 # Bugfix - Issue to create new instances (introduced with v6.1.0)
1 parent f37a26a commit 414e9c3

8 files changed

Lines changed: 66 additions & 50 deletions

File tree

CHANGELOG.md

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

4+
## Release 6.1.1
5+
6+
### Bugfix
7+
- Issue to create new instances (introduced with v6.1.0)
8+
49
## Release 6.1.0
510

611
### New features

CSK_Module_MultiRemoteCamera/project.mf.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ According to the selected model it will use some predefined GigE Vision paramete
640640
</crown>
641641
</crown>
642642
<meta key="author">SICK AG</meta>
643-
<meta key="version">6.1.0</meta>
643+
<meta key="version">6.1.1</meta>
644644
<meta key="priority">low</meta>
645645
<meta key="copy-protected">false</meta>
646646
<meta key="read-protected">false</meta>

CSK_Module_MultiRemoteCamera/scripts/CSK_MultiRemoteCamera_ImageProcessing.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ local function handleOnNewImageProcessingParameter(cameraNo, parameter, value)
212212
end
213213
elseif parameter == 'activeInUI' then
214214
imageProcessingParams[parameter] = false
215+
viewer:clear()
216+
viewer:present()
215217
end
216218
end
217219
Script.register("CSK_MultiRemoteCamera.OnNewImageProcessingParameter", handleOnNewImageProcessingParameter)

CSK_Module_MultiRemoteCamera/scripts/Sensors/MultiRemoteCamera/MultiRemoteCamera_Controller.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ local function loadParameters()
10241024
_G.logger:info(nameOfModule .. ": Loaded parameters from CSK_PersistentData module.")
10251025
multiRemoteCamera_Instances[selectedInstance].parameters = helperFuncs.convertContainer2Table(data)
10261026

1027-
multiRemoteCamera_Instances[selectedInstance].parameters = helperFuncs.checkParameters(multiRemoteCamera_Instances[selectedInstance].parameters, helperFuncs.defaultParameters)
1027+
multiRemoteCamera_Instances[selectedInstance].parameters = helperFuncs.checkParameters(multiRemoteCamera_Instances[selectedInstance].parameters, helperFuncs.defaultParameters.getParameters())
10281028

10291029
multiRemoteCamera_Instances[selectedInstance]:setNewConfig()
10301030
updateImageProcessingParameter()

CSK_Module_MultiRemoteCamera/scripts/Sensors/MultiRemoteCamera/MultiRemoteCamera_Model.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function multiRemoteCamera.create(cameraNo)
8787
self.triggerFunction = nil -- Internally used function to SW trigger the camera
8888

8989
self.parameters = {}
90-
self.parameters = require('Sensors/MultiRemoteCamera/MultiRemoteCamera_Parameters') -- Load default parameters
90+
self.parameters = self.helperFuncs.defaultParameters.getParameters() -- Load default parameters
9191

9292
-- Instance specific parameters
9393
self.parameters.cameraNo = cameraNo -- Instance no of this camera

CSK_Module_MultiRemoteCamera/scripts/Sensors/MultiRemoteCamera/MultiRemoteCamera_Parameters.lua

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,55 @@
55
-- for this module and its default values
66
--***************************************************************
77

8-
local multiRemoteCameraParameters = {}
9-
multiRemoteCameraParameters.cameraNo = 1 -- Instance no of this camera (must be set individually)
10-
multiRemoteCameraParameters.camSum = 1 -- Amount of all cameras (must be set individually)
11-
multiRemoteCameraParameters.cameraIP = '192.168.1.100' -- IP of camera (must be set individually)
12-
13-
if _G.availableAPIs.GigEVision == true then
14-
multiRemoteCameraParameters.gigEvision = true -- Use GigE Vision camera
15-
else
16-
multiRemoteCameraParameters.gigEvision = false -- Use GigE Vision camera
8+
local functions = {}
9+
10+
local function getParameters()
11+
12+
local multiRemoteCameraParameters = {}
13+
multiRemoteCameraParameters.cameraNo = 1 -- Instance no of this camera (must be set individually)
14+
multiRemoteCameraParameters.camSum = 1 -- Amount of all cameras (must be set individually)
15+
multiRemoteCameraParameters.cameraIP = '192.168.1.100' -- IP of camera (must be set individually)
16+
17+
if _G.availableAPIs.GigEVision == true then
18+
multiRemoteCameraParameters.gigEvision = true -- Use GigE Vision camera
19+
else
20+
multiRemoteCameraParameters.gigEvision = false -- Do not use GigE Vision camera
21+
end
22+
23+
multiRemoteCameraParameters.flowConfigPriority = CSK_FlowConfig ~= nil or false -- Status if FlowConfig should have priority for FlowConfig relevant configurations
24+
multiRemoteCameraParameters.switchMode = false -- Is camera connected via switch to SIM?
25+
multiRemoteCameraParameters.shutterTime = 20000 -- Shutter time to use
26+
multiRemoteCameraParameters.gain = 1.0 -- Gain
27+
multiRemoteCameraParameters.framerate = 1 -- Frame rate in "FIXED_FREQUENCY" mode
28+
multiRemoteCameraParameters.acquisitionMode = 'SOFTWARE_TRIGGER' -- 'FIXED_FREQUENCY' / 'SOFTWARE_TRIGGER' / 'HARDWARE_TRIGGER'
29+
multiRemoteCameraParameters.swTriggerEvent = '' -- Opt. event to trigger camera in SW mode
30+
multiRemoteCameraParameters.hardwareTriggerDelay = 0 -- Opt. delay for HW trigger
31+
multiRemoteCameraParameters.triggerDelayBlockName = nil -- Name of specific delay bock within cFlow
32+
multiRemoteCameraParameters.colorMode = 'MONO8' --'COLOR8' / 'MONO8' / 'RAW8'
33+
multiRemoteCameraParameters.xStartFOV = 0 -- Field of view xStart
34+
multiRemoteCameraParameters.xEndFOV = 100 -- Field of view xEnd
35+
multiRemoteCameraParameters.yStartFOV = 0 -- Field of view yStart
36+
multiRemoteCameraParameters.yEndFOV = 100 -- Field of view yEnd
37+
multiRemoteCameraParameters.imagePoolSize = 10 -- Image pool size
38+
multiRemoteCameraParameters.processingFile = 'CSK_MultiRemoteCamera_ImageProcessing' -- Script to use for processing in thread
39+
multiRemoteCameraParameters.monitorCamera = false -- Opt. monitor camera status in "CameraOverview" UI
40+
multiRemoteCameraParameters.customGigEVisionConfig = {} -- Custom GigEVision setting, content are 3 tables ".parameter", ".type", ".value"
41+
multiRemoteCameraParameters.cameraModel = "PicoMidiCam2" -- 'a2A1920-51gcBAS', 'CustomConfig'
42+
43+
-- Image processing parameters
44+
multiRemoteCameraParameters.processingMode = "BOTH" -- 'SCRIPT', 'APP', 'BOTH' --> see "setProcessingMode"
45+
multiRemoteCameraParameters.maxImageQueueSize = 5 -- max. size of image queue
46+
multiRemoteCameraParameters.savingImagePath = '/public/' -- path of images to save (SD or public)
47+
multiRemoteCameraParameters.imageFilePrefix = 'Image_' -- prefix for images to be saved
48+
multiRemoteCameraParameters.saveAllImages = false -- Save all incoming images
49+
multiRemoteCameraParameters.tempSaveImage = false -- Save latest image to opt. save it later
50+
multiRemoteCameraParameters.resizeFactor = 1.0 -- factor to resize the incoming image, 0.1 - 1.0
51+
multiRemoteCameraParameters.imageSaveFormat = 'bmp' -- bmp / jpg / png
52+
multiRemoteCameraParameters.imageSaveJpgFormatCompression = 90
53+
multiRemoteCameraParameters.imageSavePngFormatCompression = 6
54+
55+
return multiRemoteCameraParameters
1756
end
57+
functions.getParameters = getParameters
1858

19-
multiRemoteCameraParameters.flowConfigPriority = CSK_FlowConfig ~= nil or false -- Status if FlowConfig should have priority for FlowConfig relevant configurations
20-
multiRemoteCameraParameters.switchMode = false -- Is camera connected via switch to SIM?
21-
multiRemoteCameraParameters.shutterTime = 20000 -- Shutter time to use
22-
multiRemoteCameraParameters.gain = 1.0 -- Gain
23-
multiRemoteCameraParameters.framerate = 1 -- Frame rate in "FIXED_FREQUENCY" mode
24-
multiRemoteCameraParameters.acquisitionMode = 'SOFTWARE_TRIGGER' -- 'FIXED_FREQUENCY' / 'SOFTWARE_TRIGGER' / 'HARDWARE_TRIGGER'
25-
multiRemoteCameraParameters.swTriggerEvent = '' -- Opt. event to trigger camera in SW mode
26-
multiRemoteCameraParameters.hardwareTriggerDelay = 0 -- Opt. delay for HW trigger
27-
multiRemoteCameraParameters.triggerDelayBlockName = nil -- Name of specific delay bock within cFlow
28-
multiRemoteCameraParameters.colorMode = 'MONO8' --'COLOR8' / 'MONO8' / 'RAW8'
29-
multiRemoteCameraParameters.xStartFOV = 0 -- Field of view xStart
30-
multiRemoteCameraParameters.xEndFOV = 100 -- Field of view xEnd
31-
multiRemoteCameraParameters.yStartFOV = 0 -- Field of view yStart
32-
multiRemoteCameraParameters.yEndFOV = 100 -- Field of view yEnd
33-
multiRemoteCameraParameters.imagePoolSize = 10 -- Image pool size
34-
multiRemoteCameraParameters.processingFile = 'CSK_MultiRemoteCamera_ImageProcessing' -- Script to use for processing in thread
35-
multiRemoteCameraParameters.monitorCamera = false -- Opt. monitor camera status in "CameraOverview" UI
36-
multiRemoteCameraParameters.customGigEVisionConfig = {} -- Custom GigEVision setting, content are 3 tables ".parameter", ".type", ".value"
37-
multiRemoteCameraParameters.cameraModel = "PicoMidiCam2" -- 'a2A1920-51gcBAS', 'CustomConfig'
38-
39-
-- Image processing parameters
40-
multiRemoteCameraParameters.processingMode = "BOTH" -- 'SCRIPT', 'APP', 'BOTH' --> see "setProcessingMode"
41-
multiRemoteCameraParameters.maxImageQueueSize = 5 -- max. size of image queue
42-
multiRemoteCameraParameters.savingImagePath = '/public/' -- path of images to save (SD or public)
43-
multiRemoteCameraParameters.imageFilePrefix = 'Image_' -- prefix for images to be saved
44-
multiRemoteCameraParameters.saveAllImages = false -- Save all incoming images
45-
multiRemoteCameraParameters.tempSaveImage = false -- Save latest image to opt. save it later
46-
multiRemoteCameraParameters.resizeFactor = 1.0 -- factor to resize the incoming image, 0.1 - 1.0
47-
multiRemoteCameraParameters.imageSaveFormat = 'bmp' -- bmp / jpg / png
48-
multiRemoteCameraParameters.imageSaveJpgFormatCompression = 90
49-
multiRemoteCameraParameters.imageSavePngFormatCompression = 6
50-
51-
return multiRemoteCameraParameters
59+
return functions

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Tested on
1818

1919
|Device|Firmware|Module version|
2020
|--|--|--|
21+
|SIM2x00|V1.8.0|V6.1.1|
2122
|SIM2x00|V1.8.0|V6.1.0|
2223
|SIM1012|V2.4.2|V6.1.0|
2324
|SIM1012|V2.4.2|V6.0.0|

docu/CSK_Module_MultiRemoteCamera.html

Lines changed: 5 additions & 5 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_MultiRemoteCamera 6.1.0</title>
9+
<title>Documentation - CSK_Module_MultiRemoteCamera 6.1.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,10 +615,10 @@
615615
</head>
616616
<body class="article toc2 toc-left">
617617
<div id="header">
618-
<h1>Documentation - CSK_Module_MultiRemoteCamera 6.1.0</h1>
618+
<h1>Documentation - CSK_Module_MultiRemoteCamera 6.1.1</h1>
619619
<div class="details">
620620
<span id="author" class="author">SICK AG</span><br>
621-
<span id="revnumber">version 6.1.0,</span>
621+
<span id="revnumber">version 6.1.1,</span>
622622
<span id="revdate">2025-02-05</span>
623623
</div>
624624
<div id="toc" class="toc2">
@@ -835,7 +835,7 @@ <h2 id="_document_metadata">Document metadata</h2>
835835
</tr>
836836
<tr>
837837
<th class="tableblock halign-left valign-top"><p class="tableblock">Version</p></th>
838-
<td class="tableblock halign-left valign-top"><p class="tableblock">6.1.0</p></td>
838+
<td class="tableblock halign-left valign-top"><p class="tableblock">6.1.1</p></td>
839839
</tr>
840840
<tr>
841841
<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
77087708
</div>
77097709
<div id="footer">
77107710
<div id="footer-text">
7711-
Version 6.1.0<br>
7711+
Version 6.1.1<br>
77127712
Last updated 2025-02-05 15:50:14 +0100
77137713
</div>
77147714
</div>

0 commit comments

Comments
 (0)