diff --git a/pypcc/pypcc.py b/pypcc/pypcc.py index 29b105398d1717e9b5b97ed29e7a920664247ac1..dcbaba6db7871284103b4499e3838e9dff50a1ba 100755 --- a/pypcc/pypcc.py +++ b/pypcc/pypcc.py @@ -78,7 +78,7 @@ def main(): opcuaserv.AddVarR("TR_software_version_R",git_hash+"_"+args.config,[],False) for i,name in enumerate(I2Cports): RCU_I2C=I2Cclients[i] - RCU_conf=yamlreader.yamlreader(RCU_I2C,yamlfile=f"/etc/hwtr/{name}.yaml") + RCU_conf=yamlreader.yamlreader(RCU_I2C,yamlfile=name) RCU_conf.AddVars(opcuaserv.AddVarR,opcuaserv.AddVarW) RCU_conf.AddMethod(opcuaserv.Addmethod) RCU_conf.CallInit(); diff --git a/pypcc/yamlconfig.py b/pypcc/yamlconfig.py index 24f927bd20607845a921b29a84fd5a600041de31..a7d582d7d97070b2154d62c0b1ecc8e90f608303 100644 --- a/pypcc/yamlconfig.py +++ b/pypcc/yamlconfig.py @@ -32,8 +32,7 @@ class yamlconfig(): if yamlfile.split('.')[-1]=='yaml': self.conf=yaml.load(open(yamlfile), Loader=yaml.FullLoader) else: - pkg = importlib_resources.files("pypcc") - pkg_data_file = pkg / "config" / (yamlfile+'.yaml') + pkg_data_file = "/etc/hwtr/" + (yamlfile+'.yaml') self.conf=yaml.load(pkg_data_file.open(), Loader=yaml.FullLoader) self.expand_variables() # print([[v['name'],v.get('devreg')] for v in var1])