diff --git a/pypcc/config/RECVTR_HB.yaml b/pypcc/config/RECVTR_HB.yaml index 7a764b57784056eb4569a4533d56ad6f6df93a72..63f64a9597a35b9e74ec7f1f7b03cbc52f573f06 100644 --- a/pypcc/config/RECVTR_HB.yaml +++ b/pypcc/config/RECVTR_HB.yaml @@ -358,7 +358,7 @@ variables: dim: 32 monitor: true read_parallel: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_3V3 description: RCU 3.3V voltage (V) @@ -371,7 +371,7 @@ variables: dim: 32 read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_1V8 description: RCU 1.8V voltage (V) @@ -384,7 +384,7 @@ variables: dim: 32 read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_2V5 description: RCU 2.5V voltage (V) @@ -397,7 +397,7 @@ variables: dim: 32 read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_ANT_VOUT description: Voltage on antenna output of RCU (V). Controlled by ANT_PWR_ON. @@ -411,7 +411,7 @@ variables: dim2: [3,32] read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_ANT_VIN description: RCU antenna voltage before switch (V) @@ -425,7 +425,7 @@ variables: dim2: [3,32] read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_ANT_IOUT description: Current drawn on antenna output of RCU (A). 15mA offset due to LED on RCU @@ -439,7 +439,7 @@ variables: dim2: [3,32] read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_DIGITAL_on description: RCU digital power enable. Controlled by calling RCU_on/RCU_off diff --git a/pypcc/config/RECVTR_LB.yaml b/pypcc/config/RECVTR_LB.yaml index b753491106bc0a5943cec094a228dea4e0640077..d97593c799dd085a3eea407729dd9c80bd2b4bae 100644 --- a/pypcc/config/RECVTR_LB.yaml +++ b/pypcc/config/RECVTR_LB.yaml @@ -317,7 +317,7 @@ variables: dim: 32 monitor: true read_parallel: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_3V3 description: RCU 3.3V voltage (V) @@ -330,7 +330,7 @@ variables: dim: 32 read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_1V8 description: RCU 1.8V voltage (V) @@ -343,7 +343,7 @@ variables: dim: 32 read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_2V5 description: RCU 2.5V voltage (V) @@ -356,7 +356,7 @@ variables: dim: 32 read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_ANT_VOUT description: Voltage on antenna output of RCU (V). Controlled by ANT_PWR_ON. @@ -370,7 +370,7 @@ variables: dim2: [3,32] read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_ANT_VIN description: RCU antenna voltage before switch (V) @@ -384,7 +384,7 @@ variables: dim2: [3,32] read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_ANT_IOUT description: Current drawn on antenna output of RCU (A). 15mA offset due to LED on RCU @@ -398,7 +398,7 @@ variables: dim2: [3,32] read_parallel: true monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_DIGITAL_on description: RCU digital power enable. Controlled by calling RCU_on/RCU_off @@ -422,7 +422,7 @@ variables: dtype: boolean dim: 32 monitor: true - mask: RECVTR_I2C_error +# mask: RECVTR_I2C_error - name: RCU_PWR_ANALOG_on description: RCU analog power enable. Controlled by RCU_on/off diff --git a/pypcc/opcuaserv/yamlreader.py b/pypcc/opcuaserv/yamlreader.py index f82d969d5948a9d771e225a9b78c56581c2707a5..5c9183bdbb2fa8e9c9ba4bf2857a128131bbf656 100644 --- a/pypcc/opcuaserv/yamlreader.py +++ b/pypcc/opcuaserv/yamlreader.py @@ -191,6 +191,8 @@ class yamlreader(yamlconfig): mask=Find(self.conf['variables'],'name',mask) if not(mask): continue; mask=mask.get('OPCR',None) + if (mask is None): + mask=mask.get('OPCW',None) if (mask==None): continue; v['maskOPC']=mask if not self.monitorvarid is None: @@ -319,6 +321,8 @@ class yamlreader(yamlconfig): v=self.conf['variables'][self.monitorvarcnt]; if v.get('monitor'): mask=(v['maskOPC'].get_value() if v.get('maskOPC') else []) + if isinstance(mask,list) and (len(mask)>0) and isinstance(mask[0],int): + mask=[m==0 for m in mask] # print("monitor",v['name'],mask) # self.SetBusy() self.lastRecv=time.time()