Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/nmigen-boards
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5f30a7890a60
Choose a base ref
...
head repository: m-labs/nmigen-boards
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e649e8befe49
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Oct 3, 2019

  1. dev.display: factor out from dev.user. NFC.

    whitequark committed Oct 3, 2019
    Copy the full SHA
    e649e8b View commit details
Showing with 22 additions and 21 deletions.
  1. +20 −0 nmigen_boards/dev/display.py
  2. +1 −20 nmigen_boards/dev/user.py
  3. +1 −1 nmigen_boards/mercury.py
20 changes: 20 additions & 0 deletions nmigen_boards/dev/display.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
from nmigen.build import *


__all__ = ["Display7SegResource"]


def Display7SegResource(*args, a, b, c, d, e, f, g, dp=None, invert=False, attrs=None):
ios = []
ios.append(Subsignal("a", Pins(a, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("b", Pins(b, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("c", Pins(c, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("d", Pins(d, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("e", Pins(e, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("f", Pins(f, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("g", Pins(g, dir="o", invert=invert, assert_width=1)))
if dp is not None:
ios.append(Subsignal("dp", Pins(dp, dir="o", assert_width=1)))
if attrs is not None:
ios.append(attrs)
return Resource.family(*args, default_name="display_7seg", ios=ios)
21 changes: 1 addition & 20 deletions nmigen_boards/dev/user.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
from nmigen.build import *


__all__ = [
"LEDResources", "RGBLEDResource", "ButtonResources", "SwitchResources",
"Display7SegResource",
]
__all__ = ["LEDResources", "RGBLEDResource", "ButtonResources", "SwitchResources"]


def _SplitResources(*args, pins, invert=False, attrs=None, default_name, dir):
@@ -44,19 +41,3 @@ def ButtonResources(*args, **kwargs):

def SwitchResources(*args, **kwargs):
return _SplitResources(*args, **kwargs, default_name="switch", dir="i")


def Display7SegResource(*args, a, b, c, d, e, f, g, dp=None, invert=False, attrs=None):
ios = []
ios.append(Subsignal("a", Pins(a, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("b", Pins(b, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("c", Pins(c, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("d", Pins(d, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("e", Pins(e, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("f", Pins(f, dir="o", invert=invert, assert_width=1)))
ios.append(Subsignal("g", Pins(g, dir="o", invert=invert, assert_width=1)))
if dp is not None:
ios.append(Subsignal("dp", Pins(dp, dir="o", assert_width=1)))
if attrs is not None:
ios.append(attrs)
return Resource.family(*args, default_name="display_7seg", ios=ios)
2 changes: 1 addition & 1 deletion nmigen_boards/mercury.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
from nmigen.build import *
from nmigen.vendor.xilinx_spartan_3_6 import *
from .dev import *
from .dev.user import Display7SegResource
from .dev.display import Display7SegResource


__all__ = ["MercuryPlatform"]