From 29b0e9d6ecd7660308113c7ea3e2505faac641f5 Mon Sep 17 00:00:00 2001
From: ft-Demo <fischertechnik-team@fischer.de>
Date: Fri, 11 Nov 2022 16:16:10 +0000
Subject: [PATCH] commit by robo pro coding
---
FactoryCalib.blockly | 51 +++++++++++++++++---------------------------
FactoryCalib.py | 12 ++++++++---
lib/display.qml | 4 ++--
lib/display.xml | 2 +-
4 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/FactoryCalib.blockly b/FactoryCalib.blockly
index b045b5c..d3131ac 100644
--- a/FactoryCalib.blockly
+++ b/FactoryCalib.blockly
@@ -2,7 +2,7 @@
<variables>
<variable id="o7M2j8lcbSda!;+?VQbz">controller_name</variable>
</variables>
- <block type="start_block" id="5r8Hf)nzFKt,AzMq]4)P" deletable="false" x="-100" y="-22">
+ <block type="start_block" id="5r8Hf)nzFKt,AzMq]4)P" deletable="false" x="-181" y="-62">
<statement name="statement">
<block type="display_set_label_text" id=":7]Mx6b@!j4P*7jD}iz[">
<field name="instance_name">txt_label_version</field>
@@ -59,43 +59,32 @@
<field name="name">initlib_Axes2Ref</field>
<data>tx,0:0uT;t*U[h*1X@`a</data>
<next>
- <block type="import_function_noreturn" id="6*ZAWTtm49n=9Q~Y.bVC">
- <mutation parentId="m$j^_%ViQp|!(304{wJR"/>
- <field name="name">init_VGR</field>
- <data>m$j^_%ViQp|!(304{wJR</data>
+ <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="HIwLV]R%AsHX[Ri5^lQ[">
- <mutation parentId="MaY=lcUPdn@Uj4uuw7[N"/>
- <field name="name">init_HBW</field>
- <data>MaY=lcUPdn@Uj4uuw7[N</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="import_function_noreturn" id="9px!ck0pJ.Dybl@lE|24">
- <mutation parentId="!*d[^#5M)?7Uxe|zk^K}"/>
- <field name="name">init_SSC_PTU</field>
- <data>!*d[^#5M)?7Uxe|zk^K}</data>
+ <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="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="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="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="util_thread" id="($:VkQ#3?EHT|;iZ9W9u">
+ <field name="dropdown_event">R4vMowGJ0I?IYs_!-IwU</field>
<next>
- <block type="util_thread" id="($:VkQ#3?EHT|;iZ9W9u">
- <field name="dropdown_event">R4vMowGJ0I?IYs_!-IwU</field>
+ <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_thread" id="etqX=L0t.x_7Gv^0b5U,">
- <field name="dropdown_event">2)S|Q)oZ/N[cbwDZy~z}</field>
+ <block type="util_thread" id="{yc__LanX27NtUTm3P*)">
+ <field name="dropdown_event">]$}!d~iPi$faCfYn-,02</field>
<next>
- <block type="util_thread" id="{yc__LanX27NtUTm3P*)">
- <field name="dropdown_event">]$}!d~iPi$faCfYn-,02</field>
- <next>
- <block type="loop_endless" id="^hpJo7DFR.KJ9Xs2RAx,"/>
- </next>
- </block>
+ <block type="loop_endless" id="^hpJo7DFR.KJ9Xs2RAx,"/>
</next>
</block>
</next>
diff --git a/FactoryCalib.py b/FactoryCalib.py
index dd13f29..0604d6a 100644
--- a/FactoryCalib.py
+++ b/FactoryCalib.py
@@ -34,10 +34,16 @@ initlib_log(5)
threading.Thread(target=thread_lights, daemon=True).start()
initlib_Axes1Ref()
initlib_Axes2Ref()
-init_VGR()
-init_HBW()
-init_SSC_PTU()
+th0 = threading.Thread(target=init_SSC_PTU, args=(), daemon=True)
+th1 = threading.Thread(target=init_HBW, args=(), daemon=True)
+th2 = threading.Thread(target=init_VGR, args=(), daemon=True)
+th0.start()
+th1.start()
+th2.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()
diff --git a/lib/display.qml b/lib/display.qml
index 3036bba..5906db4 100644
--- a/lib/display.qml
+++ b/lib/display.qml
@@ -75,9 +75,9 @@ TXTWindow {
text: "http://[TXT40-IP]:1880/ui"
font.pixelSize: 16
elide: Text.ElideRight
- x: 5
+ x: 40
y: 70
- width: 230
+ width: 160
height: 15
}
}
diff --git a/lib/display.xml b/lib/display.xml
index 3e1a74e..9910d80 100644
--- a/lib/display.xml
+++ b/lib/display.xml
@@ -1 +1 @@
-<xml type="display" version="2"><item id="4" class="TXTLabel"><name>txt_label_message1</name><text>Open dashboard in WEB browser:</text><geometry><x>5</x><y>50</y><width>230</width><height>15</height></geometry></item><item id="40" class="StatusIndicator"><name>txt_status_indicator</name><color>#FF0000</color><active>false</active><geometry><x>215</x><y>5</y><width>20</width><height>20</height></geometry></item><item id="42" class="TXTLabel"><name>txt_label_model</name><text>Training Factory Industry 4.0 9V V.2</text><geometry><x>5</x><y>5</y><width>210</width><height>15</height></geometry></item><item id="43" class="TXTButton"><name>txt_button_save</name><enabled>true</enabled><text><h2>SAVE calibration</h2></text><geometry><x>40</x><y>90</y><width>160</width><height>50</height></geometry></item><item id="45" class="TXTButton"><name>txt_button_reset</name><enabled>true</enabled><text><h4><font color='#ff0000'>RESET to factory defaults</font></h4></text><geometry><x>40</x><y>160</y><width>160</width><height>30</height></geometry></item><item id="46" class="TXTLabel"><name>txt_label_version</name><text/><geometry><x>5</x><y>20</y><width>210</width><height>15</height></geometry></item><item id="47" class="TXTLabel"><name>txt_label_message2</name><text>http://[TXT40-IP]:1880/ui</text><geometry><x>5</x><y>70</y><width>230</width><height>15</height></geometry></item></xml>
\ No newline at end of file
+<xml type="display" version="2"><item id="4" class="TXTLabel"><name>txt_label_message1</name><text>Open dashboard in WEB browser:</text><geometry><x>5</x><y>50</y><width>230</width><height>15</height></geometry></item><item id="40" class="StatusIndicator"><name>txt_status_indicator</name><color>#FF0000</color><active>false</active><geometry><x>215</x><y>5</y><width>20</width><height>20</height></geometry></item><item id="42" class="TXTLabel"><name>txt_label_model</name><text>Training Factory Industry 4.0 9V V.2</text><geometry><x>5</x><y>5</y><width>210</width><height>15</height></geometry></item><item id="43" class="TXTButton"><name>txt_button_save</name><enabled>true</enabled><text><h2>SAVE calibration</h2></text><geometry><x>40</x><y>90</y><width>160</width><height>50</height></geometry></item><item id="45" class="TXTButton"><name>txt_button_reset</name><enabled>true</enabled><text><h4><font color='#ff0000'>RESET to factory defaults</font></h4></text><geometry><x>40</x><y>160</y><width>160</width><height>30</height></geometry></item><item id="46" class="TXTLabel"><name>txt_label_version</name><text/><geometry><x>5</x><y>20</y><width>210</width><height>15</height></geometry></item><item id="47" class="TXTLabel"><name>txt_label_message2</name><text>http://[TXT40-IP]:1880/ui</text><geometry><x>40</x><y>70</y><width>160</width><height>15</height></geometry></item></xml>
\ No newline at end of file
--
GitLab