diff --git a/FactoryCalib.blockly b/FactoryCalib.blockly index 45ae0cf3be34a99c19cce6a1a490d5f8f7f65df0..4880ae3fcba9bddbf6640995c8de11e5d8e15010 100644 --- a/FactoryCalib.blockly +++ b/FactoryCalib.blockly @@ -1,5 +1,8 @@ <xml xmlns="https://developers.google.com/blockly/xml" version="14"> - <block type="start_block" id="5r8Hf)nzFKt,AzMq]4)P" deletable="false" x="0" y="0"> + <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"> <statement name="statement"> <block type="display_set_label_text" id=":7]Mx6b@!j4P*7jD}iz["> <field name="instance_name">txt_label_version</field> @@ -9,64 +12,92 @@ </shadow> </value> <next> - <block type="import_function_noreturn" id="YS*ea8.Bfy;.3|g-E7Y[" inline="true"> - <mutation parentId="GpNR?4P@FL?f3(jp^K8R"/> - <field name="name">initlib_log</field> - <data>GpNR?4P@FL?f3(jp^K8R</data> - <value name="lev"> - <block type="math_number" id="*zV,1/{/Td8l,9-8.bsz"> - <field name="NUM">5</field> - </block> - </value> + <block type="util_python" id="o+8E~5yC`}H~cnso`3[1" inline="true"> + <field name="value">controller_name = os.uname()[1]</field> <next> - <block type="util_thread" id="w[N!Y~MF:gs%d(5bY709"> - <field name="dropdown_event">~FKhMTnpG35?iaM}{EE}</field> + <block type="display_set_label_text" id="=[19m=z%bxZRe51M6oCm"> + <field name="instance_name">txt_label_message2</field> + <value name="value"> + <shadow type="text" id="v]Szn8xR6[aB%^|%WSr%"> + <field name="TEXT">abc</field> + </shadow> + <block type="text_format" id="s9w?bu_u^OL_nDcm@/j`"> + <mutation items="1"/> + <value name="value"> + <shadow type="text" id="I~XAtEGN-;qa!e~~O$oI"> + <field name="TEXT">http://{}:1880/ui</field> + </shadow> + </value> + <value name="ADD0"> + <block type="variables_get" id="/-r?}Wff2,xtm`c6Wod/"> + <field name="VAR" id="o7M2j8lcbSda!;+?VQbz">controller_name</field> + </block> + </value> + </block> + </value> <next> - <block type="import_function_noreturn" id="EqFjrc^9ID6,mvTIO]ar"> - <mutation parentId="d5(4s}ZfJ2??#n9y{4GL"/> - <field name="name">initlib_Axes1Ref</field> - <data>d5(4s}ZfJ2??#n9y{4GL</data> + <block type="import_function_noreturn" id="YS*ea8.Bfy;.3|g-E7Y[" inline="true"> + <mutation parentId="GpNR?4P@FL?f3(jp^K8R"/> + <field name="name">initlib_log</field> + <data>GpNR?4P@FL?f3(jp^K8R</data> + <value name="lev"> + <block type="math_number" id="*zV,1/{/Td8l,9-8.bsz"> + <field name="NUM">5</field> + </block> + </value> <next> - <block type="import_function_noreturn" id="=Ckq6VQA+8DCbE|kE;1l"> - <mutation parentId="tx,0:0uT;t*U[h*1X@`a"/> - <field name="name">initlib_Axes2Ref</field> - <data>tx,0:0uT;t*U[h*1X@`a</data> + <block type="util_thread" id="w[N!Y~MF:gs%d(5bY709"> + <field name="dropdown_event">~FKhMTnpG35?iaM}{EE}</field> <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="import_function_noreturn" id="EqFjrc^9ID6,mvTIO]ar"> + <mutation parentId="d5(4s}ZfJ2??#n9y{4GL"/> + <field name="name">initlib_Axes1Ref</field> + <data>d5(4s}ZfJ2??#n9y{4GL</data> <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="=Ckq6VQA+8DCbE|kE;1l"> + <mutation parentId="tx,0:0uT;t*U[h*1X@`a"/> + <field name="name">initlib_Axes2Ref</field> + <data>tx,0:0uT;t*U[h*1X@`a</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="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> <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="HIwLV]R%AsHX[Ri5^lQ["> + <mutation parentId="MaY=lcUPdn@Uj4uuw7[N"/> + <field name="name">init_HBW</field> + <data>MaY=lcUPdn@Uj4uuw7[N</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="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> <next> - <block type="util_thread" id="($:VkQ#3?EHT|;iZ9W9u"> - <field name="dropdown_event">R4vMowGJ0I?IYs_!-IwU</field> + <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="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,"/> + <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="{yc__LanX27NtUTm3P*)"> + <field name="dropdown_event">]$}!d~iPi$faCfYn-,02</field> + <next> + <block type="loop_endless" id="^hpJo7DFR.KJ9Xs2RAx,"/> + </next> + </block> + </next> + </block> </next> </block> </next> diff --git a/FactoryCalib.py b/FactoryCalib.py index 2edbfbc21957427400a24eebe6af653d6b64570f..b64611e5b7c0d908a5886bd35c38111bb752fcfa 100644 --- a/FactoryCalib.py +++ b/FactoryCalib.py @@ -24,7 +24,12 @@ from lib.VGR_Axes1Ref import * from lib.VGR_NodeRED import * +controller_name = None + + display.set_attr("txt_label_version.text", str('Version 2022/11/08')) +controller_name = os.uname()[1] +display.set_attr("txt_label_message2.text", str('http://{}:1880/ui'.format(controller_name))) initlib_log(5) threading.Thread(target=thread_lights, daemon=True).start() initlib_Axes1Ref()