Skip to content
Snippets Groups Projects
Commit 2cf6ab24 authored by Paulus Kruger's avatar Paulus Kruger
Browse files

Fix bug in RCU_on crash. Added ADC test signal off

parent bab6d03f
Branches
Tags
1 merge request!23Pts1
Pipeline #79357 passed
...@@ -1056,7 +1056,7 @@ methods: ...@@ -1056,7 +1056,7 @@ methods:
- name: RCU_ADC_testsignal_on - name: RCU_ADC_testsignal_on
description: Configure ADCs to give a time-syncronised test signal. Test signal is disabled by calling RCU_on. description: Configure ADCs to give a time-syncronised test signal.
driver: I2C_RCU driver: I2C_RCU
mask: RCU_mask mask: RCU_mask
instructions: instructions:
...@@ -1067,3 +1067,16 @@ methods: ...@@ -1067,3 +1067,16 @@ methods:
- ADC3.JESD_control1 : 0x34 - ADC3.JESD_control1 : 0x34
- ADC3.Update: 1 #Needed to update ADC registers - ADC3.Update: 1 #Needed to update ADC registers
- RCU_ADC_testsignal: Update #disabled for testing - RCU_ADC_testsignal: Update #disabled for testing
- name: RCU_ADC_testsignal_off
description: Switch off test signal
driver: I2C_RCU
mask: RCU_mask
instructions:
- ADC1.JESD_control1 : 0x14
- ADC1.Update: 1 #Needed to update ADC registers
- ADC2.JESD_control1 : 0x14
- ADC2.Update: 1 #Needed to update ADC registers
- ADC3.JESD_control1 : 0x14
- ADC3.Update: 1 #Needed to update ADC registers
- RCU_ADC_testsignal: Update #disabled for testing
...@@ -941,7 +941,7 @@ methods: ...@@ -941,7 +941,7 @@ methods:
- DTH3.Start : [0,1,0,0,1] - DTH3.Start : [0,1,0,0,1]
- name: RCU_ADC_testsignal_on - name: RCU_ADC_testsignal_on
description: Configure ADCs to give a time-syncronised test signal. The signal is disabled by calling RCU_on. description: Configure ADCs to give a time-syncronised test signal.
driver: I2C_RCU driver: I2C_RCU
mask: RCU_mask mask: RCU_mask
instructions: instructions:
...@@ -952,3 +952,16 @@ methods: ...@@ -952,3 +952,16 @@ methods:
- ADC3.JESD_control1 : 0x34 - ADC3.JESD_control1 : 0x34
- ADC3.Update: 1 #Needed to update ADC registers - ADC3.Update: 1 #Needed to update ADC registers
- RCU_ADC_testsignal: Update #disabled for testing - RCU_ADC_testsignal: Update #disabled for testing
- name: RCU_ADC_testsignal_off
description: Switch off test signal
driver: I2C_RCU
mask: RCU_mask
instructions:
- ADC1.JESD_control1 : 0x14
- ADC1.Update: 1 #Needed to update ADC registers
- ADC2.JESD_control1 : 0x14
- ADC2.Update: 1 #Needed to update ADC registers
- ADC3.JESD_control1 : 0x14
- ADC3.Update: 1 #Needed to update ADC registers
- RCU_ADC_testsignal: Update #disabled for testing
...@@ -254,7 +254,7 @@ class i2c_array(i2c_dev): ...@@ -254,7 +254,7 @@ class i2c_array(i2c_dev):
try: try:
value2[:]=storearray[RCUi] value2[:]=storearray[RCUi]
except: except:
logging.warning("RCU%iWrong size (no data?) in stored array %i-%i"%(RCUi,len(value2),len(storearray[RCUi]))) logging.warning("RCU%iWrong size (no data?) in stored array"%(RCUi))
# of len(storearray[RCUi]==0) # of len(storearray[RCUi]==0)
# storearray[self.RCUi]=(value[0] if len(value)==1 else value[:]) # storearray[self.RCUi]=(value[0] if len(value)==1 else value[:])
l1=int(np.floor((width+bitoffset+7)/8)) l1=int(np.floor((width+bitoffset+7)/8))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment