diff --git a/lib/NodeRED.blockly b/lib/NodeRED.blockly
index b7e6a85e50ec04ba8c280f7276c8a434d6b9a461..6efa6aa5ec567f51464364ccbf3e7f6211a35989 100644
--- a/lib/NodeRED.blockly
+++ b/lib/NodeRED.blockly
@@ -1124,10 +1124,29 @@
</shadow>
</value>
<next>
- <block type="import_function_noreturn" id="X}$nC/,(jef7FiXlsu~W">
- <mutation parentId="g=6%Ka9Y1qYH|_c:bu9]"/>
- <field name="name">startSLD</field>
- <data>g=6%Ka9Y1qYH|_c:bu9]</data>
+ <block type="controls_if" id="[1sjQ@hfa|v`((_J=[WF">
+ <value name="IF0">
+ <block type="logic_compare" id="s:)ie8tY{GD%}`V|t4HU">
+ <field name="OP">EQ</field>
+ <value name="A">
+ <block type="variables_get" id="tX1,#XEV`g!=WImHsTlB">
+ <field name="VAR" id=")XfA{xXx7sN)MA=qSY=H">gtyp_Setup_i_Color_Sensor_Selection</field>
+ </block>
+ </value>
+ <value name="B">
+ <block type="math_number" id="8O[vJ^6N/J^oQ+NXH5j|">
+ <field name="NUM">2</field>
+ </block>
+ </value>
+ </block>
+ </value>
+ <statement name="DO0">
+ <block type="import_function_noreturn" id="X}$nC/,(jef7FiXlsu~W">
+ <mutation parentId="g=6%Ka9Y1qYH|_c:bu9]"/>
+ <field name="name">startSLD</field>
+ <data>g=6%Ka9Y1qYH|_c:bu9]</data>
+ </block>
+ </statement>
</block>
</next>
</block>
@@ -1207,10 +1226,29 @@
</shadow>
</value>
<next>
- <block type="import_function_noreturn" id="u1)G_=d%!+QY7JCi149-">
- <mutation parentId="g=6%Ka9Y1qYH|_c:bu9]"/>
- <field name="name">startSLD</field>
- <data>g=6%Ka9Y1qYH|_c:bu9]</data>
+ <block type="controls_if" id="E,]1=vy_z~4p=:d_=H[w">
+ <value name="IF0">
+ <block type="logic_compare" id="8#[/=EF%~6T^!aR9?Ag=">
+ <field name="OP">EQ</field>
+ <value name="A">
+ <block type="variables_get" id="a.3IecO`,L$GgSo~mP[b">
+ <field name="VAR" id=")XfA{xXx7sN)MA=qSY=H">gtyp_Setup_i_Color_Sensor_Selection</field>
+ </block>
+ </value>
+ <value name="B">
+ <block type="math_number" id="qIKrHEGOgZD7WjbSdP|,">
+ <field name="NUM">2</field>
+ </block>
+ </value>
+ </block>
+ </value>
+ <statement name="DO0">
+ <block type="import_function_noreturn" id="x!cJorvqTGh=?U$|Je87">
+ <mutation parentId="g=6%Ka9Y1qYH|_c:bu9]"/>
+ <field name="name">startSLD</field>
+ <data>g=6%Ka9Y1qYH|_c:bu9]</data>
+ </block>
+ </statement>
</block>
</next>
</block>
@@ -1290,10 +1328,29 @@
</shadow>
</value>
<next>
- <block type="import_function_noreturn" id="}MYfC9)%|HWIiwZveWkf">
- <mutation parentId="g=6%Ka9Y1qYH|_c:bu9]"/>
- <field name="name">startSLD</field>
- <data>g=6%Ka9Y1qYH|_c:bu9]</data>
+ <block type="controls_if" id="UtJhg5KZV0V$pTWtb({I">
+ <value name="IF0">
+ <block type="logic_compare" id="jN{]06YWJTJWH`49Cgp^">
+ <field name="OP">EQ</field>
+ <value name="A">
+ <block type="variables_get" id="vsXR:sSs(@]VKTP52%HO">
+ <field name="VAR" id=")XfA{xXx7sN)MA=qSY=H">gtyp_Setup_i_Color_Sensor_Selection</field>
+ </block>
+ </value>
+ <value name="B">
+ <block type="math_number" id="{q)*XO{1wXSq(S3b-TUx">
+ <field name="NUM">2</field>
+ </block>
+ </value>
+ </block>
+ </value>
+ <statement name="DO0">
+ <block type="import_function_noreturn" id="?]y*@!7B@9fvyyXxelz]">
+ <mutation parentId="g=6%Ka9Y1qYH|_c:bu9]"/>
+ <field name="name">startSLD</field>
+ <data>g=6%Ka9Y1qYH|_c:bu9]</data>
+ </block>
+ </statement>
</block>
</next>
</block>
@@ -1447,65 +1504,65 @@
<block type="util_python" id="soiv=1GYGk1x%q@maBVQ" inline="true">
<field name="value">logging.debug('1')</field>
<next>
- <block type="variables_set" id="D:=f2wh[w8ZBWyd[g(7}">
- <field name="VAR" id="-XOZ;@M!{qgTA%xgUef-">gtyp_SSC_w_Threshold_White_Red</field>
- <value name="VALUE">
- <block type="lists_getIndex" id="wdG`|Kmg=qcF]7y]s%/Y">
- <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="nkoTt5*j.7AKXq.ht:mP">
- <mutation parentId="Q9p7dhe-|x*[t`L^}||B"/>
- <field name="name">get_calib_data_DPS</field>
- <data>Q9p7dhe-|x*[t`L^}||B</data>
+ <block type="import_function_noreturn" id="B@Qm+h/+Vg/2yok(b}$5" inline="true">
+ <mutation parentId=":J%zX-c=Y4mZAR)aLyUn"/>
+ <field name="name">set_calib_data_DPS</field>
+ <data>:J%zX-c=Y4mZAR)aLyUn</data>
+ <value name="_data">
+ <block type="lists_create_with" id="T)?m41K[Oa3HdKukA_4$">
+ <mutation items="2"/>
+ <value name="ADD0">
+ <block type="variables_get" id="=w5Oybwf]8jKu5ITA-:0">
+ <field name="VAR" id="aQ:d%c!ilWYQz|GZ5N0~">gtyp_Setup_w_Threshold_White_Red</field>
</block>
</value>
- <value name="AT">
- <block type="math_number" id="{2;D6h`S7C3wQ-4YG}9K">
- <field name="NUM">1</field>
+ <value name="ADD1">
+ <block type="variables_get" id="vVmo`kG]%#C$#C|I+$qV">
+ <field name="VAR" id="A{`)A3~(6e.5r^y~X;S1">gtyp_Setup_w_Threshold_Red_Blue</field>
</block>
</value>
</block>
</value>
<next>
- <block type="variables_set" id="#qTi4fJvDN/gHpGR,QZL">
- <field name="VAR" id="TZ7zEdrg=Q,vG9XutiCF">gtyp_SSC_w_Threshold_Red_Blue</field>
+ <block type="variables_set" id="D:=f2wh[w8ZBWyd[g(7}">
+ <field name="VAR" id="-XOZ;@M!{qgTA%xgUef-">gtyp_SSC_w_Threshold_White_Red</field>
<value name="VALUE">
- <block type="lists_getIndex" id="XHjGd8WI?lk^D`I(D#b=">
+ <block type="lists_getIndex" id="wdG`|Kmg=qcF]7y]s%/Y">
<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="sY?[vd+tT0Nu7cz+s-nI">
+ <block type="import_function_return" id="nkoTt5*j.7AKXq.ht:mP">
<mutation parentId="Q9p7dhe-|x*[t`L^}||B"/>
<field name="name">get_calib_data_DPS</field>
<data>Q9p7dhe-|x*[t`L^}||B</data>
</block>
</value>
<value name="AT">
- <block type="math_number" id="0*d]I4B_:$fDgz,^vuWz">
- <field name="NUM">2</field>
+ <block type="math_number" id="{2;D6h`S7C3wQ-4YG}9K">
+ <field name="NUM">1</field>
</block>
</value>
</block>
</value>
<next>
- <block type="import_function_noreturn" id="Gk9cR?Lk;JuWjdFN6g21" inline="true">
- <mutation parentId=":J%zX-c=Y4mZAR)aLyUn"/>
- <field name="name">set_calib_data_DPS</field>
- <data>:J%zX-c=Y4mZAR)aLyUn</data>
- <value name="_data">
- <block type="lists_create_with" id="Xocv8$Q*^`iZ8_evooz$">
- <mutation items="2"/>
- <value name="ADD0">
- <block type="variables_get" id="B~w0/Kt$OccNl)@ly!xg">
- <field name="VAR" id="-XOZ;@M!{qgTA%xgUef-">gtyp_SSC_w_Threshold_White_Red</field>
+ <block type="variables_set" id="#qTi4fJvDN/gHpGR,QZL">
+ <field name="VAR" id="TZ7zEdrg=Q,vG9XutiCF">gtyp_SSC_w_Threshold_Red_Blue</field>
+ <value name="VALUE">
+ <block type="lists_getIndex" id="XHjGd8WI?lk^D`I(D#b=">
+ <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="sY?[vd+tT0Nu7cz+s-nI">
+ <mutation parentId="Q9p7dhe-|x*[t`L^}||B"/>
+ <field name="name">get_calib_data_DPS</field>
+ <data>Q9p7dhe-|x*[t`L^}||B</data>
</block>
</value>
- <value name="ADD1">
- <block type="variables_get" id="0r9m2Pv0tVeq~+`ES0JB">
- <field name="VAR" id="TZ7zEdrg=Q,vG9XutiCF">gtyp_SSC_w_Threshold_Red_Blue</field>
+ <value name="AT">
+ <block type="math_number" id="0*d]I4B_:$fDgz,^vuWz">
+ <field name="NUM">2</field>
</block>
</value>
</block>
@@ -1597,65 +1654,65 @@
<block type="util_python" id="x0s]$+:+=z@PJ!naMKFJ" inline="true">
<field name="value">logging.debug('2')</field>
<next>
- <block type="variables_set" id="V$q[G}}_EqKbXxUdXZ?y">
- <field name="VAR" id="x43W3)orCB:l1qw2dLN`">gtyp_SLD_w_Threshold_White_Red</field>
- <value name="VALUE">
- <block type="lists_getIndex" id="-dw.:I!+I-1Z}iqg+9wq">
- <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="BynbVL(FDhK[^6E+Y]|%">
- <mutation parentId="b|1;0mU=wNNO2Ry{f6,Z"/>
- <field name="name">get_calib_data_SLD</field>
- <data>b|1;0mU=wNNO2Ry{f6,Z</data>
+ <block type="import_function_noreturn" id="gGL[N~}5iQK:RLYAUGQ/" inline="true">
+ <mutation parentId="3Qf0~|~$oG8z5tP{6Km;"/>
+ <field name="name">set_calib_data_SLD</field>
+ <data>3Qf0~|~$oG8z5tP{6Km;</data>
+ <value name="_data">
+ <block type="lists_create_with" id="W=Q%FvKye93rJd|SO;tO">
+ <mutation items="2"/>
+ <value name="ADD0">
+ <block type="variables_get" id="89bSU$mLneHpYETL7zw6">
+ <field name="VAR" id="aQ:d%c!ilWYQz|GZ5N0~">gtyp_Setup_w_Threshold_White_Red</field>
</block>
</value>
- <value name="AT">
- <block type="math_number" id="xKD0g;L20Gs#1K{x-1;t">
- <field name="NUM">1</field>
+ <value name="ADD1">
+ <block type="variables_get" id="EQ}5GfAr2N-_f?Hfb*q7">
+ <field name="VAR" id="A{`)A3~(6e.5r^y~X;S1">gtyp_Setup_w_Threshold_Red_Blue</field>
</block>
</value>
</block>
</value>
<next>
- <block type="variables_set" id="A;mMGOnf}=G4)(mUTBXB">
- <field name="VAR" id="z}xxgCaN^$Fn.vEFUV}F">gtyp_SLD_w_Threshold_Red_Blue</field>
+ <block type="variables_set" id="V$q[G}}_EqKbXxUdXZ?y">
+ <field name="VAR" id="x43W3)orCB:l1qw2dLN`">gtyp_SLD_w_Threshold_White_Red</field>
<value name="VALUE">
- <block type="lists_getIndex" id="l8(^@0LFn@VRt!9bbB@y">
+ <block type="lists_getIndex" id="-dw.:I!+I-1Z}iqg+9wq">
<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="[.lX-%{ZA`0XE/8@wh;6">
+ <block type="import_function_return" id="BynbVL(FDhK[^6E+Y]|%">
<mutation parentId="b|1;0mU=wNNO2Ry{f6,Z"/>
<field name="name">get_calib_data_SLD</field>
<data>b|1;0mU=wNNO2Ry{f6,Z</data>
</block>
</value>
<value name="AT">
- <block type="math_number" id="#RosQS*Pqqky0x=BGHqe">
- <field name="NUM">2</field>
+ <block type="math_number" id="xKD0g;L20Gs#1K{x-1;t">
+ <field name="NUM">1</field>
</block>
</value>
</block>
</value>
<next>
- <block type="import_function_noreturn" id="Twr{}nGXl9MjW6,@,f^6" inline="true">
- <mutation parentId="3Qf0~|~$oG8z5tP{6Km;"/>
- <field name="name">set_calib_data_SLD</field>
- <data>3Qf0~|~$oG8z5tP{6Km;</data>
- <value name="_data">
- <block type="lists_create_with" id="Ar*9SF:w!Zi*LJb+vR$a">
- <mutation items="2"/>
- <value name="ADD0">
- <block type="variables_get" id="5LE(f|rMXJdX?@qBB}g|">
- <field name="VAR" id="x43W3)orCB:l1qw2dLN`">gtyp_SLD_w_Threshold_White_Red</field>
+ <block type="variables_set" id="A;mMGOnf}=G4)(mUTBXB">
+ <field name="VAR" id="z}xxgCaN^$Fn.vEFUV}F">gtyp_SLD_w_Threshold_Red_Blue</field>
+ <value name="VALUE">
+ <block type="lists_getIndex" id="l8(^@0LFn@VRt!9bbB@y">
+ <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="[.lX-%{ZA`0XE/8@wh;6">
+ <mutation parentId="b|1;0mU=wNNO2Ry{f6,Z"/>
+ <field name="name">get_calib_data_SLD</field>
+ <data>b|1;0mU=wNNO2Ry{f6,Z</data>
</block>
</value>
- <value name="ADD1">
- <block type="variables_get" id="ne!!9tj/;#5{p)T|dNmP">
- <field name="VAR" id="z}xxgCaN^$Fn.vEFUV}F">gtyp_SLD_w_Threshold_Red_Blue</field>
+ <value name="AT">
+ <block type="math_number" id="#RosQS*Pqqky0x=BGHqe">
+ <field name="NUM">2</field>
</block>
</value>
</block>
diff --git a/lib/NodeRED.py b/lib/NodeRED.py
index 6a7c0f19b3bb2dbcec42988f201f857dadd5007b..df9c30bb3ca1ea1782b2b595839f593fa65f4618 100644
--- a/lib/NodeRED.py
+++ b/lib/NodeRED.py
@@ -147,17 +147,20 @@ def processReceivedMessage(topic, m_decode):
logging.debug('blue')
set_calibvalue_blue(gtyp_Setup_w_Actual_ColorValue)
client.publish(topic='gtyp_Setup/w_Calib_ColorValue_Blue', payload=(get_calibvalue_list())[2], qos=2, retain=False)
- startSLD()
+ if gtyp_Setup_i_Color_Sensor_Selection == 2:
+ startSLD()
elif topic == 'gtyp_Setup/x_Set_Calib_Value_Color_Red':
logging.debug('red')
set_calibvalue_red(gtyp_Setup_w_Actual_ColorValue)
client.publish(topic='gtyp_Setup/w_Calib_ColorValue_Red', payload=(get_calibvalue_list())[1], qos=2, retain=False)
- startSLD()
+ if gtyp_Setup_i_Color_Sensor_Selection == 2:
+ startSLD()
elif topic == 'gtyp_Setup/x_Set_Calib_Value_Color_White':
logging.debug('white')
set_calibvalue_white(gtyp_Setup_w_Actual_ColorValue)
client.publish(topic='gtyp_Setup/w_Calib_ColorValue_White', payload=(get_calibvalue_list())[0], qos=2, retain=False)
- startSLD()
+ if gtyp_Setup_i_Color_Sensor_Selection == 2:
+ startSLD()
elif topic == 'gtyp_Setup/x_Calculate_Value_Color':
logging.debug('calculate')
calculate_thresh()
@@ -167,16 +170,16 @@ def processReceivedMessage(topic, m_decode):
client.publish(topic='gtyp_Setup/w_Threshold_Red_Blue', payload=gtyp_Setup_w_Threshold_Red_Blue, qos=2, retain=False)
if gtyp_Setup_i_Color_Sensor_Selection == 1:
logging.debug('1')
+ set_calib_data_DPS([gtyp_Setup_w_Threshold_White_Red, gtyp_Setup_w_Threshold_Red_Blue])
gtyp_SSC_w_Threshold_White_Red = (get_calib_data_DPS())[0]
gtyp_SSC_w_Threshold_Red_Blue = (get_calib_data_DPS())[1]
- set_calib_data_DPS([gtyp_SSC_w_Threshold_White_Red, gtyp_SSC_w_Threshold_Red_Blue])
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)
elif gtyp_Setup_i_Color_Sensor_Selection == 2:
logging.debug('2')
+ set_calib_data_SLD([gtyp_Setup_w_Threshold_White_Red, gtyp_Setup_w_Threshold_Red_Blue])
gtyp_SLD_w_Threshold_White_Red = (get_calib_data_SLD())[0]
gtyp_SLD_w_Threshold_Red_Blue = (get_calib_data_SLD())[1]
- set_calib_data_SLD([gtyp_SLD_w_Threshold_White_Red, gtyp_SLD_w_Threshold_Red_Blue])
client.publish(topic='gtyp_SLD/w_Threshold_White_Red', payload=gtyp_SLD_w_Threshold_White_Red, qos=2, retain=False)
client.publish(topic='gtyp_SLD/w_Threshold_Red_Blue', payload=gtyp_SLD_w_Threshold_Red_Blue, qos=2, retain=False)
else: