Skip to content
GitLab
Explore
Sign in
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
PyPCC
Commits
5af8357c
Commit
5af8357c
authored
4 years ago
by
Paulus Kruger
Browse files
Options
Downloads
Patches
Plain Diff
debug
parent
d8d2b0a8
No related branches found
No related tags found
1 merge request
!11
Pypcc2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
config/CLK.yaml
+7
-7
7 additions, 7 deletions
config/CLK.yaml
i2cserv/i2c_dev.py
+9
-9
9 additions, 9 deletions
i2cserv/i2c_dev.py
with
16 additions
and
16 deletions
config/CLK.yaml
+
7
−
7
View file @
5af8357c
...
@@ -8,7 +8,7 @@ drivers:
...
@@ -8,7 +8,7 @@ drivers:
-
name
:
I2C_CLK
-
name
:
I2C_CLK
type
:
i2c_dev
#I2C devices
type
:
i2c_dev
#I2C devices
parent
:
I2C
parent
:
I2C
mask
:
CLK_I2C_
OK
status
:
CLK_I2C_
STATUS
-
name
:
SPIbb1
-
name
:
SPIbb1
type
:
spibitbang2
#SPI bitbang via GPIO expander: CLK, SDI,SDO,CS
type
:
spibitbang2
#SPI bitbang via GPIO expander: CLK, SDI,SDO,CS
parent
:
I2C_CLK
parent
:
I2C_CLK
...
@@ -43,10 +43,10 @@ device_registers:
...
@@ -43,10 +43,10 @@ device_registers:
variables
:
variables
:
-
name
:
CLK_I2C_
OK
-
name
:
CLK_I2C_
STATUS
driver
:
I2C_CLK
driver
:
I2C_CLK
rw
:
variable
#server RW variable, not linked to IO
rw
:
ro
#server RW variable, not linked to IO
dtype
:
boolean
dtype
:
uint8
-
name
:
CLK_Enable_PWR
-
name
:
CLK_Enable_PWR
description
:
Power enabled
description
:
Power enabled
...
@@ -109,7 +109,7 @@ methods:
...
@@ -109,7 +109,7 @@ methods:
driver
:
I2C_CLK
driver
:
I2C_CLK
debug
:
True
debug
:
True
instructions
:
instructions
:
-
CLK_I2C_
OK
:
1
-
CLK_I2C_
STATUS
:
0
-
RCU_IO1_GPIO1
:
Update
-
RCU_IO1_GPIO1
:
Update
-
IO1.CONF1
:
Update
-
IO1.CONF1
:
Update
-
CLK_Enable_PWR
:
Update
-
CLK_Enable_PWR
:
Update
...
@@ -119,7 +119,7 @@ methods:
...
@@ -119,7 +119,7 @@ methods:
-
name
:
CLK_on
-
name
:
CLK_on
driver
:
I2C_CLK
driver
:
I2C_CLK
instructions
:
instructions
:
-
CLK_I2C_
OK
:
1
-
CLK_I2C_
STATUS
:
0
-
IO1.CONF1
:
0x2C
#0010 1100 PPS/PWR output, SCLK,CS,SDI
-
IO1.CONF1
:
0x2C
#0010 1100 PPS/PWR output, SCLK,CS,SDI
-
IO1.GPIO1
:
0x42
#0100 0010 high:PWR enable, CS
-
IO1.GPIO1
:
0x42
#0100 0010 high:PWR enable, CS
-
CLK_Enable_PWR
:
Update
-
CLK_Enable_PWR
:
Update
...
@@ -131,7 +131,7 @@ methods:
...
@@ -131,7 +131,7 @@ methods:
-
name
:
CLK_off
-
name
:
CLK_off
driver
:
I2C_CLK
driver
:
I2C_CLK
instructions
:
instructions
:
-
CLK_I2C_
OK
:
1
-
CLK_I2C_
STATUS
:
0
-
IO1.CONF1
:
0x2C
#0010 1100 PPS/PWR output, SCLK,CS,SDI
-
IO1.CONF1
:
0x2C
#0010 1100 PPS/PWR output, SCLK,CS,SDI
-
IO1.GPIO1
:
0x00
#all low
-
IO1.GPIO1
:
0x00
#all low
-
CLK_Enable_PWR
:
Update
-
CLK_Enable_PWR
:
Update
...
...
This diff is collapsed.
Click to expand it.
i2cserv/i2c_dev.py
+
9
−
9
View file @
5af8357c
...
@@ -146,7 +146,7 @@ class i2c_dev(hwdev):
...
@@ -146,7 +146,7 @@ class i2c_dev(hwdev):
return
;
return
;
for
Vari
in
range
(
Step
):
for
Vari
in
range
(
Step
):
if
not
(
mask
[
Vari
]):
continue
if
not
(
mask
[
Vari
]):
continue
if
not
(
self
.
I2Cmask
[
0
]):
if
not
(
self
.
I2Cmask
[
0
]
==
0
):
mask
[
Vari
]
=
False
;
mask
[
Vari
]
=
False
;
continue
;
continue
;
i0
=
(
Vari
)
*
Step
i0
=
(
Vari
)
*
Step
...
@@ -156,13 +156,13 @@ class i2c_dev(hwdev):
...
@@ -156,13 +156,13 @@ class i2c_dev(hwdev):
bitoffset
=
GetField
(
var1
,
'
bitoffset
'
,
Vari
,
0
)
bitoffset
=
GetField
(
var1
,
'
bitoffset
'
,
Vari
,
0
)
res
=
self
.
SetVarValue
(
devreg
,
width
,
bitoffset
,
data
[
i0
:
i1
])
res
=
self
.
SetVarValue
(
devreg
,
width
,
bitoffset
,
data
[
i0
:
i1
])
if
not
(
res
):
if
not
(
res
):
self
.
I2Cmask
[
0
]
=
False
;
self
.
I2Cmask
[
0
]
=
1
;
mask
[
Vari
]
=
False
;
mask
[
Vari
]
=
False
;
continue
;
continue
;
value2
=
value1
[
i0
:
i1
]
value2
=
value1
[
i0
:
i1
]
res
=
self
.
GetVarValue
(
devreg
,
width
,
bitoffset
,
value2
)
res
=
self
.
GetVarValue
(
devreg
,
width
,
bitoffset
,
value2
)
if
not
(
res
):
if
not
(
res
):
self
.
I2Cmask
[
0
]
=
False
;
self
.
I2Cmask
[
0
]
=
1
;
mask
[
Vari
]
=
False
;
mask
[
Vari
]
=
False
;
continue
;
continue
;
value1
[
i0
:
i1
]
=
value2
value1
[
i0
:
i1
]
=
value2
...
@@ -181,7 +181,7 @@ class i2c_dev(hwdev):
...
@@ -181,7 +181,7 @@ class i2c_dev(hwdev):
return
;
return
;
for
Vari
in
range
(
Step
):
for
Vari
in
range
(
Step
):
if
not
(
mask
[
Vari
]):
continue
if
not
(
mask
[
Vari
]):
continue
if
not
(
self
.
I2Cmask
[
0
]):
if
not
(
self
.
I2Cmask
[
0
]
==
0
):
mask
[
Vari
]
=
False
;
mask
[
Vari
]
=
False
;
continue
;
continue
;
i0
=
(
Vari
)
*
Step
i0
=
(
Vari
)
*
Step
...
@@ -192,7 +192,7 @@ class i2c_dev(hwdev):
...
@@ -192,7 +192,7 @@ class i2c_dev(hwdev):
value2
=
value1
[
i0
:
i1
]
value2
=
value1
[
i0
:
i1
]
res
=
self
.
GetVarValue
(
devreg
,
width
,
bitoffset
,
value2
)
res
=
self
.
GetVarValue
(
devreg
,
width
,
bitoffset
,
value2
)
if
not
(
res
):
if
not
(
res
):
self
.
I2Cmask
[
0
]
=
False
;
self
.
I2Cmask
[
0
]
=
1
;
mask
[
Vari
]
=
False
;
mask
[
Vari
]
=
False
;
continue
;
continue
;
value1
[
i0
:
i1
]
=
value2
value1
[
i0
:
i1
]
=
value2
...
@@ -209,10 +209,10 @@ class i2c_dev(hwdev):
...
@@ -209,10 +209,10 @@ class i2c_dev(hwdev):
def
Setdevreg
(
self
,
devreg
,
value
,
mask
=
[]):
def
Setdevreg
(
self
,
devreg
,
value
,
mask
=
[]):
# if devreg.get('store'): logging.debug("Stored")
# if devreg.get('store'): logging.debug("Stored")
# print(devreg['store'])
# print(devreg['store'])
if
not
(
self
.
I2Cmask
[
0
]):
return
False
;
if
not
(
self
.
I2Cmask
[
0
]
==
0
):
return
False
;
res
=
self
.
SetVarValue
(
devreg
,
8
,
0
,
value
)
res
=
self
.
SetVarValue
(
devreg
,
8
,
0
,
value
)
if
not
(
res
):
if
not
(
res
):
self
.
I2Cmask
[
0
]
=
False
;
self
.
I2Cmask
[
0
]
=
1
;
return
False
;
return
False
;
if
devreg
.
get
(
'
store
'
):
if
devreg
.
get
(
'
store
'
):
devreg
[
'
storeval
'
]
=
value
[
0
];
devreg
[
'
storeval
'
]
=
value
[
0
];
...
@@ -220,10 +220,10 @@ class i2c_dev(hwdev):
...
@@ -220,10 +220,10 @@ class i2c_dev(hwdev):
def
Getdevreg
(
self
,
devreg
,
mask
=
[]):
def
Getdevreg
(
self
,
devreg
,
mask
=
[]):
value
=
[
0
];
value
=
[
0
];
if
not
(
self
.
I2Cmask
[
0
]):
return
False
;
if
not
(
self
.
I2Cmask
[
0
]
==
0
):
return
False
;
res
=
self
.
GetVarValue
(
devreg
,
8
,
0
,
value
)
res
=
self
.
GetVarValue
(
devreg
,
8
,
0
,
value
)
if
not
(
res
):
if
not
(
res
):
self
.
I2Cmask
[
0
]
=
False
;
self
.
I2Cmask
[
0
]
=
1
;
return
False
;
return
False
;
if
devreg
.
get
(
'
store
'
):
if
devreg
.
get
(
'
store
'
):
devreg
[
'
storeval
'
]
=
value
[
0
];
devreg
[
'
storeval
'
]
=
value
[
0
];
...
...
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