commit by robo pro coding

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/07</field>
+            <field name="TEXT">Version 2022/12/07b</field>
           </shadow>
         </value>
         <next>

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/07'))
+display.set_attr("txt_label_version.text", str('Version 2022/12/07b'))
 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)

lib/File.py

@@ -17,10 +17,11 @@ _vgr = None
 _dps = None
 _sld = None
 fileCalib = None
+usbpath = None
 calib_json = None
 ts = None
-calib_data_SSC = None
 calib_map = None
+calib_data_SSC = None
 calib_data_HBW = None
 calib_data_VGR = None
 calib_data_DPS = None
@@ -28,14 +29,11 @@ calib_data_SLD = None
 
 
 def loadFileFactoryCalib():
-    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, calib_json, ts, calib_data_SSC, calib_map, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
+    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, usbpath, calib_json, ts, calib_map, calib_data_SSC, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
     logging.log(logging.TRACE, '-')
     if exists('/opt/ft/workspaces/FactoryCalib.json'):
         logging.log(logging.DEBUG, 'load calibration values')
         readFileFactoryCalib()
-        #write copy to usb stick .../sda/FactoryCalib.json
-        print('cp /opt/ft/workspaces/FactoryCalib.json /opt/ft/workspaces/ext_usb/sda/FactoryCalib.json')
-        subprocess.Popen(['cp', '/opt/ft/workspaces/FactoryCalib.json', '/opt/ft/workspaces/ext_usb/sda/FactoryCalib.json'])
     else:
         logging.log(logging.DEBUG, 'use default calibration values')
         writeFileFactoryCalib_defaults()
@@ -44,7 +42,7 @@ def loadFileFactoryCalib():
 
 
 def readFileFactoryCalib():
-    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, calib_json, ts, calib_data_SSC, calib_map, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
+    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, usbpath, calib_json, ts, calib_map, calib_data_SSC, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
     logging.log(logging.TRACE, '-')
     fileCalib = open('/opt/ft/workspaces/FactoryCalib.json', 'r', encoding='utf8')
     calib_json = fileCalib.read()
@@ -65,8 +63,9 @@ def readFileFactoryCalib():
 
 
 def writeFileFactoryCalib(_ssc, _hbw, _vgr, _dps, _sld):
-    global fileCalib, calib_json, ts, calib_data_SSC, calib_map, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
+    global fileCalib, usbpath, calib_json, ts, calib_map, calib_data_SSC, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
     logging.log(logging.TRACE, '-')
+    usbpath = 'ext_usb/sda1'
     controller_name = os.uname()[1]
     ts = timestamp_utcnow()
     calib_data_SSC = _ssc
@@ -104,22 +103,24 @@ def writeFileFactoryCalib(_ssc, _hbw, _vgr, _dps, _sld):
     fileCalib.close()
     #try to write a backup to usb stick
     try:
-      fileUSB = open('/opt/ft/workspaces/ext_usb/sda/'+controller_name, 'w', encoding='utf8')
-      fileUSB.close()
-      fileCalib = open('/opt/ft/workspaces/ext_usb/sda/FactoryCalib.json', 'w', encoding='utf8')
-      fileCalib.write(calib_json)
-      fileCalib.close()
-    except IOError as e:
-      print(e)
-    #write backup if usb stick available
-    if exists('/opt/ft/workspaces/ext_usb/sda/FactoryCalib.json'):
-        fileCalib = open('/opt/ft/workspaces/FactoryCalib_backup.json', 'w', encoding='utf8')
+        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.write(calib_json)
         fileCalib.close()
 
+        #write backup if usb stick available
+        if exists('/opt/ft/workspaces/'+usbpath+'/FactoryCalib.json'):
+              fileCalib = open('/opt/ft/workspaces/FactoryCalib_backup.json', 'w', encoding='utf8')
+              fileCalib.write(calib_json)
+              fileCalib.close()
+    except IOError as e:
+        print(e)
+
 
 def printData():
-    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, calib_json, ts, calib_data_SSC, calib_map, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
+    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, usbpath, calib_json, ts, calib_map, calib_data_SSC, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
     logging.log(logging.TRACE, '-')
     print("SSC: ", calib_data_SSC)
     print("HBW: ", calib_data_HBW)
@@ -129,13 +130,13 @@ def printData():
 
 
 def writeFileFactoryCalib_current():
-    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, calib_json, ts, calib_data_SSC, calib_map, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
+    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, usbpath, calib_json, ts, calib_map, calib_data_SSC, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
     logging.log(logging.TRACE, '-')
     writeFileFactoryCalib(get_calib_data_SSC(), get_calib_data_HBW(), get_calib_data_VGR(), get_calib_data_DPS(), get_calib_data_SLD())
 
 
 def writeFileFactoryCalib_defaults():
-    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, calib_json, ts, calib_data_SSC, calib_map, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
+    global _ssc, _hbw, _vgr, _dps, _sld, fileCalib, usbpath, calib_json, ts, calib_map, calib_data_SSC, calib_data_HBW, calib_data_VGR, calib_data_DPS, calib_data_SLD
     logging.log(logging.TRACE, '-')
     if exists('/opt/ft/workspaces/FactoryCalib.json'):
         fileCalib = open('/opt/ft/workspaces/FactoryCalib.json', 'r', encoding='utf8')