From dd87f472af92a73d18b3ef363603f20bd071306e Mon Sep 17 00:00:00 2001 From: whitequark Date: Mon, 23 Sep 2019 08:07:37 +0000 Subject: [breaking-change] Factor out "led", "button" and "switch" resources. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These resources were renamed as: * user_led → led * user_btn → button * user_sw → switch Fixes #13. --- nmigen_boards/numato_mimas.py | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) (limited to 'nmigen_boards/numato_mimas.py') diff --git a/nmigen_boards/numato_mimas.py b/nmigen_boards/numato_mimas.py index a85abc3..d484fa2 100644 --- a/nmigen_boards/numato_mimas.py +++ b/nmigen_boards/numato_mimas.py @@ -18,31 +18,10 @@ class NumatoMimasPlatform(XilinxSpartan6Platform): Resource("clk100", 0, Pins("P126", dir="i"), Clock(100e6), Attrs(IOSTANDARD="LVCMOS33")), - Resource("user_led", 0, Pins("P119", dir="o"), - Attrs(IOSTANDARD="LVCMOS33")), - Resource("user_led", 1, Pins("P118", dir="o"), - Attrs(IOSTANDARD="LVCMOS33")), - Resource("user_led", 2, Pins("P117", dir="o"), - Attrs(IOSTANDARD="LVCMOS33")), - Resource("user_led", 3, Pins("P116", dir="o"), - Attrs(IOSTANDARD="LVCMOS33")), - Resource("user_led", 4, Pins("P115", dir="o"), - Attrs(IOSTANDARD="LVCMOS33")), - Resource("user_led", 5, Pins("P114", dir="o"), - Attrs(IOSTANDARD="LVCMOS33")), - Resource("user_led", 6, Pins("P112", dir="o"), - Attrs(IOSTANDARD="LVCMOS33")), - Resource("user_led", 7, Pins("P111", dir="o"), - Attrs(IOSTANDARD="LVCMOS33")), - - Resource("user_btn", 0, Pins("P124", dir="i"), - Attrs(IOSTANDARD="LVCMOS33", PULLUP="TRUE")), - Resource("user_btn", 1, Pins("P123", dir="i"), - Attrs(IOSTANDARD="LVCMOS33", PULLUP="TRUE")), - Resource("user_btn", 2, Pins("P121", dir="i"), - Attrs(IOSTANDARD="LVCMOS33", PULLUP="TRUE")), - Resource("user_btn", 3, Pins("P120", dir="i"), - Attrs(IOSTANDARD="LVCMOS33", PULLUP="TRUE")), + *LEDResources(pins="P119 P118 P117 P116 P115 P114 P112 P111", + attrs=Attrs(IOSTANDARD="LVCMOS33")), + *ButtonResources(pins="P124 P123 P121 P120", + attrs=Attrs(IOSTANDARD="LVCMOS33", PULLUP="TRUE")), *SPIFlashResources(0, cs="P38", clk="P70", mosi="P64", miso="65", -- cgit v1.2.3