Skip to content

Commit 267908b

Browse files
golluroSICKAGgolluroSICKAG
authored
# Release 1.0.1 (#2)
# Release 1.0.1 ## Bugfix - If recipe to load after reboot includes parameter for FlowConfig module, both modules will block each other (fix needs CSK_Module_FlowConfig v1.1.0)
1 parent 53419e4 commit 267908b

File tree

5 files changed

+28
-10
lines changed

5 files changed

+28
-10
lines changed

‎CHANGELOG.md

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

4+
## Release 1.0.1
5+
6+
### Bugfix
7+
- If recipe to load after reboot includes parameter for FlowConfig module, both modules will block each other (fix needs CSK_Module_FlowConfig v1.1.0)
8+
49
## Release 1.0.0
510
- Initial commit

‎CSK_Module_RecipeManager/project.mf.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ Beside of this, it is possible to load a recipe via an external event. To do so,
281281
</crown>
282282
</crown>
283283
<meta key="author">SICK AG</meta>
284-
<meta key="version">1.0.0</meta>
284+
<meta key="version">1.0.1</meta>
285285
<meta key="priority">low</meta>
286286
<meta key="copy-protected">false</meta>
287287
<meta key="read-protected">false</meta>

‎CSK_Module_RecipeManager/scripts/Configuration/RecipeManager/RecipeManager_Controller.lua

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,12 @@ local function setFlowConfigPriority(status)
502502
end
503503
Script.serveFunction('CSK_RecipeManager.setFlowConfigPriority', setFlowConfigPriority)
504504

505+
--- Function to load parameters related to status if FlowConfig module is ready
506+
local function tempLoadConfig()
507+
local dereg = Script.deregister("CSK_FlowConfig.OnNewStatusFlowConfigReady", tempLoadConfig)
508+
loadParameters()
509+
end
510+
505511
--- Function to react on initial load of persistent parameters
506512
local function handleOnInitialDataLoaded()
507513

@@ -521,7 +527,12 @@ local function handleOnInitialDataLoaded()
521527
end
522528

523529
if recipeManager_Model.parameterLoadOnReboot then
524-
loadParameters()
530+
if CSK_FlowConfig then
531+
-- If FlowConfig module is available, wait till it is ready (otherwise it is possible that modules block each other)
532+
Script.register("CSK_FlowConfig.OnNewStatusFlowConfigReady", tempLoadConfig)
533+
else
534+
loadParameters()
535+
end
525536
end
526537
Script.notifyEvent('RecipeManager_OnDataLoadedOnReboot')
527538
end

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ For further information check out the [documentation](https://raw.githack.com/SI
1010

1111
## Information
1212

13+
If used together with CSK_Module_FlowConfig, please make sure to use a version >=1.1.0.
14+
1315
Tested on
1416

1517
|Device|Firmware|Module version|

‎docu/CSK_Module_RecipeManager.html

Lines changed: 8 additions & 8 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_RecipeManager 1.0.0</title>
9+
<title>Documentation - CSK_Module_RecipeManager 1.0.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_RecipeManager 1.0.0</h1>
618+
<h1>Documentation - CSK_Module_RecipeManager 1.0.1</h1>
619619
<div class="details">
620620
<span id="author" class="author">SICK AG</span><br>
621-
<span id="revnumber">version 1.0.0,</span>
622-
<span id="revdate">2024-08-14</span>
621+
<span id="revnumber">version 1.0.1,</span>
622+
<span id="revdate">2024-12-11</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">1.0.0</p></td>
757+
<td class="tableblock halign-left valign-top"><p class="tableblock">1.0.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">2024-08-14</p></td>
761+
<td class="tableblock halign-left valign-top"><p class="tableblock">2024-12-11</p></td>
762762
</tr>
763763
<tr>
764764
<th class="tableblock halign-left valign-top"><p class="tableblock">Author</p></th>
@@ -3499,8 +3499,8 @@ <h6 id="_sample_auto_generated_57">Sample (auto-generated)</h6>
34993499
</div>
35003500
<div id="footer">
35013501
<div id="footer-text">
3502-
Version 1.0.0<br>
3503-
Last updated 2024-08-14 18:22:29 +0200
3502+
Version 1.0.1<br>
3503+
Last updated 2024-12-11 11:03:10 +0100
35043504
</div>
35053505
</div>
35063506
<script type="text/javascript">

0 commit comments

Comments
 (0)