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

commit by robo pro coding

parent 017cabfb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Factory_VGR.blockly
+ 1
− 1
View file @ 1d9f3a81
......@@ -5,7 +5,7 @@
<field name="instance_name">txt_label_version</field>
<value name="value">
<shadow type="text" id=";8tV9skg8kR+~Pm65cf!">
<field name="TEXT">Version 2022/11/25</field>
<field name="TEXT">Version 2023/01/03</field>
</shadow>
</value>
<next>
......
Factory_VGR.py
+ 1
− 1
View file @ 1d9f3a81
......@@ -17,7 +17,7 @@ from lib.VGR_Display import *
from lib.VGR_MQTT import *
display.set_attr("txt_label_version.text", str('Version 2022/11/25'))
display.set_attr("txt_label_version.text", str('Version 2023/01/03'))
display.set_attr("txt_label_message.text", str(''))
display.set_attr("txt_label_message.text", str(''))
initlib_log(9)
......
data/FactoryCalibDefault.json deleted 100644 → 0
+ 0
− 150
View file @ 017cabfb
{
"SLD": {
"thresh_red_blue": 1600,
"thresh_white_red": 1150
},
"DPS": {
"thresh_red_blue": 1300,
"thresh_white_red": 1150
},
"SSC": {
"poslist": [
[
925,
425
],
[
1450,
290
],
[
925,
100
]
]
},
"VGR": {
"offset": [
[
"DSI",
202
],
[
"DSO",
250
],
[
"HBW_h",
158
],
[
"HBW",
150
],
[
"MPO",
490
]
],
"poslist": [
[
"Color Reader",
107,
645,
40
],
[
"DSI",
5,
752,
5
],
[
"DSO",
247,
290,
530
],
[
"HBW",
1395,
0,
0
],
[
"MPO",
911,
0,
850
],
[
"NFC",
180,
643,
230
],
[
"NiO",
300,
400,
0
],
[
"SLD blue",
304,
835,
579
],
[
"SLD red",
371,
835,
418
],
[
"SLD white",
450,
835,
360
]
],
"discard": [
[
"DSI",
550
],
[
"DSO",
50
],
[
"HBW",
20
]
]
},
"HBW": {
"offset": [
180,
200
],
"poslist": [
[
750,
70
],
[
1360,
435
],
[
1965,
845
],
[
0,
710
]
]
}
}
\ No newline at end of file
lib/display.qml
+ 32
− 52
View file @ 1d9f3a81
......@@ -21,26 +21,6 @@ TXTWindow {
width: 230
height: 20
}
TXTButton {
id: txt_button_acknowledge
text: "<b>ACK</b>"
font.pixelSize: 16
enabled: true
x: 5
y: 174
width: 60
height: 30
}
TXTButton {
id: txt_button_park
text: "<b>PARK</b>"
font.pixelSize: 16
enabled: true
x: 87
y: 174
width: 60
height: 30
}
TXTLabel {
id: txt_label_version
text: ""
......@@ -48,17 +28,17 @@ TXTWindow {
elide: Text.ElideRight
x: 5
y: 15
width: 228
width: 230
height: 15
}
TXTLabel {
id: txt_label_model
text: "Training Factory Industry 4.0 9V V.2"
text: "Vacuum Gripper Robot 9V"
font.pixelSize: 16
elide: Text.ElideRight
x: 5
y: 0
width: 228
width: 230
height: 15
}
TXTButton {
......@@ -66,59 +46,59 @@ TXTWindow {
text: "<b>TEST</b>"
font.pixelSize: 16
enabled: true
x: 173
y: 174
width: 60
height: 31
x: 185
y: 175
width: 50
height: 25
}
TXTButton {
id: txt_button_grip
text: "grip"
text: "<h2>grip</h2>"
font.pixelSize: 16
enabled: true
x: 6
y: 129
width: 100
height: 40
x: 5
y: 150
width: 70
height: 50
}
TXTButton {
id: txt_button_release
text: "release"
text: "<h2>release</h2>"
font.pixelSize: 16
enabled: true
x: 133
y: 129
width: 100
height: 40
x: 85
y: 150
width: 70
height: 50
}
TXTButton {
id: txt_button_pos0
text: "pos0"
text: "<h2>pos0</h2>"
font.pixelSize: 16
enabled: true
x: 6
y: 34
width: 62
x: 5
y: 40
width: 70
height: 50
}
TXTButton {
id: txt_button_pos1
text: "pos1"
text: "<h2>pos1</h2>"
font.pixelSize: 16
enabled: true
x: 72
y: 33
width: 88
x: 85
y: 40
width: 70
height: 50
}
TXTButton {
id: txt_button_pos2
text: "pos2"
text: "<h2>pos2</h2>"
font.pixelSize: 16
enabled: true
x: 163
y: 33
width: 69
x: 165
y: 40
width: 70
height: 50
}
TXTSwitch {
......@@ -127,9 +107,9 @@ TXTWindow {
font.pixelSize: 16
enabled: true
checked: false
x: 6
y: 85
width: 226
x: 80
y: 100
width: 90
height: 40
}
}
lib/display.xml
+ 1
− 1
View file @ 1d9f3a81
<xml type="display" version="2"><item id="4" class="TXTLabel"><name>txt_label_message</name><text/><geometry><x>5</x><y>207</y><width>230</width><height>20</height></geometry></item><item id="27" class="TXTButton"><name>txt_button_acknowledge</name><enabled>true</enabled><text>&lt;b&gt;ACK&lt;/b&gt;</text><geometry><x>5</x><y>174</y><width>60</width><height>30</height></geometry></item><item id="30" class="TXTButton"><name>txt_button_park</name><enabled>true</enabled><text>&lt;b&gt;PARK&lt;/b&gt;</text><geometry><x>87</x><y>174</y><width>60</width><height>30</height></geometry></item><item id="42" class="TXTLabel"><name>txt_label_version</name><text/><geometry><x>5</x><y>15</y><width>228</width><height>15</height></geometry></item><item id="47" class="TXTLabel"><name>txt_label_model</name><text>Training Factory Industry 4.0 9V V.2</text><geometry><x>5</x><y>0</y><width>228</width><height>15</height></geometry></item><item id="52" class="TXTButton"><name>txt_button_test</name><enabled>true</enabled><text>&lt;b&gt;TEST&lt;/b&gt;</text><geometry><x>173</x><y>174</y><width>60</width><height>31</height></geometry></item><item id="56" class="TXTButton"><name>txt_button_grip</name><enabled>true</enabled><text>grip</text><geometry><x>6</x><y>129</y><width>100</width><height>40</height></geometry></item><item id="57" class="TXTButton"><name>txt_button_release</name><enabled>true</enabled><text>release</text><geometry><x>133</x><y>129</y><width>100</width><height>40</height></geometry></item><item id="58" class="TXTButton"><name>txt_button_pos0</name><enabled>true</enabled><text>pos0</text><geometry><x>6</x><y>34</y><width>62</width><height>50</height></geometry></item><item id="59" class="TXTButton"><name>txt_button_pos1</name><enabled>true</enabled><text>pos1</text><geometry><x>72</x><y>33</y><width>88</width><height>50</height></geometry></item><item id="60" class="TXTButton"><name>txt_button_pos2</name><enabled>true</enabled><text>pos2</text><geometry><x>163</x><y>33</y><width>69</width><height>50</height></geometry></item><item id="61" class="TXTSwitch"><name>txt_switch_cycle</name><enabled>true</enabled><checked>false</checked><text>Cycle</text><geometry><x>6</x><y>85</y><width>226</width><height>40</height></geometry></item></xml>
\ No newline at end of file
<xml type="display" version="2"><item id="4" class="TXTLabel"><name>txt_label_message</name><text/><geometry><x>5</x><y>207</y><width>230</width><height>20</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>Vacuum Gripper Robot 9V</text><geometry><x>5</x><y>0</y><width>230</width><height>15</height></geometry></item><item id="52" class="TXTButton"><name>txt_button_test</name><enabled>true</enabled><text>&lt;b&gt;TEST&lt;/b&gt;</text><geometry><x>185</x><y>175</y><width>50</width><height>25</height></geometry></item><item id="56" class="TXTButton"><name>txt_button_grip</name><enabled>true</enabled><text>&lt;h2&gt;grip&lt;/h2&gt;</text><geometry><x>5</x><y>150</y><width>70</width><height>50</height></geometry></item><item id="57" class="TXTButton"><name>txt_button_release</name><enabled>true</enabled><text>&lt;h2&gt;release&lt;/h2&gt;</text><geometry><x>85</x><y>150</y><width>70</width><height>50</height></geometry></item><item id="58" class="TXTButton"><name>txt_button_pos0</name><enabled>true</enabled><text>&lt;h2&gt;pos0&lt;/h2&gt;</text><geometry><x>5</x><y>40</y><width>70</width><height>50</height></geometry></item><item id="59" class="TXTButton"><name>txt_button_pos1</name><enabled>true</enabled><text>&lt;h2&gt;pos1&lt;/h2&gt;</text><geometry><x>85</x><y>40</y><width>70</width><height>50</height></geometry></item><item id="60" class="TXTButton"><name>txt_button_pos2</name><enabled>true</enabled><text>&lt;h2&gt;pos2&lt;/h2&gt;</text><geometry><x>165</x><y>40</y><width>70</width><height>50</height></geometry></item><item id="61" class="TXTSwitch"><name>txt_switch_cycle</name><enabled>true</enabled><checked>false</checked><text>Cycle</text><geometry><x>80</x><y>100</y><width>90</width><height>40</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