From 5c8cb61dc86e65712c83520b1a7a367f2c1df71e Mon Sep 17 00:00:00 2001 From: Paulus <kruger@astron.nl> Date: Tue, 27 Apr 2021 22:33:28 +0100 Subject: [PATCH] some bugs fixed --- config/CLK.yaml | 2 +- i2cserv/i2c_dev.py | 3 ++- testCLK.py | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/CLK.yaml b/config/CLK.yaml index 6da59dc..ffd4b8a 100644 --- a/config/CLK.yaml +++ b/config/CLK.yaml @@ -4,7 +4,7 @@ description: "1234" drivers: - name: I2C type: i2c - parameters: [1] #I2C port number + parameters: [4] #I2C port number - name: I2C_CLK type: i2c_dev #I2C devices parent: I2C diff --git a/i2cserv/i2c_dev.py b/i2cserv/i2c_dev.py index 36f1ada..4e701fd 100644 --- a/i2cserv/i2c_dev.py +++ b/i2cserv/i2c_dev.py @@ -110,7 +110,7 @@ class i2c_dev(hwdev): # print("Call Method",var1) def i2csetget(self,*args,**kwargs): - self.conf['parentcls'].i2csetget(*args,**kwargs) + return self.conf['parentcls'].i2csetget(*args,**kwargs) def SetSwitch(self,RCUi): self.conf['parentcls'].SetSW1(self.RCU_Switch1[RCUi]); @@ -206,6 +206,7 @@ class i2c_dev(hwdev): if devreg['store']: devreg['storeval']=value[0]; l1=int(np.floor((width+bitoffset+7)/8)) + print(value[0],width,bitoffset,l1) if (width!=l1*8) or (bitoffset>0): if (width<8): for i in range(len(value)): diff --git a/testCLK.py b/testCLK.py index 3bb0954..4b6f11c 100644 --- a/testCLK.py +++ b/testCLK.py @@ -32,10 +32,13 @@ I2Cclients.append(RCU_I2C) #Load yaml so that we know the variable names RCU_conf=yamlreader.yamlreader(RCU_I2C,yamlfile=name) -var1=RCU_conf.getvarid('CLK_PLL_locked_SPI') -var1=RCU_conf.getvarid('CLK_PLL_r3') +var1=RCU_conf.getvarid('CLK_PLL_locked') RCU_I2C.readvar(var1,[]) +var1=RCU_conf.getvarid('CLK_PLL_locked_SPI') +#var1=RCU_conf.getvarid('CLK_PLL_r3') +#RCU_I2C.readvar(var1,[]) + #var1=RCU_conf.getmethodid('CLK_on'); -- GitLab