diff options
| author | whitequark <whitequark@whitequark.org> | 2019-09-23 08:07:37 +0000 |
|---|---|---|
| committer | whitequark <whitequark@whitequark.org> | 2019-09-23 08:07:37 +0000 |
| commit | dd87f472af92a73d18b3ef363603f20bd071306e (patch) | |
| tree | 1f55589430c96914fff1a0ac95308c8451d1f27e /nmigen_boards/blackice_ii.py | |
| parent | cb0c2cd8595dab6dd3aa0c219a405e5f56880412 (diff) | |
[breaking-change] Factor out "led", "button" and "switch" resources.
These resources were renamed as:
* user_led → led
* user_btn → button
* user_sw → switch
Fixes #13.
Diffstat (limited to 'nmigen_boards/blackice_ii.py')
| -rw-r--r-- | nmigen_boards/blackice_ii.py | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/nmigen_boards/blackice_ii.py b/nmigen_boards/blackice_ii.py index e74d855..baa135c 100644 --- a/nmigen_boards/blackice_ii.py +++ b/nmigen_boards/blackice_ii.py @@ -18,23 +18,15 @@ class BlackIceIIPlatform(LatticeICE40Platform): Clock(100e6), Attrs(GLOBAL=True, IO_STANDARD="SB_LVCMOS") ), - Resource("user_led", 0, Pins("71", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_led", 1, Pins("67", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_led", 2, Pins("68", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_led", 3, Pins("70", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), + *LEDResources(pins="71 67 68 70", attrs=Attrs(IO_STANDARD="SB_LVCMOS")), # Color aliases - Resource("user_ledb", 0, Pins("71", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_ledg", 0, Pins("67", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_ledo", 0, Pins("68", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_ledr", 0, Pins("70", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), + Resource("led_b", 0, Pins("71", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), + Resource("led_g", 0, Pins("67", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), + Resource("led_o", 0, Pins("68", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), + Resource("led_r", 0, Pins("70", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_btn", 0, PinsN("63", dir="i"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_btn", 1, PinsN("64", dir="i"), Attrs(IO_STANDARD="SB_LVCMOS")), - - Resource("user_sw", 0, PinsN("37", dir="i"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_sw", 1, PinsN("38", dir="i"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_sw", 2, PinsN("39", dir="i"), Attrs(IO_STANDARD="SB_LVCMOS")), - Resource("user_sw", 3, PinsN("41", dir="i"), Attrs(IO_STANDARD="SB_LVCMOS")), + *ButtonResources(pins="63 64", invert=True, attrs=Attrs(IO_STANDARD="SB_LVCMOS")), + *SwitchResources(pins="37 38 39 41", invert=True, attrs=Attrs(IO_STANDARD="SB_LVCMOS")), UARTResource(0, rx="88", tx="85", rts="91", cts="94", |