From 209f84e253bfff63f21c07a921b060dc67361629 Mon Sep 17 00:00:00 2001 From: whitequark Date: Sun, 4 Aug 2019 10:53:20 +0000 Subject: [PATCH] Add missing trailing spaces to multiline connector definitions. Or the last and the first on line pin get glued together. --- nmigen_boards/ice40_hx8k_b_evn.py | 32 +++++++++++++++---------------- nmigen_boards/icebreaker.py | 4 ++-- nmigen_boards/tinyfpga_bx.py | 10 ++++++---- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/nmigen_boards/ice40_hx8k_b_evn.py b/nmigen_boards/ice40_hx8k_b_evn.py index 31fd013..cf0c8a5 100644 --- a/nmigen_boards/ice40_hx8k_b_evn.py +++ b/nmigen_boards/ice40_hx8k_b_evn.py @@ -38,25 +38,25 @@ class ICE40HX8KBEVNPlatform(LatticeICE40Platform): ] connectors = [ Connector("j", 1, # J1 - "A16 - A15 B15 B13 B14 - - B12 B11" - "A11 B10 A10 C9 - - A9 B9 B8 A7" - "B7 C7 - - A6 C6 B6 C5 A5 C4" - "- - B5 C3 B4 B3 A2 A1 - -"), + "A16 - A15 B15 B13 B14 - - B12 B11 " + "A11 B10 A10 C9 - - A9 B9 B8 A7 " + "B7 C7 - - A6 C6 B6 C5 A5 C4 " + "- - B5 C3 B4 B3 A2 A1 - - "), Connector("j", 2, # J2 - "- - - R15 P16 P15 - - N16 M15" - "M16 L16 K15 K16 - - K14 J14 G14 F14" - "J15 H14 - - H16 G15 G16 F15 F16 E14" - "- - E16 D15 D16 D14 C16 B16 - -"), + "- - - R15 P16 P15 - - N16 M15 " + "M16 L16 K15 K16 - - K14 J14 G14 F14 " + "J15 H14 - - H16 G15 G16 F15 F16 E14 " + "- - E16 D15 D16 D14 C16 B16 - - "), Connector("j", 3, # J3 - "R16 - T15 T16 T13 T14 - - N12 P13" - "N10 M11 T11 P10 - - T10 R10 P8 P9" - "T9 R9 - - T7 T8 T6 R6 T5 R5" - "- - R3 R4 R2 T3 T1 T2 - -"), + "R16 - T15 T16 T13 T14 - - N12 P13 " + "N10 M11 T11 P10 - - T10 R10 P8 P9 " + "T9 R9 - - T7 T8 T6 R6 T5 R5 " + "- - R3 R4 R2 T3 T1 T2 - - "), Connector("j", 4, # J4 - "- - - R1 P1 P2 - - N3 N2" - "M2 M1 L3 L1 - - K3 K1 J2 J1" - "H2 J3 - - G2 H1 F2 G1 E2 F1" - "- - D1 D2 C1 C2 B1 B2 - -"), + "- - - R1 P1 P2 - - N3 N2 " + "M2 M1 L3 L1 - - K3 K1 J2 J1 " + "H2 J3 - - G2 H1 F2 G1 E2 F1 " + "- - D1 D2 C1 C2 B1 B2 - - "), ] def toolchain_program(self, products, name): diff --git a/nmigen_boards/icebreaker.py b/nmigen_boards/icebreaker.py index a62ecdc..755a521 100644 --- a/nmigen_boards/icebreaker.py +++ b/nmigen_boards/icebreaker.py @@ -36,9 +36,9 @@ class ICEBreakerPlatform(LatticeICE40Platform): ), ] connectors = [ - Connector("pmod", 0, "4 2 47 45 - - 3 48 46 44 - -"), # PMOD1A + Connector("pmod", 0, " 4 2 47 45 - - 3 48 46 44 - -"), # PMOD1A Connector("pmod", 1, "43 38 34 31 - - 42 36 32 28 - -"), # PMOD1B - Connector("pmod", 2, "27 25 21 19 - - 26 23 20 18 - -"), # PMOD2 + Connector("pmod", 2, "27 25 21 19 - - 26 23 20 18 - -"), # PMOD2 ] # The attached LED/button section can be either used standalone or as a PMOD. # Attach to platform using: diff --git a/nmigen_boards/tinyfpga_bx.py b/nmigen_boards/tinyfpga_bx.py index aefddb7..4eb6942 100644 --- a/nmigen_boards/tinyfpga_bx.py +++ b/nmigen_boards/tinyfpga_bx.py @@ -28,19 +28,21 @@ class TinyFPGABXPlatform(LatticeICE40Platform): *SPIFlashResources(0, cs="F7", clk="G7", mosi="G6", miso="H7", wp="H4", hold="J8", - attrs=Attrs(IO_STANDARD="SB_LVCMOS33")), + attrs=Attrs(IO_STANDARD="SB_LVCMOS33") + ), ] connectors = [ Connector("gpio", 0, # Left side of the board # 1 2 3 4 5 6 7 8 9 10 11 12 13 - " A2 A1 B1 C2 C1 D2 D1 E2 E1 G2 H1 J1 H2" + " A2 A1 B1 C2 C1 D2 D1 E2 E1 G2 H1 J1 H2 " # Right side of the board # 14 15 16 17 18 19 20 21 22 23 24 - " H9 D9 D8 B8 A9 B8 A8 B7 A7 B6 A6" + " H9 D9 D8 B8 A9 B8 A8 B7 A7 B6 A6 " # Bottom of the board # 25 26 27 28 29 30 31 - "G1 J3 J4 G9 J9 E8 J2"), + "G1 J3 J4 G9 J9 E8 J2" + ), ] def toolchain_program(self, products, name): -- 2.30.2