From daec3a48081ddb0d2399f11e385ad3d0e28e7e11 Mon Sep 17 00:00:00 2001 From: ft-Demo <fischertechnik-team@fischer.de> Date: Wed, 7 Dec 2022 15:41:22 +0000 Subject: [PATCH] commit by robo pro coding --- FactoryCalib.blockly | 2 +- FactoryCalib.py | 2 +- lib/File.blockly | 2 +- lib/File.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FactoryCalib.blockly b/FactoryCalib.blockly index e7de43c..83069c1 100644 --- a/FactoryCalib.blockly +++ b/FactoryCalib.blockly @@ -8,7 +8,7 @@ <field name="instance_name">txt_label_version</field> <value name="value"> <shadow type="text" id="T9nyAyJIRL7l_Nn(S-rd"> - <field name="TEXT">Version 2022/12/07c</field> + <field name="TEXT">Version 2022/12/07d</field> </shadow> </value> <next> diff --git a/FactoryCalib.py b/FactoryCalib.py index 735f4b4..16c7d44 100644 --- a/FactoryCalib.py +++ b/FactoryCalib.py @@ -27,7 +27,7 @@ from lib.VGR_NodeRED import * controller_name = None -display.set_attr("txt_label_version.text", str('Version 2022/12/07c')) +display.set_attr("txt_label_version.text", str('Version 2022/12/07d')) controller_name = os.uname()[1] display.set_attr("txt_label_message2.text", str('<b>http://{}.local:1880/ui</b>'.format(controller_name))) initlib_log(5) diff --git a/lib/File.blockly b/lib/File.blockly index a4526fc..0752de5 100644 --- a/lib/File.blockly +++ b/lib/File.blockly @@ -320,7 +320,7 @@ </value> <next> <block type="util_python" id="h+c/cbWJp[TLFFN9`$$q" inline="true"> - <field name="value">#try to write a backup to usb stick&#10;try:&#10; fileUSB = open('/opt/ft/workspaces/'+usbpath+'/'+controller_name, 'w', encoding='utf8')&#10; fileUSB.close()&#10;&#10; fileCalib = open('/opt/ft/workspaces/ext_usb/sda/FactoryCalib.json', 'w', encoding='utf8')&#10; fileCalib.write(calib_json)&#10; fileCalib.close()&#10;&#10; #write backup if usb stick available&#10; if exists('/opt/ft/workspaces/'+usbpath+'/FactoryCalib.json'):&#10; fileCalib = open('/opt/ft/workspaces/FactoryCalib_backup.json', 'w', encoding='utf8')&#10; fileCalib.write(calib_json)&#10; fileCalib.close()&#10;except IOError as e:&#10; print(e)</field> + <field name="value">#try to write a backup to usb stick&#10;try:&#10; fileUSB = open('/opt/ft/workspaces/'+usbpath+'/'+controller_name, 'w', encoding='utf8')&#10; fileUSB.close()&#10;&#10; fileCalib = open('/opt/ft/workspaces/'+usbpath+'/FactoryCalib.json', 'w', encoding='utf8')&#10; fileCalib.write(calib_json)&#10; fileCalib.close()&#10;&#10; #write backup if usb stick available&#10; if exists('/opt/ft/workspaces/'+usbpath+'/FactoryCalib.json'):&#10; fileCalib = open('/opt/ft/workspaces/FactoryCalib_backup.json', 'w', encoding='utf8')&#10; fileCalib.write(calib_json)&#10; fileCalib.close()&#10;except IOError as e:&#10; print(e)</field> </block> </next> </block> diff --git a/lib/File.py b/lib/File.py index 6435c25..5b57645 100644 --- a/lib/File.py +++ b/lib/File.py @@ -106,7 +106,7 @@ def writeFileFactoryCalib(_ssc, _hbw, _vgr, _dps, _sld): fileUSB = open('/opt/ft/workspaces/'+usbpath+'/'+controller_name, 'w', encoding='utf8') fileUSB.close() - fileCalib = open('/opt/ft/workspaces/ext_usb/sda/FactoryCalib.json', 'w', encoding='utf8') + fileCalib = open('/opt/ft/workspaces/'+usbpath+'/FactoryCalib.json', 'w', encoding='utf8') fileCalib.write(calib_json) fileCalib.close() -- GitLab