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

commit by robo pro coding

parent 49dc6200
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
lib/SSC_Publisher.blockly
+ 122
− 124
View file @ 7b76d160
This diff is collapsed.
lib/SSC_Publisher.py
+ 24
− 25
View file @ 7b76d160
......@@ -30,31 +30,6 @@ last_temperature_alarm = None
last_movement_alarm = None
controller_name = None
payload_cam = None
def publish_camera():
global message, camera_enabled, camera_image, payload_temp, payload_bme680, payload_ldr, payload_broadcast, last_humidity_alarm, last_temperature_alarm, last_movement_alarm, controller_name, payload_cam
logging.log(logging.TRACE_FCL, '-')
camera_image = None
while True:
if camera_enabled:
if np.isscalar(camera_image):
continue
if not not len(camera_image):
if get_camera_on():
payload_cam = '{{"ts":"{}","data":"{}"}}'.format(timestamp_utcnow(), frame_to_base64(camera_image))
if get_cloud_active():
FTCloudClient.getInstance().publish("/j1/txt/" + str(CONTROLLER_ID) +"/i/cam", payload_cam)
if (get_client_local()) != None:
get_client_local().publish(topic='i/cam', payload=payload_cam, qos=0, retain=False)
time.sleep((1 / (get_camera_fps())))
def image_callback(event):
global message, camera_enabled, camera_image, payload_temp, payload_bme680, payload_ldr, payload_broadcast, last_humidity_alarm, last_temperature_alarm, last_movement_alarm, controller_name, payload_cam
if camera_enabled:
camera_image = event.value
else:
camera_image = None
def publish_bme680():
......@@ -89,6 +64,22 @@ def frame_to_base64(frame):
return result
def publish_camera():
global message, camera_enabled, camera_image, payload_temp, payload_bme680, payload_ldr, payload_broadcast, last_humidity_alarm, last_temperature_alarm, last_movement_alarm, controller_name, payload_cam
logging.log(logging.TRACE_FCL, '-')
camera_image = []
while True:
if camera_enabled:
if not not len(camera_image):
if get_camera_on():
payload_cam = '{{"ts":"{}","data":"{}"}}'.format(timestamp_utcnow(), frame_to_base64(camera_image))
if get_cloud_active():
FTCloudClient.getInstance().publish("/j1/txt/" + str(CONTROLLER_ID) +"/i/cam", payload_cam)
if (get_client_local()) != None:
get_client_local().publish(topic='i/cam', payload=payload_cam, qos=0, retain=False)
time.sleep((1 / (get_camera_fps())))
def camera_enabled2():
global message, camera_enabled, camera_image, payload_temp, payload_bme680, payload_ldr, payload_broadcast, last_humidity_alarm, last_temperature_alarm, last_movement_alarm, controller_name, payload_cam
logging.log(logging.TRACE_FCL, '-')
......@@ -117,6 +108,14 @@ def callback(event):
def image_callback(event):
global message, camera_enabled, camera_image, payload_temp, payload_bme680, payload_ldr, payload_broadcast, last_humidity_alarm, last_temperature_alarm, last_movement_alarm, controller_name, payload_cam
if camera_enabled:
camera_image = event.value
else:
camera_image = []
def motion_callback(event):
global message, camera_enabled, camera_image, payload_temp, payload_bme680, payload_ldr, payload_broadcast, last_humidity_alarm, last_temperature_alarm, last_movement_alarm, controller_name, payload_cam
if camera_enabled:
......
lib/Wifi_Monitoring.blockly
+ 4
− 4
View file @ 7b76d160
......@@ -41,7 +41,7 @@
<block type="loop_endless" id="G^!e#8aHWa!L+vS0$}D+">
<statement name="DO">
<block type="util_python" id="JUe86w,Mp4)DoV}bJ!(v">
<field name="value">line_raw = proc.stdout.readline().decode()&amp;#10;if not line_raw:&amp;#10; break&amp;#10;print(line_raw.rstrip('\n'))&amp;#10;line = line_raw.split(": ")&amp;#10;ts = line[0]&amp;#10;msg = line[2]&amp;#10;if len(line)&gt;3:&amp;#10; args = line[3]&amp;#10;#print(ts, " # ", msg, " # ", args)</field>
<field name="value">line_raw = proc.stdout.readline().decode()&amp;#10;if not line_raw:&amp;#10; break&amp;#10;#print(line_raw.rstrip('\n'))&amp;#10;line = line_raw.split(": ")&amp;#10;ts = line[0]&amp;#10;msg = line[2]&amp;#10;if len(line)&gt;3:&amp;#10; args = line[3]&amp;#10;#print(ts, " # ", msg, " # ", args)</field>
<next>
<block type="variables_set" id="v:96_[5}jb64@qiZC^Gg">
<field name="VAR" id=",MaB$rGB##{?ks?Paf-W">log</field>
......@@ -331,7 +331,7 @@
<mutation items="1"/>
<value name="value">
<shadow type="text" id="},CCzGR+thrW*pJ7gI=;">
<field name="TEXT">{}</field>
<field name="TEXT">&lt;h4&gt;{}&lt;/h4&gt;</field>
</shadow>
</value>
<value name="ADD0">
......@@ -614,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_message</field>
<field name="instance_name">txt_label_message3</field>
<value name="value">
<shadow type="text" id="[L@j]uZs,6ymZn=O.5Oc">
<field name="TEXT">abc</field>
......@@ -676,7 +676,7 @@
<block type="loop_endless" id="B_Ii)H0r%J=2-$=TN9$V">
<statement name="DO">
<block type="util_python" id="Q4.z}5i|ow$:R5@Mt^en">
<field name="value">line_link = proc.stdout.readline().decode()&amp;#10;if not line_link:&amp;#10; break&amp;#10;print(line_link.rstrip('\n'))</field>
<field name="value">line_link = proc.stdout.readline().decode()&amp;#10;if not line_link:&amp;#10; break&amp;#10;#print(line_link.rstrip('\n'))</field>
</block>
</statement>
<next>
......
lib/Wifi_Monitoring.py
+ 4
− 4
View file @ 7b76d160
......@@ -29,7 +29,7 @@ def thread_iw_event():
line_raw = proc.stdout.readline().decode()
if not line_raw:
break
print(line_raw.rstrip('\n'))
#print(line_raw.rstrip('\n'))
line = line_raw.split(": ")
ts = line[0]
msg = line[2]
......@@ -73,7 +73,7 @@ def thread_iw_link():
#-80 dBm Unreliable
#-90 dBm Unusable
signal_num = int(line_link.split()[1])
display.set_attr("txt_label_wifi_signal.text", str('{}'.format(line_link)))
display.set_attr("txt_label_wifi_signal.text", str('<h4>{}</h4>'.format(line_link)))
if signal_num >= -30:
display.set_attr("txt_label_wifi_signalq.text", str('Perfect'))
elif signal_num >= -50:
......@@ -93,7 +93,7 @@ def thread_iw_link():
display.set_attr("txt_label_wifi.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_message.text", str('{}'.format(signal_bitrate)))
display.set_attr("txt_label_message3.text", str('{}'.format(signal_bitrate)))
time.sleep(1)
......@@ -107,7 +107,7 @@ def thread_iw_statistics():
line_link = proc.stdout.readline().decode()
if not line_link:
break
print(line_link.rstrip('\n'))
#print(line_link.rstrip('\n'))
time.sleep(1)
......
lib/display.qml
+ 5
− 5
View file @ 7b76d160
......@@ -131,7 +131,7 @@ TXTWindow {
}
StatusIndicator {
id: txt_status_indicator_wifi
color: "#0600FF"
color: "#00FF00"
active: false
x: 205
y: 60
......@@ -153,9 +153,9 @@ TXTWindow {
text: "-"
font.pixelSize: 16
elide: Text.ElideRight
x: 105
x: 120
y: 60
width: 100
width: 85
height: 20
}
TXTLabel {
......@@ -163,9 +163,9 @@ TXTWindow {
text: "-"
font.pixelSize: 16
elide: Text.ElideRight
x: 105
x: 120
y: 80
width: 100
width: 85
height: 20
}
}
lib/display.xml
+ 1
− 1
View file @ 7b76d160
<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>145</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>170</y><width>220</width><height>20</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>140</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>115</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>120</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>190</y><width>220</width><height>20</height></geometry></item><item id="59" class="TXTLabel"><name>txt_label_broker_</name><text>MQTT broker</text><geometry><x>10</x><y>95</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>90</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>210</y><width>220</width><height>20</height></geometry></item><item id="62" class="TXTSwitch"><name>txt_switch_cam</name><enabled>true</enabled><checked>true</checked><text>&lt;h2&gt;camera on&lt;/h2&gt;</text><geometry><x>0</x><y>35</y><width>160</width><height>25</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>60</y><width>25</width><height>25</height></geometry></item><item id="64" class="TXTLabel"><name>txt_label_wifi</name><text>Wifi</text><geometry><x>10</x><y>60</y><width>95</width><height>20</height></geometry></item><item id="65" class="TXTLabel"><name>txt_label_wifi_signal</name><text>-</text><geometry><x>105</x><y>60</y><width>100</width><height>20</height></geometry></item><item id="66" class="TXTLabel"><name>txt_label_wifi_signalq</name><text>-</text><geometry><x>105</x><y>80</y><width>100</width><height>20</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>145</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>170</y><width>220</width><height>20</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>140</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>115</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>120</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>190</y><width>220</width><height>20</height></geometry></item><item id="59" class="TXTLabel"><name>txt_label_broker_</name><text>MQTT broker</text><geometry><x>10</x><y>95</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>90</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>210</y><width>220</width><height>20</height></geometry></item><item id="62" class="TXTSwitch"><name>txt_switch_cam</name><enabled>true</enabled><checked>true</checked><text>&lt;h2&gt;camera on&lt;/h2&gt;</text><geometry><x>0</x><y>35</y><width>160</width><height>25</height></geometry></item><item id="63" class="StatusIndicator"><name>txt_status_indicator_wifi</name><color>#00FF00</color><active>false</active><geometry><x>205</x><y>60</y><width>25</width><height>25</height></geometry></item><item id="64" class="TXTLabel"><name>txt_label_wifi</name><text>Wifi</text><geometry><x>10</x><y>60</y><width>95</width><height>20</height></geometry></item><item id="65" class="TXTLabel"><name>txt_label_wifi_signal</name><text>-</text><geometry><x>120</x><y>60</y><width>85</width><height>20</height></geometry></item><item id="66" class="TXTLabel"><name>txt_label_wifi_signalq</name><text>-</text><geometry><x>120</x><y>80</y><width>85</width><height>20</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