From bb701b558c52c02a44b79609120b3102dbaac498 Mon Sep 17 00:00:00 2001
From: ft-Demo <fischertechnik-team@fischer.de>
Date: Wed, 9 Nov 2022 07:13:22 +0000
Subject: [PATCH] commit by robo pro coding
---
lib/NodeRED.blockly | 164 ++++++++++++++++++++++++++++++++++----------
lib/NodeRED.py | 2 +
2 files changed, 128 insertions(+), 38 deletions(-)
diff --git a/lib/NodeRED.blockly b/lib/NodeRED.blockly
index a075f08..3cb4721 100644
--- a/lib/NodeRED.blockly
+++ b/lib/NodeRED.blockly
@@ -2417,117 +2417,205 @@
</shadow>
</value>
<next>
- <block type="mqtt_publish" id="]+EFhfc|)bE:M?s~.ngZ">
+ <block type="mqtt_publish" id="k=s}{_x^ZY%c3DKur+9e">
<value name="name">
- <block type="variables_get" id="/rhX}@]}|@N.dEfulb@p">
+ <block type="variables_get" id="h=u(ob;n^{R_.lpK]81.">
<field name="VAR" id="d2.J:01W*;j`8R0B1!GX">client</field>
</block>
</value>
<value name="topic">
- <shadow type="text" id=";//4DTrS)DM6*idO;]QU">
- <field name="TEXT">gtyp_SSC/w_Threshold_White_Red</field>
+ <shadow type="text" id="+gBh9;Dtq-]marLdL1rB">
+ <field name="TEXT">gtyp_Setup/w_Threshold_White_Red</field>
</shadow>
</value>
<value name="value">
- <shadow type="logic_null"/>
- <block type="variables_get" id="PJ+D)]FK6=D!^WDu/Z|5">
- <field name="VAR" id="-XOZ;@M!{qgTA%xgUef-">gtyp_SSC_w_Threshold_White_Red</field>
+ <shadow type="logic_null" id="q@OqL:`$!#`mG-h1%|zu"/>
+ <block type="lists_getIndex" id="o2K!LXN,~%u]sc!j=YvP">
+ <mutation statement="false" at="true"/>
+ <field name="MODE">GET</field>
+ <field name="WHERE">FROM_START</field>
+ <value name="VALUE">
+ <block type="import_function_return" id="BX,?lk4oo;7eTOpnn?zY">
+ <mutation parentId="3{p]h$WzxQ#8708wyjj:"/>
+ <field name="name">get_thresh_list</field>
+ <data>3{p]h$WzxQ#8708wyjj:</data>
+ </block>
+ </value>
+ <value name="AT">
+ <block type="math_number" id="R3pLkV[hQRrS$GW+;(jl">
+ <field name="NUM">1</field>
+ </block>
+ </value>
</block>
</value>
<value name="qos">
- <shadow type="math_number" id="XROfsH:uPwEr;=?ZA2BH">
+ <shadow type="math_number" id="RQKC4e8blv*mw!8.OQ-(">
<field name="NUM">2</field>
</shadow>
</value>
<value name="retain">
- <shadow type="logic_boolean" id="60}wRHbBKjeDf|]~O*k`">
+ <shadow type="logic_boolean" id="VTvDq8k)w=Dnu5aGJHbT">
<field name="BOOL">FALSE</field>
</shadow>
</value>
<next>
- <block type="mqtt_publish" id="FME^shM?U!h!^!cby}W+">
+ <block type="mqtt_publish" id="-yrb8py%@^_deg@Yu}aE">
<value name="name">
- <block type="variables_get" id="SWRJBMR,KRCD#rU;5]k_">
+ <block type="variables_get" id="RYK)n,zT,/C8C2*oMxBu">
<field name="VAR" id="d2.J:01W*;j`8R0B1!GX">client</field>
</block>
</value>
<value name="topic">
- <shadow type="text" id="7H2q)ld@nos)0D@g-ST{">
- <field name="TEXT">gtyp_SSC/w_Threshold_Red_Blue</field>
+ <shadow type="text" id="c:iGRnf@Ve0nN%TZ%qe1">
+ <field name="TEXT">gtyp_Setup/w_Threshold_Red_Blue</field>
</shadow>
</value>
<value name="value">
- <shadow type="logic_null"/>
- <block type="variables_get" id="M30M^ylqg=LNn8:gZP/N">
- <field name="VAR" id="TZ7zEdrg=Q,vG9XutiCF">gtyp_SSC_w_Threshold_Red_Blue</field>
+ <shadow type="logic_null" id="q@Ix9z(]wo/BA0wn9kDw"/>
+ <block type="lists_getIndex" id=",axq25Sw84JUH~rJDaD8">
+ <mutation statement="false" at="true"/>
+ <field name="MODE">GET</field>
+ <field name="WHERE">FROM_START</field>
+ <value name="VALUE">
+ <block type="import_function_return" id="{=#8G34;uK_#OCWH|3dN">
+ <mutation parentId="3{p]h$WzxQ#8708wyjj:"/>
+ <field name="name">get_thresh_list</field>
+ <data>3{p]h$WzxQ#8708wyjj:</data>
+ </block>
+ </value>
+ <value name="AT">
+ <block type="math_number" id="-XhqcGR%MFX$2MgMvRW(">
+ <field name="NUM">2</field>
+ </block>
+ </value>
</block>
</value>
<value name="qos">
- <shadow type="math_number" id="SsA_tZ`x^1+}(_zKjKRu">
+ <shadow type="math_number" id=".{WASU:9jYo15}2*,F=D">
<field name="NUM">2</field>
</shadow>
</value>
<value name="retain">
- <shadow type="logic_boolean" id="!*}`Y.znZ+z.oXK--9c-">
+ <shadow type="logic_boolean" id="JYXg`oN$bTs{_l*-Kjp4">
<field name="BOOL">FALSE</field>
</shadow>
</value>
<next>
- <block type="mqtt_publish" id="Tr6*L5MmGUw.AvHyamY1">
+ <block type="mqtt_publish" id="]+EFhfc|)bE:M?s~.ngZ">
<value name="name">
- <block type="variables_get" id="WCtWefm``a=@t.FvV6Ac">
+ <block type="variables_get" id="/rhX}@]}|@N.dEfulb@p">
<field name="VAR" id="d2.J:01W*;j`8R0B1!GX">client</field>
</block>
</value>
<value name="topic">
- <shadow type="text" id="F]G-gNlf!`e_U_qdumeE">
- <field name="TEXT">gtyp_SLD/w_Threshold_White_Red</field>
+ <shadow type="text" id=";//4DTrS)DM6*idO;]QU">
+ <field name="TEXT">gtyp_SSC/w_Threshold_White_Red</field>
</shadow>
</value>
<value name="value">
<shadow type="logic_null"/>
- <block type="variables_get" id="CA*7dY|3*S+0`O#yh$UV">
- <field name="VAR" id="x43W3)orCB:l1qw2dLN`">gtyp_SLD_w_Threshold_White_Red</field>
+ <block type="variables_get" id="PJ+D)]FK6=D!^WDu/Z|5">
+ <field name="VAR" id="-XOZ;@M!{qgTA%xgUef-">gtyp_SSC_w_Threshold_White_Red</field>
</block>
</value>
<value name="qos">
- <shadow type="math_number" id="V-RWpnm?!B]u{GqNJAg$">
+ <shadow type="math_number" id="XROfsH:uPwEr;=?ZA2BH">
<field name="NUM">2</field>
</shadow>
</value>
<value name="retain">
- <shadow type="logic_boolean" id="=RK^F}d7d^E_mU*W(1}S">
+ <shadow type="logic_boolean" id="60}wRHbBKjeDf|]~O*k`">
<field name="BOOL">FALSE</field>
</shadow>
</value>
<next>
- <block type="mqtt_publish" id="E=2htASUa2V7[.Oh1Z~g">
+ <block type="mqtt_publish" id="FME^shM?U!h!^!cby}W+">
<value name="name">
- <block type="variables_get" id="E=].S3E:1;mEJj~=9fb+">
+ <block type="variables_get" id="SWRJBMR,KRCD#rU;5]k_">
<field name="VAR" id="d2.J:01W*;j`8R0B1!GX">client</field>
</block>
</value>
<value name="topic">
- <shadow type="text" id="1=udhKnD|L.;~2$e^_#_">
- <field name="TEXT">gtyp_SLD/w_Threshold_Red_Blue</field>
+ <shadow type="text" id="7H2q)ld@nos)0D@g-ST{">
+ <field name="TEXT">gtyp_SSC/w_Threshold_Red_Blue</field>
</shadow>
</value>
<value name="value">
<shadow type="logic_null"/>
- <block type="variables_get" id="~}pnCIq5Q%wF4(fA0fsq">
- <field name="VAR" id="z}xxgCaN^$Fn.vEFUV}F">gtyp_SLD_w_Threshold_Red_Blue</field>
+ <block type="variables_get" id="M30M^ylqg=LNn8:gZP/N">
+ <field name="VAR" id="TZ7zEdrg=Q,vG9XutiCF">gtyp_SSC_w_Threshold_Red_Blue</field>
</block>
</value>
<value name="qos">
- <shadow type="math_number" id="E4b)TY}~jy~SgWRG28:A">
+ <shadow type="math_number" id="SsA_tZ`x^1+}(_zKjKRu">
<field name="NUM">2</field>
</shadow>
</value>
<value name="retain">
- <shadow type="logic_boolean" id="pQnV]dxl4;W):A3rbTA4">
+ <shadow type="logic_boolean" id="!*}`Y.znZ+z.oXK--9c-">
<field name="BOOL">FALSE</field>
</shadow>
</value>
+ <next>
+ <block type="mqtt_publish" id="Tr6*L5MmGUw.AvHyamY1">
+ <value name="name">
+ <block type="variables_get" id="WCtWefm``a=@t.FvV6Ac">
+ <field name="VAR" id="d2.J:01W*;j`8R0B1!GX">client</field>
+ </block>
+ </value>
+ <value name="topic">
+ <shadow type="text" id="F]G-gNlf!`e_U_qdumeE">
+ <field name="TEXT">gtyp_SLD/w_Threshold_White_Red</field>
+ </shadow>
+ </value>
+ <value name="value">
+ <shadow type="logic_null"/>
+ <block type="variables_get" id="CA*7dY|3*S+0`O#yh$UV">
+ <field name="VAR" id="x43W3)orCB:l1qw2dLN`">gtyp_SLD_w_Threshold_White_Red</field>
+ </block>
+ </value>
+ <value name="qos">
+ <shadow type="math_number" id="V-RWpnm?!B]u{GqNJAg$">
+ <field name="NUM">2</field>
+ </shadow>
+ </value>
+ <value name="retain">
+ <shadow type="logic_boolean" id="=RK^F}d7d^E_mU*W(1}S">
+ <field name="BOOL">FALSE</field>
+ </shadow>
+ </value>
+ <next>
+ <block type="mqtt_publish" id="E=2htASUa2V7[.Oh1Z~g">
+ <value name="name">
+ <block type="variables_get" id="E=].S3E:1;mEJj~=9fb+">
+ <field name="VAR" id="d2.J:01W*;j`8R0B1!GX">client</field>
+ </block>
+ </value>
+ <value name="topic">
+ <shadow type="text" id="1=udhKnD|L.;~2$e^_#_">
+ <field name="TEXT">gtyp_SLD/w_Threshold_Red_Blue</field>
+ </shadow>
+ </value>
+ <value name="value">
+ <shadow type="logic_null"/>
+ <block type="variables_get" id="~}pnCIq5Q%wF4(fA0fsq">
+ <field name="VAR" id="z}xxgCaN^$Fn.vEFUV}F">gtyp_SLD_w_Threshold_Red_Blue</field>
+ </block>
+ </value>
+ <value name="qos">
+ <shadow type="math_number" id="E4b)TY}~jy~SgWRG28:A">
+ <field name="NUM">2</field>
+ </shadow>
+ </value>
+ <value name="retain">
+ <shadow type="logic_boolean" id="pQnV]dxl4;W):A3rbTA4">
+ <field name="BOOL">FALSE</field>
+ </shadow>
+ </value>
+ </block>
+ </next>
+ </block>
+ </next>
</block>
</next>
</block>
@@ -2746,7 +2834,7 @@
</block>
</statement>
</block>
- <block type="procedures_defnoreturn" id="$jNNx1Oeez9#x~eQYP}z" x="0" y="8280">
+ <block type="procedures_defnoreturn" id="$jNNx1Oeez9#x~eQYP}z" x="0" y="8378">
<field name="NAME">initMQTTLocal</field>
<statement name="STACK">
<block type="variables_set" id="_C*fQdBXqrGb1uUWi?_1">
@@ -2842,7 +2930,7 @@
</block>
</statement>
</block>
- <block type="procedures_defnoreturn" id="R4vMowGJ0I?IYs_!-IwU" x="0" y="8808">
+ <block type="procedures_defnoreturn" id="R4vMowGJ0I?IYs_!-IwU" x="0" y="8906">
<field name="NAME">thread_MQTTLocal</field>
<statement name="STACK">
<block type="util_python" id="IiRVsU4_~OPjE]@(VC;/" inline="true">
@@ -2858,7 +2946,7 @@
</block>
</statement>
</block>
- <block type="procedures_defnoreturn" id="8u`{W^33E#gAnZ}n#.-h" x="0" y="9074">
+ <block type="procedures_defnoreturn" id="8u`{W^33E#gAnZ}n#.-h" x="0" y="9172">
<mutation>
<arg name="client" varid="d2.J:01W*;j`8R0B1!GX" argid="_4Lef8L=}Do}$CNf.$X3"/>
<arg name="userdata" varid="3^jP4hL~~1UKs+hYG]M=" argid=".~Cx#%[dpU*oKQFZ*1}G"/>
@@ -3096,7 +3184,7 @@
</block>
</statement>
</block>
- <block type="procedures_defnoreturn" id="a]0!I}Zd7AawL:mU%,P1" x="0" y="9893">
+ <block type="procedures_defnoreturn" id="a]0!I}Zd7AawL:mU%,P1" x="0" y="9991">
<mutation>
<arg name="client" varid="d2.J:01W*;j`8R0B1!GX" argid="`n4M@;+Y^Ab44Gi.YYy-"/>
<arg name="userdata" varid="3^jP4hL~~1UKs+hYG]M=" argid="]gLOm[vhCT0;N+Cp[1?5"/>
diff --git a/lib/NodeRED.py b/lib/NodeRED.py
index 4804d34..f4e3e6b 100644
--- a/lib/NodeRED.py
+++ b/lib/NodeRED.py
@@ -231,6 +231,8 @@ def processReceivedMessage(topic, m_decode):
client.publish(topic='gtyp_Setup/w_Calib_ColorValue_White', payload=(get_calibvalue_list())[0], qos=2, retain=False)
client.publish(topic='gtyp_Setup/w_Calib_ColorValue_Red', payload=(get_calibvalue_list())[1], qos=2, retain=False)
client.publish(topic='gtyp_Setup/w_Calib_ColorValue_Blue', payload=(get_calibvalue_list())[2], qos=2, retain=False)
+ client.publish(topic='gtyp_Setup/w_Threshold_White_Red', payload=(get_thresh_list())[0], qos=2, retain=False)
+ client.publish(topic='gtyp_Setup/w_Threshold_Red_Blue', payload=(get_thresh_list())[1], qos=2, retain=False)
client.publish(topic='gtyp_SSC/w_Threshold_White_Red', payload=gtyp_SSC_w_Threshold_White_Red, qos=2, retain=False)
client.publish(topic='gtyp_SSC/w_Threshold_Red_Blue', payload=gtyp_SSC_w_Threshold_Red_Blue, qos=2, retain=False)
client.publish(topic='gtyp_SLD/w_Threshold_White_Red', payload=gtyp_SLD_w_Threshold_White_Red, qos=2, retain=False)
--
GitLab