From b97cfcfeb2b817623da5ea16adc60b00494c06f7 Mon Sep 17 00:00:00 2001
From: ft-Demo <fischertechnik-team@fischer.de>
Date: Wed, 7 Dec 2022 14:44:22 +0000
Subject: [PATCH] commit by robo pro coding
---
FactoryCalib.blockly | 34 +++++++++++++++++-----------------
FactoryCalib.py | 6 +++---
lib/HBW_NodeRED.blockly | 20 ++++++++++----------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/FactoryCalib.blockly b/FactoryCalib.blockly
index 2616f47..e7de43c 100644
--- a/FactoryCalib.blockly
+++ b/FactoryCalib.blockly
@@ -8,7 +8,7 @@
<field name="instance_name">txt_label_version</field>
<value name="value">
<shadow type="text" id="T9nyAyJIRL7l_Nn(S-rd">
- <field name="TEXT">Version 2022/12/07b</field>
+ <field name="TEXT">Version 2022/12/07c</field>
</shadow>
</value>
<next>
@@ -62,27 +62,27 @@
<block type="util_python" id="sL+kPF(Hir)D/jWJC*sD">
<field name="value">th0 = threading.Thread(target=init_SSC_PTU, args=(), daemon=True)&#10;th1 = threading.Thread(target=init_HBW, args=(), daemon=True)&#10;th2 = threading.Thread(target=init_VGR, args=(), daemon=True)&#10;th0.start()&#10;th1.start()&#10;th2.start()</field>
<next>
- <block type="import_function_noreturn" id="Ej2ZS8_`0nx#j=Ld4er.">
- <mutation parentId="*A(OQEg?]~%+S(TjuNW:"/>
- <field name="name">loadFileFactoryCalib</field>
- <data>*A(OQEg?]~%+S(TjuNW:</data>
+ <block type="util_thread" id="etqX=L0t.x_7Gv^0b5U,">
+ <field name="dropdown_event">2)S|Q)oZ/N[cbwDZy~z}</field>
<next>
- <block type="util_python" id="zp16I2(`eze{Y4$BFk{A">
- <field name="value">th0.join()&#10;th1.join()&#10;th2.join()</field>
+ <block type="util_thread" id="{yc__LanX27NtUTm3P*)">
+ <field name="dropdown_event">]$}!d~iPi$faCfYn-,02</field>
<next>
- <block type="import_function_noreturn" id="r*GLs}=Xdp(e$+6w?};6">
- <mutation parentId="$jNNx1Oeez9#x~eQYP}z"/>
- <field name="name">initMQTTLocal</field>
- <data>$jNNx1Oeez9#x~eQYP}z</data>
+ <block type="import_function_noreturn" id="Ej2ZS8_`0nx#j=Ld4er.">
+ <mutation parentId="*A(OQEg?]~%+S(TjuNW:"/>
+ <field name="name">loadFileFactoryCalib</field>
+ <data>*A(OQEg?]~%+S(TjuNW:</data>
<next>
- <block type="util_thread" id="($:VkQ#3?EHT|;iZ9W9u">
- <field name="dropdown_event">R4vMowGJ0I?IYs_!-IwU</field>
+ <block type="util_python" id="zp16I2(`eze{Y4$BFk{A">
+ <field name="value">th0.join()&#10;th1.join()&#10;th2.join()</field>
<next>
- <block type="util_thread" id="etqX=L0t.x_7Gv^0b5U,">
- <field name="dropdown_event">2)S|Q)oZ/N[cbwDZy~z}</field>
+ <block type="import_function_noreturn" id="r*GLs}=Xdp(e$+6w?};6">
+ <mutation parentId="$jNNx1Oeez9#x~eQYP}z"/>
+ <field name="name">initMQTTLocal</field>
+ <data>$jNNx1Oeez9#x~eQYP}z</data>
<next>
- <block type="util_thread" id="{yc__LanX27NtUTm3P*)">
- <field name="dropdown_event">]$}!d~iPi$faCfYn-,02</field>
+ <block type="util_thread" id="($:VkQ#3?EHT|;iZ9W9u">
+ <field name="dropdown_event">R4vMowGJ0I?IYs_!-IwU</field>
<next>
<block type="loop_endless" id="^hpJo7DFR.KJ9Xs2RAx,"/>
</next>
diff --git a/FactoryCalib.py b/FactoryCalib.py
index f6e5866..735f4b4 100644
--- a/FactoryCalib.py
+++ b/FactoryCalib.py
@@ -27,7 +27,7 @@ from lib.VGR_NodeRED import *
controller_name = None
-display.set_attr("txt_label_version.text", str('Version 2022/12/07b'))
+display.set_attr("txt_label_version.text", str('Version 2022/12/07c'))
controller_name = os.uname()[1]
display.set_attr("txt_label_message2.text", str('<b>http://{}.local:1880/ui</b>'.format(controller_name)))
initlib_log(5)
@@ -40,13 +40,13 @@ th2 = threading.Thread(target=init_VGR, args=(), daemon=True)
th0.start()
th1.start()
th2.start()
+threading.Thread(target=thread_DPS, daemon=True).start()
+threading.Thread(target=thread_SLD, daemon=True).start()
loadFileFactoryCalib()
th0.join()
th1.join()
th2.join()
initMQTTLocal()
threading.Thread(target=thread_MQTTLocal, daemon=True).start()
-threading.Thread(target=thread_DPS, daemon=True).start()
-threading.Thread(target=thread_SLD, daemon=True).start()
while True:
pass
diff --git a/lib/HBW_NodeRED.blockly b/lib/HBW_NodeRED.blockly
index 2c5b8da..f224467 100644
--- a/lib/HBW_NodeRED.blockly
+++ b/lib/HBW_NodeRED.blockly
@@ -20,7 +20,7 @@
<block type="util_python_imports" id="Y4ZD}Dns_oHErDFs7e+!" x="0" y="0">
<field name="value">#TXT FW 3.1.0: https://pypi.org/project/paho-mqtt/1.3.1/&#10;&#10;import paho.mqtt.client as mqtt&#10;import json&#10;from datetime import datetime&#10;import logging</field>
</block>
- <block type="procedures_defnoreturn" id="}I6}i4~W2r@:$%]d!jWG" x="0" y="206">
+ <block type="procedures_defnoreturn" id="}I6}i4~W2r@:$%]d!jWG" x="0" y="213">
<mutation>
<arg name="c" varid="C2~T0O1L[2W(C)`SXOAO" argid="8TCtm^79}dhkQZlY^WCh"/>
</mutation>
@@ -37,7 +37,7 @@
</block>
</statement>
</block>
- <block type="procedures_defnoreturn" id="B8U-Fpoyu+5B}G+lSat," x="0" y="343">
+ <block type="procedures_defnoreturn" id="B8U-Fpoyu+5B}G+lSat," x="0" y="353">
<mutation>
<arg name="topic" varid="ekl(.QY.*2rj0`]zO|]}" argid="g/-.P1PW![BOnU2r1U]9"/>
<arg name="value" varid=",yY0!)~#U?HcwSoN7,7Q" argid=")4BC*vM)#:mkCT_;6Ew*"/>
@@ -56,7 +56,7 @@
</block>
</statement>
</block>
- <block type="procedures_defnoreturn" id="-/E5iDuAi{oYq9zk:EO*" x="0" y="548">
+ <block type="procedures_defnoreturn" id="-/E5iDuAi{oYq9zk:EO*" x="0" y="563">
<field name="NAME">publish_abspos_HBW</field>
<statement name="STACK">
<block type="variables_set" id="j/T*3{i,75Bo_%@RBK[L">
@@ -257,7 +257,7 @@
</block>
</statement>
</block>
- <block type="procedures_defnoreturn" id="TTAG2gwuraJ[!#;j}]Es" x="0" y="1085">
+ <block type="procedures_defnoreturn" id="TTAG2gwuraJ[!#;j}]Es" x="0" y="1113">
<mutation>
<arg name="gtyp_Setup_x_Set_Pos_Activ" varid="Vi2yByi.9J~-4xUDT!]k" argid="O%+gsm(rrKayfbHpG01Z"/>
<arg name="gtyp_Setup_i_Pos_Selection" varid="#ZVIt[,H@%Ms3XJhPF7y" argid="x[AIE`3)Q!459!^5g81="/>
@@ -492,7 +492,7 @@
</block>
</statement>
</block>
- <block type="procedures_defreturn" id="Xt~{jWca)15Ej|]T-E=(" x="0" y="1838">
+ <block type="procedures_defreturn" id="Xt~{jWca)15Ej|]T-E=(" x="0" y="1884">
<mutation>
<arg name="topic" varid="ekl(.QY.*2rj0`]zO|]}" argid="^*-^X/|8$n#r-PN)*D+;"/>
<arg name="value" varid=",yY0!)~#U?HcwSoN7,7Q" argid="b{3UNUgYyhbL(0g,_ho%"/>
@@ -891,7 +891,7 @@
</block>
</value>
</block>
- <block type="procedures_defnoreturn" id="Kp~lL[zWDt(Su?%ZfRT!" x="0" y="2873">
+ <block type="procedures_defnoreturn" id="Kp~lL[zWDt(Su?%ZfRT!" x="0" y="2945">
<field name="NAME">publish_SetupPositionsAndOffsets_HBW</field>
<statement name="STACK">
<block type="util_python" id="N%oN;Tbf6X(d(Ph,RQn[" inline="true">
@@ -1365,7 +1365,7 @@
</block>
</statement>
</block>
- <block type="procedures_defnoreturn" id="*Y?X!?GI7$/Q:|/iLLB3" x="0" y="3964">
+ <block type="procedures_defnoreturn" id="*Y?X!?GI7$/Q:|/iLLB3" x="0" y="4062">
<mutation>
<arg name="name" varid="`rffN?$q!Z]ZzvoEOjSJ" argid="llO00D5;24Nt1ido(RqZ"/>
</mutation>
@@ -1509,7 +1509,7 @@
</block>
</statement>
</block>
- <block type="procedures_defnoreturn" id="{)L*vgB-uHws-X8w2#cj" x="0" y="4383">
+ <block type="procedures_defnoreturn" id="{)L*vgB-uHws-X8w2#cj" x="0" y="4491">
<mutation>
<arg name="name" varid="`rffN?$q!Z]ZzvoEOjSJ" argid="llO00D5;24Nt1ido(RqZ"/>
</mutation>
@@ -1653,7 +1653,7 @@
</block>
</statement>
</block>
- <block type="procedures_defreturn" id="?%Xl/`6R4^E@Qx8gsXDB" x="0" y="4802">
+ <block type="procedures_defreturn" id="?%Xl/`6R4^E@Qx8gsXDB" x="0" y="4920">
<mutation>
<arg name="gtyp_Setup_i_Pos_Selection" varid="#ZVIt[,H@%Ms3XJhPF7y" argid="q#AU!QR=+KwJMhb)/CqZ"/>
</mutation>
@@ -1803,7 +1803,7 @@
</block>
</value>
</block>
- <block type="procedures_defreturn" id="Z4F@czr3EeGVpNSmuC2T" x="0" y="5363">
+ <block type="procedures_defreturn" id="Z4F@czr3EeGVpNSmuC2T" x="0" y="5495">
<mutation>
<arg name="gtyp_Setup_i_Pos_Selection" varid="#ZVIt[,H@%Ms3XJhPF7y" argid="7_!wtmfixFo9AIFdNHnV"/>
</mutation>
--
GitLab