Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pre-release' into rogue-linkedGet
Browse files Browse the repository at this point in the history
  • Loading branch information
@ruck314
ruck314 committed Jun 19, 2024
2 parents a2b0b55 + a90807c commit 2c16976
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 15 deletions.
1 change: 1 addition & 0 deletions protocols/pgp/ruckus.tcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ if { $::env(VIVADO_VERSION) > 0.0} {
# Load ruckus files
loadRuckusTcl "$::DIR_PATH/pgp2b"
loadRuckusTcl "$::DIR_PATH/pgp2fc"
loadSource -lib surf -dir "$::DIR_PATH/shared/xilinx"
}
0 protocols/pgp/shared/PgpXvcWrapper.vhd → ...ocols/pgp/shared/xilinx/PgpXvcWrapper.vhd
View file
File renamed without changes.
1 change: 1 addition & 0 deletions python/surf/devices/micron/_AxiMicronMt28ew.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def __init__(self,
bulkOpEn = False,
hidden = True,
verify = False,
groups = ['NoStream','NoState','NoConfig'], # Not saving config/state to YAML
))

self.add(pr.LocalCommand(
Expand Down
1 change: 1 addition & 0 deletions python/surf/devices/micron/_AxiMicronN25Q.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ def __init__(self,
bulkOpEn = False,
hidden = True,
verify = False,
groups = ['NoStream','NoState','NoConfig'], # Not saving config/state to YAML
))

##############################
Expand Down
1 change: 1 addition & 0 deletions python/surf/devices/micron/_AxiMicronP30.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def __init__(self,
bulkOpEn = False,
hidden = True,
verify = False,
groups = ['NoStream','NoState','NoConfig'], # Not saving config/state to YAML
))

self.add(pr.LocalCommand(
Expand Down
1 change: 1 addition & 0 deletions python/surf/devices/silabs/_Si5324.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def __init__(self,**kwargs):
hidden = True,
base = pr.UInt,
mode = "RW",
groups = ['NoStream','NoState','NoConfig'], # Not saving config/state to YAML
))

self.add(pr.LocalVariable(
Expand Down
1 change: 1 addition & 0 deletions python/surf/devices/silabs/_Si5326.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def __init__(self,**kwargs):
hidden = True,
base = pr.UInt,
mode = "RW",
groups = ['NoStream','NoState','NoConfig'], # Not saving config/state to YAML
))

self.add(pr.LocalVariable(
Expand Down
1 change: 1 addition & 0 deletions python/surf/devices/silabs/_Si5345Pages.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def __init__(self,
hidden = True,
base = pr.UInt,
mode = "RW",
groups = ['NoStream','NoState','NoConfig'], # Not saving config/state to YAML
))

def MyLinkVariable(self, name, description, offset, bitSize, mode, bitOffset=0, pollInterval=0, value=None, hidden=False):
Expand Down
31 changes: 16 additions & 15 deletions python/surf/devices/ti/_Ina237.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class Ina237(pr.Device):
def __init__(self,
pollInterval = 1,
senseRes = 20.E-3, # Units of Ohms
hideConfig = True,
**kwargs):

super().__init__(**kwargs)
Expand All @@ -22,21 +23,21 @@ def __init__(self,
name = 'SenseRes',
mode = 'RW',
value = senseRes,
hidden = True,
hidden = hideConfig,
))

##############
# 0h CONFIG
##############

self.add(pr.RemoteVariable(
self.add(pr.RemoteCommand(
name = 'RST',
description = 'Reset Bit. Setting this bit to 1 generates a system reset that is the same as power-on reset.',
offset = (0x0 << 2),
bitSize = 1,
bitOffset = 15,
mode = 'WO',
hidden = True,
function = lambda cmd: (cmd.post(1), self.readBlocks(checkEach=True))[0],
hidden = hideConfig,
))

self.add(pr.RemoteVariable(
Expand All @@ -47,7 +48,7 @@ def __init__(self,
bitOffset = 6,
mode = 'RW',
units = '2ms',
hidden = True,
hidden = hideConfig,
))

self.add(pr.RemoteVariable(
Expand All @@ -61,7 +62,7 @@ def __init__(self,
0 : '+/-163.84mV',
1 : '+/-40.96mV',
},
hidden = True,
hidden = hideConfig,
))

##############
Expand All @@ -75,7 +76,7 @@ def __init__(self,
bitSize = 4,
bitOffset = 12,
mode = 'RW',
hidden = True,
hidden = hideConfig,
))

self.add(pr.RemoteVariable(
Expand All @@ -85,7 +86,7 @@ def __init__(self,
bitSize = 3,
bitOffset = 9,
mode = 'RW',
hidden = True,
hidden = hideConfig,
))

self.add(pr.RemoteVariable(
Expand All @@ -95,7 +96,7 @@ def __init__(self,
bitSize = 3,
bitOffset = 6,
mode = 'RW',
hidden = True,
hidden = hideConfig,
))

self.add(pr.RemoteVariable(
Expand All @@ -105,7 +106,7 @@ def __init__(self,
bitSize = 3,
bitOffset = 3,
mode = 'RW',
hidden = True,
hidden = hideConfig,
))

self.add(pr.RemoteVariable(
Expand All @@ -115,7 +116,7 @@ def __init__(self,
bitSize = 3,
bitOffset = 0,
mode = 'RW',
hidden = True,
hidden = hideConfig,
))

##############
Expand All @@ -129,7 +130,7 @@ def __init__(self,
bitSize = 15,
bitOffset = 0,
mode = 'RW',
hidden = True,
hidden = hideConfig,
))


Expand All @@ -146,7 +147,7 @@ def __init__(self,
base = pr.Int,
mode = 'RO',
pollInterval = pollInterval,
hidden = True,
hidden = hideConfig,
))

##############
Expand All @@ -162,7 +163,7 @@ def __init__(self,
base = pr.Int,
mode = 'RO',
pollInterval = pollInterval,
hidden = True,
hidden = hideConfig,
))

##############
Expand All @@ -178,7 +179,7 @@ def __init__(self,
base = pr.Int,
mode = 'RO',
pollInterval = pollInterval,
hidden = True,
hidden = hideConfig,
))

###############################################################################
Expand Down
1 change: 1 addition & 0 deletions python/surf/devices/ti/_Lmx2594.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def __init__(self, **kwargs):
hidden = True,
base = pr.UInt,
mode = "RW",
groups = ['NoStream','NoState','NoConfig'], # Not saving config/state to YAML
))

def addLinkVariable(name, description, offset, bitSize, mode, bitOffset=0, pollInterval=0, value=None, hidden=False):
Expand Down
1 change: 1 addition & 0 deletions python/surf/devices/ti/_Lmx2615.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def __init__(self, **kwargs):
hidden = True,
base = pr.UInt,
mode = "RW",
groups = ['NoStream','NoState','NoConfig'], # Not saving config/state to YAML
))

self.add(pr.RemoteVariable(
Expand Down
1 change: 1 addition & 0 deletions python/surf/protocols/sugoi/_SugoiAxiLitePixelMatrixConfig.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ def __init__(self,
hidden = True,
base = pr.UInt,
mode = "RW",
groups = ['NoStream','NoState','NoConfig'], # Not saving config/state to YAML
))

self.add(pr.RemoteVariable(
Expand Down

0 comments on commit 2c16976

Please sign in to comment.