Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
PyPCC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
PyPCC
Commits
2cf6ab24
Commit
2cf6ab24
authored
Apr 17, 2024
by
Paulus Kruger
Browse files
Options
Downloads
Patches
Plain Diff
Fix bug in RCU_on crash. Added ADC test signal off
parent
bab6d03f
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!23
Pts1
Pipeline
#79357
passed
Apr 17, 2024
Stage: run
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
pypcc/config/RECVTR_HB.yaml
+14
-1
14 additions, 1 deletion
pypcc/config/RECVTR_HB.yaml
pypcc/config/RECVTR_LB.yaml
+14
-1
14 additions, 1 deletion
pypcc/config/RECVTR_LB.yaml
pypcc/i2cserv/i2c_array.py
+1
-1
1 addition, 1 deletion
pypcc/i2cserv/i2c_array.py
with
29 additions
and
3 deletions
pypcc/config/RECVTR_HB.yaml
+
14
−
1
View file @
2cf6ab24
...
@@ -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
This diff is collapsed.
Click to expand it.
pypcc/config/RECVTR_LB.yaml
+
14
−
1
View file @
2cf6ab24
...
@@ -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
This diff is collapsed.
Click to expand it.
pypcc/i2cserv/i2c_array.py
+
1
−
1
View file @
2cf6ab24
...
@@ -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
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment