Skip to content
Snippets Groups Projects
Commit f81d334b authored by ft-Demo's avatar ft-Demo
Browse files

commit by robo pro coding

parent 35b2ddc7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/Wifi_Monitoring.blockly
+ 32
− 99
View file @ f81d334b
......@@ -99,16 +99,6 @@
</value>
</block>
</value>
<statement name="DO0">
<block type="display_set_status_indicator_active" id="%VY(}d`Nt)-g+u$_-o0r">
<field name="instance_name">txt_status_indicator_scan</field>
<value name="value">
<shadow type="logic_boolean" id="b|nqF]z~{Y]xNAjj61z;">
<field name="BOOL">TRUE</field>
</shadow>
</value>
</block>
</statement>
<value name="IF1">
<block type="logic_compare" id="zueU%sS^[,v-lo*+SsQj">
<field name="OP">GT</field>
......@@ -134,28 +124,17 @@
</value>
</block>
</value>
<statement name="DO1">
<block type="display_set_status_indicator_active" id="8SM1d7c?*l6OE#DrT-HV">
<field name="instance_name">txt_status_indicator_scan</field>
<value name="value">
<shadow type="logic_boolean" id="W]a/SKv;)dGv4-aTt`gb">
<field name="BOOL">FALSE</field>
</shadow>
</value>
</block>
</statement>
<statement name="ELSE">
<block type="display_set_label_text" id="$eo?NH6XDnQIj[{B6(wO">
<field name="instance_name">txt_label1</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
<block type="text_print" id="0`-tIfFLuUJ@x$`]PHmM">
<value name="TEXT">
<shadow type="text" id="(:C?%aepC0t!8YhMD[9l">
<field name="TEXT"/>
</shadow>
<block type="text_format" id="J_7/U{(UL+EZfVE`$mD$">
<mutation items="1"/>
<mutation items="3"/>
<value name="value">
<shadow type="text" id="Q[QvGX%tB4Z0Xls)NzYr">
<field name="TEXT">&lt;h3&gt;{}&lt;/h3&gt;</field>
<field name="TEXT">{} {} {}</field>
</shadow>
</value>
<value name="ADD0">
......@@ -163,54 +142,18 @@
<field name="VAR" id=")4%R)^6HEgRh*8J)Go:!">ts</field>
</block>
</value>
</block>
</value>
<next>
<block type="display_set_label_text" id=";JBX?$F%fbRktLzNOE{j">
<field name="instance_name">txt_label2</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
</shadow>
<block type="text_format" id="ye6_rK]O!E$M$``QEx5D">
<mutation items="1"/>
<value name="value">
<shadow type="text" id="7k?yDyvqQk)?c4S-xx0r">
<field name="TEXT">&lt;h3&gt;{}&lt;/h3&gt;</field>
</shadow>
</value>
<value name="ADD0">
<block type="variables_get" id="V|jn}TP=SUeFOD!N.d?b">
<field name="VAR" id="?GJVy;4pD5];dfoJ=,f!">msg</field>
</block>
</value>
<value name="ADD1">
<block type="variables_get" id="V|jn}TP=SUeFOD!N.d?b">
<field name="VAR" id="?GJVy;4pD5];dfoJ=,f!">msg</field>
</block>
</value>
<next>
<block type="display_set_label_text" id="62omc[(pgB=R/v62|4O0">
<field name="instance_name">txt_label3</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
</shadow>
<block type="text_format" id="lDa+_m*Qh]{ad?[a1gbE">
<mutation items="1"/>
<value name="value">
<shadow type="text" id="`,z/kIUrcvGmf:XvHz).">
<field name="TEXT">&lt;h3&gt;{}&lt;/h3&gt;</field>
</shadow>
</value>
<value name="ADD0">
<block type="variables_get" id="Kug|oz2A[2?eiJ%lWmJ8">
<field name="VAR" id="=fqIIoF=m$};`!h/0Sv#">args</field>
</block>
</value>
</block>
</value>
<value name="ADD2">
<block type="variables_get" id="Kug|oz2A[2?eiJ%lWmJ8">
<field name="VAR" id="=fqIIoF=m$};`!h/0Sv#">args</field>
</block>
</next>
</value>
</block>
</next>
</value>
</block>
</statement>
</block>
......@@ -234,7 +177,7 @@
</block>
</statement>
</block>
<block type="procedures_defnoreturn" id="u[e:sn/w|saxF@%O5LLG" x="0" y="1243">
<block type="procedures_defnoreturn" id="u[e:sn/w|saxF@%O5LLG" x="0" y="1167">
<field name="NAME">thread_iw_link</field>
<statement name="STACK">
<block type="loop_endless" id="Hxn,n?r(a%eKmDzu@YHw">
......@@ -276,7 +219,7 @@
</value>
<statement name="DO0">
<block type="display_set_status_indicator_active" id="Q6B{DZbF`I}?tmqlDx?]">
<field name="instance_name">txt_status_indicator_connected</field>
<field name="instance_name">txt_status_indicator_wifi</field>
<value name="value">
<shadow type="logic_boolean" id="JF{K~=F*m_dH_*PXAi:7">
<field name="BOOL">TRUE</field>
......@@ -311,7 +254,7 @@
</value>
<statement name="DO1">
<block type="display_set_status_indicator_active" id=".JKqdUOWI1Sh7hCw`vw`">
<field name="instance_name">txt_status_indicator_connected</field>
<field name="instance_name">txt_status_indicator_wifi</field>
<value name="value">
<shadow type="logic_boolean" id="PNvs=IWZLXoYFH-A]TuT">
<field name="BOOL">FALSE</field>
......@@ -319,7 +262,7 @@
</value>
<next>
<block type="display_set_label_text" id="$fr}k^uY3RYE2_ltRkvG">
<field name="instance_name">txt_label_signal</field>
<field name="instance_name">txt_label_message</field>
<value name="value">
<shadow type="text" id="~uI.Mqh{c3yMk.gbEiux">
<field name="TEXT"/>
......@@ -327,7 +270,7 @@
</value>
<next>
<block type="display_set_label_text" id="**TRzMy`|MB]`ePJ{U`?">
<field name="instance_name">txt_label_signal_text</field>
<field name="instance_name">txt_label_message2</field>
<value name="value">
<shadow type="text" id="XMJKc,8]z$uLb,K))Q2]">
<field name="TEXT"/>
......@@ -335,22 +278,12 @@
</value>
<next>
<block type="display_set_label_text" id="ZZVBu_aVm*zo!0zy1i=`">
<field name="instance_name">txt_label_ssid_text</field>
<field name="instance_name">txt_label_message3</field>
<value name="value">
<shadow type="text" id="lEIU6#g~-Sq`OOIjCgig">
<field name="TEXT"/>
</shadow>
</value>
<next>
<block type="display_set_label_text" id="dtsUVK^Tcj%ug]eELdRz">
<field name="instance_name">txt_label_bitrate_text</field>
<value name="value">
<shadow type="text" id="6xmmk[D)KQdQrz6UyC}=">
<field name="TEXT"/>
</shadow>
</value>
</block>
</next>
</block>
</next>
</block>
......@@ -389,7 +322,7 @@
<field name="value">#-30 dBm Perfect&amp;#10;#-50 dBm Excellent&amp;#10;#-60 dBm Very Good&amp;#10;#-67 dBm Good&amp;#10;#-70 dBm OK&amp;#10;#-80 dBm Unreliable&amp;#10;#-90 dBm Unusable&amp;#10;signal_num = int(line_link.split()[1])</field>
<next>
<block type="display_set_label_text" id="W|]7bHsscd-g`FXOUQy(">
<field name="instance_name">txt_label_signal</field>
<field name="instance_name">txt_label_message</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -428,7 +361,7 @@
</value>
<statement name="DO0">
<block type="display_set_label_text" id="jV@hnYU4)vd$n1c`QYQ#">
<field name="instance_name">txt_label_signal_text</field>
<field name="instance_name">txt_label_message</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -456,7 +389,7 @@
</value>
<statement name="DO1">
<block type="display_set_label_text" id=".bizw]1^(tbxy~di*Jcn">
<field name="instance_name">txt_label_signal_text</field>
<field name="instance_name">txt_label_message</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -484,7 +417,7 @@
</value>
<statement name="DO2">
<block type="display_set_label_text" id="~sjn]l/m8;b))(^|pf}n">
<field name="instance_name">txt_label_signal_text</field>
<field name="instance_name">txt_label_message</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -512,7 +445,7 @@
</value>
<statement name="DO3">
<block type="display_set_label_text" id="qLVIYw,fek2)+`3OQwed">
<field name="instance_name">txt_label_signal_text</field>
<field name="instance_name">txt_label_message</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -540,7 +473,7 @@
</value>
<statement name="DO4">
<block type="display_set_label_text" id="_861U|ov6ADoABs2ad?4">
<field name="instance_name">txt_label_signal_text</field>
<field name="instance_name">txt_label_message</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -568,7 +501,7 @@
</value>
<statement name="DO5">
<block type="display_set_label_text" id="9sP[H?WpKM^v9@.GLch1">
<field name="instance_name">txt_label_signal_text</field>
<field name="instance_name">txt_label_message</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -581,7 +514,7 @@
</statement>
<statement name="ELSE">
<block type="display_set_label_text" id=":vZKdNL*ESOj!p(-sdxE">
<field name="instance_name">txt_label_signal_text</field>
<field name="instance_name">txt_label_message</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -628,7 +561,7 @@
<field name="value">signal_ssid = str(line_link.split(":")[1]).strip()</field>
<next>
<block type="display_set_label_text" id="jd!-K2[CcQ{zVio/qyyJ">
<field name="instance_name">txt_label_ssid_text</field>
<field name="instance_name">txt_label_message2</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -681,7 +614,7 @@
<field name="value">signal_bitrate = str(line_link.split(":")[1]).strip()</field>
<next>
<block type="display_set_label_text" id="djD8E?GoUH={;TDZtRhU">
<field name="instance_name">txt_label_bitrate_text</field>
<field name="instance_name">txt_label_message3</field>
<value name="value">
<shadow type="text">
<field name="TEXT">abc</field>
......@@ -725,7 +658,7 @@
</block>
</statement>
</block>
<block type="procedures_defnoreturn" id="tyYSS+/-fb4qTy2.D$TM" x="0" y="3110">
<block type="procedures_defnoreturn" id="tyYSS+/-fb4qTy2.D$TM" x="0" y="3005">
<field name="NAME">thread_iw_statistics</field>
<statement name="STACK">
<block type="controls_if" id="YGtey2UlwZpkr?t`?,-3">
......@@ -765,7 +698,7 @@
</block>
</statement>
</block>
<block type="procedures_defreturn" id="xeRUdU_5_6@:6N}o^6?U" x="0" y="3566">
<block type="procedures_defreturn" id="xeRUdU_5_6@:6N}o^6?U" x="0" y="3461">
<field name="NAME">get_signal_ssid</field>
<value name="RETURN">
<block type="variables_get" id="}UbkuVwn;wuLv[];lQHd">
......
lib/Wifi_Monitoring.py
+ 18
− 21
View file @ f81d334b
......@@ -40,13 +40,11 @@ def thread_iw_event():
log.write(line_raw)
log.close()
if msg.find('scan started') + 1 > 0:
display.set_attr("txt_status_indicator_cloud_connected.active", str(True).lower())
pass
elif msg.find('scan finished') + 1 > 0:
display.set_attr("txt_status_indicator_cloud_connected.active", str(False).lower())
pass
else:
display.set_attr("txt_label_cloud_.text", str('<h3>{}</h3>'.format(ts)))
display.set_attr("txt_label_cloud_.text", str('<h3>{}</h3>'.format(msg)))
display.set_attr("txt_label_cloud_.text", str('<h3>{}</h3>'.format(args)))
print('{} {} {}'.format(ts, msg, args))
def thread_iw_link():
......@@ -60,13 +58,12 @@ def thread_iw_link():
break
#print(line_link.rstrip('\n'))
if line_link.find('Connected to ') + 1 > 0:
display.set_attr("txt_status_indicator_cloud_connected.active", str(True).lower())
display.set_attr("txt_status_indicator_wifi.active", str(True).lower())
elif line_link.find('Not connected.') + 1 > 0:
display.set_attr("txt_status_indicator_cloud_connected.active", str(False).lower())
display.set_attr("txt_label_cloud_.text", str(''))
display.set_attr("txt_label_cloud_.text", str(''))
display.set_attr("txt_label_cloud_.text", str(''))
display.set_attr("txt_label_cloud_.text", str(''))
display.set_attr("txt_status_indicator_wifi.active", str(False).lower())
display.set_attr("txt_label_message.text", str(''))
display.set_attr("txt_label_message2.text", str(''))
display.set_attr("txt_label_message3.text", str(''))
elif line_link.find('signal: ') + 1 > 0:
#-30 dBm Perfect
#-50 dBm Excellent
......@@ -76,27 +73,27 @@ def thread_iw_link():
#-80 dBm Unreliable
#-90 dBm Unusable
signal_num = int(line_link.split()[1])
display.set_attr("txt_label_cloud_.text", str('<h3>{}</h3>'.format(line_link)))
display.set_attr("txt_label_message.text", str('<h3>{}</h3>'.format(line_link)))
if signal_num >= -30:
display.set_attr("txt_label_cloud_.text", str('Perfect'))
display.set_attr("txt_label_message.text", str('Perfect'))
elif signal_num >= -50:
display.set_attr("txt_label_cloud_.text", str('Excellent'))
display.set_attr("txt_label_message.text", str('Excellent'))
elif signal_num >= -60:
display.set_attr("txt_label_cloud_.text", str('Very Good'))
display.set_attr("txt_label_message.text", str('Very Good'))
elif signal_num >= -67:
display.set_attr("txt_label_cloud_.text", str('Good'))
display.set_attr("txt_label_message.text", str('Good'))
elif signal_num >= -70:
display.set_attr("txt_label_cloud_.text", str('OK'))
display.set_attr("txt_label_message.text", str('OK'))
elif signal_num >= -80:
display.set_attr("txt_label_cloud_.text", str('Unreliable'))
display.set_attr("txt_label_message.text", str('Unreliable'))
else:
display.set_attr("txt_label_cloud_.text", str('Unusable'))
display.set_attr("txt_label_message.text", str('Unusable'))
elif line_link.find('SSID: ') + 1 > 0:
signal_ssid = str(line_link.split(":")[1]).strip()
display.set_attr("txt_label_cloud_.text", str('<h3>{}</h3>'.format(signal_ssid)))
display.set_attr("txt_label_message2.text", str('<h3>{}</h3>'.format(signal_ssid)))
elif line_link.find('bitrate: ') + 1 > 0:
signal_bitrate = str(line_link.split(":")[1]).strip()
display.set_attr("txt_label_cloud_.text", str('{}'.format(signal_bitrate)))
display.set_attr("txt_label_message3.text", str('{}'.format(signal_bitrate)))
time.sleep(1)
......
lib/display.qml
+ 9
− 0
View file @ f81d334b
......@@ -129,4 +129,13 @@ TXTWindow {
width: 100
height: 30
}
StatusIndicator {
id: txt_status_indicator_wifi
color: "#0600FF"
active: false
x: 205
y: 34
width: 25
height: 25
}
}
lib/display.xml
+ 1
− 1
View file @ f81d334b
<xml type="display" version="2"><item id="8" class="TXTLabel"><name>txt_label_cloud_</name><text>www.fischertechnik-cloud.com</text><geometry><x>10</x><y>115</y><width>195</width><height>15</height></geometry></item><item id="4" class="TXTLabel"><name>txt_label_message</name><text/><geometry><x>10</x><y>139</y><width>220</width><height>30</height></geometry></item><item id="7" class="StatusIndicator"><name>txt_status_indicator_cloud_connected</name><color>#12FF00</color><active>false</active><geometry><x>205</x><y>110</y><width>25</width><height>25</height></geometry></item><item id="42" class="TXTLabel"><name>txt_label_version</name><text/><geometry><x>5</x><y>15</y><width>230</width><height>15</height></geometry></item><item id="47" class="TXTLabel"><name>txt_label_model</name><text>Training Factory Industry 4.0 24V</text><geometry><x>5</x><y>0</y><width>230</width><height>15</height></geometry></item><item id="55" class="StatusIndicator"><name>txt_status_indicator_local_connected</name><color>#FF0000</color><active>false</active><geometry><x>205</x><y>85</y><width>25</width><height>25</height></geometry></item><item id="56" class="TXTLabel"><name>txt_label_local_</name><text>MQTT client: Node-RED</text><geometry><x>10</x><y>90</y><width>195</width><height>15</height></geometry></item><item id="57" class="TXTLabel"><name>txt_label_message2</name><text/><geometry><x>10</x><y>170</y><width>220</width><height>30</height></geometry></item><item id="59" class="TXTLabel"><name>txt_label_broker_</name><text>MQTT broker</text><geometry><x>10</x><y>65</y><width>195</width><height>15</height></geometry></item><item id="60" class="StatusIndicator"><name>txt_status_indicator_broker</name><color>#FF0000</color><active>false</active><geometry><x>205</x><y>60</y><width>25</width><height>25</height></geometry></item><item id="61" class="TXTLabel"><name>txt_label_message3</name><text/><geometry><x>10</x><y>200</y><width>220</width><height>30</height></geometry></item><item id="62" class="TXTSwitch"><name>txt_switch_cam</name><enabled>true</enabled><checked>true</checked><text>&lt;h1&gt;camera on&lt;/h1&gt;</text><geometry><x>10</x><y>30</y><width>100</width><height>30</height></geometry></item></xml>
\ No newline at end of file
<xml type="display" version="2"><item id="8" class="TXTLabel"><name>txt_label_cloud_</name><text>www.fischertechnik-cloud.com</text><geometry><x>10</x><y>115</y><width>195</width><height>15</height></geometry></item><item id="4" class="TXTLabel"><name>txt_label_message</name><text/><geometry><x>10</x><y>139</y><width>220</width><height>30</height></geometry></item><item id="7" class="StatusIndicator"><name>txt_status_indicator_cloud_connected</name><color>#12FF00</color><active>false</active><geometry><x>205</x><y>110</y><width>25</width><height>25</height></geometry></item><item id="42" class="TXTLabel"><name>txt_label_version</name><text/><geometry><x>5</x><y>15</y><width>230</width><height>15</height></geometry></item><item id="47" class="TXTLabel"><name>txt_label_model</name><text>Training Factory Industry 4.0 24V</text><geometry><x>5</x><y>0</y><width>230</width><height>15</height></geometry></item><item id="55" class="StatusIndicator"><name>txt_status_indicator_local_connected</name><color>#FF0000</color><active>false</active><geometry><x>205</x><y>85</y><width>25</width><height>25</height></geometry></item><item id="56" class="TXTLabel"><name>txt_label_local_</name><text>MQTT client: Node-RED</text><geometry><x>10</x><y>90</y><width>195</width><height>15</height></geometry></item><item id="57" class="TXTLabel"><name>txt_label_message2</name><text/><geometry><x>10</x><y>170</y><width>220</width><height>30</height></geometry></item><item id="59" class="TXTLabel"><name>txt_label_broker_</name><text>MQTT broker</text><geometry><x>10</x><y>65</y><width>195</width><height>15</height></geometry></item><item id="60" class="StatusIndicator"><name>txt_status_indicator_broker</name><color>#FF0000</color><active>false</active><geometry><x>205</x><y>60</y><width>25</width><height>25</height></geometry></item><item id="61" class="TXTLabel"><name>txt_label_message3</name><text/><geometry><x>10</x><y>200</y><width>220</width><height>30</height></geometry></item><item id="62" class="TXTSwitch"><name>txt_switch_cam</name><enabled>true</enabled><checked>true</checked><text>&lt;h1&gt;camera on&lt;/h1&gt;</text><geometry><x>10</x><y>30</y><width>100</width><height>30</height></geometry></item><item id="63" class="StatusIndicator"><name>txt_status_indicator_wifi</name><color>#0600FF</color><active>false</active><geometry><x>205</x><y>34</y><width>25</width><height>25</height></geometry></item></xml>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment