diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 4dd7c987..2008945f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,12 +1,13 @@ # Change Log -## [0.4](https://github.com/formatc1702/WireViz/tree/v0.4) (unreleased) +## [0.4](https://github.com/formatc1702/WireViz/tree/v0.4) (2024-05-12) ### Backward-incompatible changes - New syntax for autogenerated components ([#184](https://github.com/wireviz/WireViz/issues/184), [#186](https://github.com/wireviz/WireViz/pull/186)) - Components that are not referenced in any connection set will not be rendered. Instead, a warning will be output in the console. ([#328](https://github.com/wireviz/WireViz/issues/328), [#332](https://github.com/wireviz/WireViz/pull/332)) - New command line interface ([#244](https://github.com/wireviz/WireViz/pull/244)). Run `wireviz --help` for details - The path specified with the `-o`/`--output-dir` option no longer includes the filename (without extension) of the generated files. Use the `-O`/`--output-name` option to specify a different filename for the generated files. +- The `.gv` file is no longer included as a default output format (only as an intermediate file during processing) unless specified with the new `-f` option described below. ### New features @@ -49,9 +50,7 @@ - Remove HTML links from the input attributes ([#164](https://github.com/formatc1702/WireViz/pull/164)) - Add harness metadata section ([#158](https://github.com/formatc1702/WireViz/issues/158), [#214](https://github.com/formatc1702/WireViz/pull/214)) - Add support for supplier and supplier part number information ([#240](https://github.com/formatc1702/WireViz/issues/240), [#241](https://github.com/formatc1702/WireViz/pull/241/)) -- Add graph rendering options (colors, font, color name display style, ...) ([#158](https://github.com/formatc1702/WireViz/issues/158), [#214](https://github.com/formatc1702/WireViz/pull/214)) -- Add support for supplier and supplier part number information ([#240](https://github.com/formatc1702/WireViz/issues/240), [#241](https://github.com/formatc1702/WireViz/pull/241/)) -- Add graph rendering options (colors, font, color name display style, ...) ([#158](https://github.com/formatc1702/WireViz/issues/158), [#214](https://github.com/formatc1702/WireViz/pull/214)) +- Add graph rendering options (background colors, fontname, color name display style, ...) ([#158](https://github.com/formatc1702/WireViz/issues/158), [#214](https://github.com/formatc1702/WireViz/pull/214)) - Add support for background colors for cables and connectors, as well as for some individual cells ([#210](https://github.com/formatc1702/WireViz/issues/210), [#219](https://github.com/formatc1702/WireViz/pull/219)) - Add optional tweaking of the .gv output ([#215](https://github.com/formatc1702/WireViz/pull/215)) (experimental) diff --git a/docs/README.md b/docs/README.md index 8045f85d..732f6714 100644 --- a/docs/README.md +++ b/docs/README.md @@ -137,7 +137,7 @@ mywire.bom.tsv BOM (bill of materials) as tab-separated text file mywire.html HTML page with wiring diagram and BOM embedded ``` -Wildcars in the file path are also supported to process multiple files at once, e.g.: +Wildcards in the file path are also supported to process multiple files at once, e.g.: ``` $ wireviz ~/path/to/files/*.yml ``` diff --git a/examples/demo01.html b/examples/demo01.html index 76e7ffc9..2786c1c7 100644 --- a/examples/demo01.html +++ b/examples/demo01.html @@ -30,172 +30,172 @@

Diagram

- - - - + + + X1 - - -X1 - -D-Sub - -female - -9-pin - -DCD - -1 - -RX - -2 - -TX - -3 - -DTR - -4 - -GND - -5 - -DSR - -6 - -RTS - -7 - -CTS - -8 - -RI - -9 + + +X1 + +D-Sub + +female + +9-pin + +DCD + +1 + +RX + +2 + +TX + +3 + +DTR + +4 + +GND + +5 + +DSR + +6 + +RTS + +7 + +CTS + +8 + +RI + +9 W1 - - -W1 - -3x - -0.25 mm² - -+ S - -0.2 m -  -X1:5:GND -     1:WH     -X2:1:GND - - - -X1:2:RX -     2:BN     -X2:3:TX - - - -X1:3:TX -     3:GN     -X2:2:RX - - - -  -X1:5:GND -Shield - -  + + +W1 + +3x + +0.25 mm² + ++ S + +0.2 m +  +X1:5:GND +     1:WH     +X2:1:GND + + + +X1:2:RX +     2:BN     +X2:3:TX + + + +X1:3:TX +     3:GN     +X2:2:RX + + + +  +X1:5:GND +Shield + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - + X2 - - -X2 - -Molex KK 254 - -female - -3-pin - -1 - -GND - -2 - -RX - -3 - -TX + + +X2 + +Molex KK 254 + +female + +3-pin + +1 + +GND + +2 + +RX + +3 + +TX W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/examples/demo01.png b/examples/demo01.png index 37bb8ccc..e222137f 100644 Binary files a/examples/demo01.png and b/examples/demo01.png differ diff --git a/examples/demo01.svg b/examples/demo01.svg index bdf17316..6883a86f 100644 --- a/examples/demo01.svg +++ b/examples/demo01.svg @@ -1,172 +1,172 @@ - - - - + + + X1 - - -X1 - -D-Sub - -female - -9-pin - -DCD - -1 - -RX - -2 - -TX - -3 - -DTR - -4 - -GND - -5 - -DSR - -6 - -RTS - -7 - -CTS - -8 - -RI - -9 + + +X1 + +D-Sub + +female + +9-pin + +DCD + +1 + +RX + +2 + +TX + +3 + +DTR + +4 + +GND + +5 + +DSR + +6 + +RTS + +7 + +CTS + +8 + +RI + +9 W1 - - -W1 - -3x - -0.25 mm² - -+ S - -0.2 m -  -X1:5:GND -     1:WH     -X2:1:GND - - - -X1:2:RX -     2:BN     -X2:3:TX - - - -X1:3:TX -     3:GN     -X2:2:RX - - - -  -X1:5:GND -Shield - -  + + +W1 + +3x + +0.25 mm² + ++ S + +0.2 m +  +X1:5:GND +     1:WH     +X2:1:GND + + + +X1:2:RX +     2:BN     +X2:3:TX + + + +X1:3:TX +     3:GN     +X2:2:RX + + + +  +X1:5:GND +Shield + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - + X2 - - -X2 - -Molex KK 254 - -female - -3-pin - -1 - -GND - -2 - -RX - -3 - -TX + + +X2 + +Molex KK 254 + +female + +3-pin + +1 + +GND + +2 + +RX + +3 + +TX W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/examples/demo02.html b/examples/demo02.html index e75ec440..c2bf7b8e 100644 --- a/examples/demo02.html +++ b/examples/demo02.html @@ -188,512 +188,512 @@
- - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -8-pin - -GND - -1 - -+5V - -2 - -SCL - -3 - -SDA - -4 - -MISO - -5 - -MOSI - -6 - -SCK - -7 - -N/C - -8 + + +X1 + +Molex KK 254 + +female + +8-pin + +GND + +1 + ++5V + +2 + +SCL + +3 + +SDA + +4 + +MISO + +5 + +MOSI + +6 + +SCK + +7 + +N/C + +8 W1 - - -W1 - -4x - -0.14 mm² (26 AWG) - -0.2 m -  -X1:1:GND -     BK     -X2:1:GND - - - -X1:2:+5V -     RD     -X2:2:+5V - - - -X1:3:SCL -     YE     -X2:3:SCL - - - -X1:4:SDA -     GN     -X2:4:SDA - - - -  + + +W1 + +4x + +0.14 mm² (26 AWG) + +0.2 m +  +X1:1:GND +     BK     +X2:1:GND + + + +X1:2:+5V +     RD     +X2:2:+5V + + + +X1:3:SCL +     YE     +X2:3:SCL + + + +X1:4:SDA +     GN     +X2:4:SDA + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + W2 - - -W2 - -4x - -0.14 mm² (26 AWG) - -0.4 m -  -X1:1:GND -     BK     -X3:1:GND - - - -X1:2:+5V -     RD     -X3:2:+5V - - - -X1:3:SCL -     YE     -X3:3:SCL - - - -X1:4:SDA -     GN     -X3:4:SDA - - - -  + + +W2 + +4x + +0.14 mm² (26 AWG) + +0.4 m +  +X1:1:GND +     BK     +X3:1:GND + + + +X1:2:+5V +     RD     +X3:2:+5V + + + +X1:3:SCL +     YE     +X3:3:SCL + + + +X1:4:SDA +     GN     +X3:4:SDA + + + +  X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + W3 - - -W3 - -4x - -0.14 mm² (26 AWG) - -0.3 m -  -X1:1:GND -     BK     -X4:1:GND - - - -X1:5:MISO -     BU     -X4:3:MISO - - - -X1:6:MOSI -     OG     -X4:4:MOSI - - - -X1:7:SCK -     VT     -X4:5:SCK - - - -  + + +W3 + +4x + +0.14 mm² (26 AWG) + +0.3 m +  +X1:1:GND +     BK     +X4:1:GND + + + +X1:5:MISO +     BU     +X4:3:MISO + + + +X1:6:MOSI +     OG     +X4:4:MOSI + + + +X1:7:SCK +     VT     +X4:5:SCK + + + +  X1:e--W3:w - - - + + + X1:e--W3:w - - - + + + X1:e--W3:w - - - + + + X1:e--W3:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -+5V - -3 - -SCL - -4 - -SDA + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + ++5V + +3 + +SCL + +4 + +SDA X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -+5V - -3 - -SCL - -4 - -SDA + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + ++5V + +3 + +SCL + +4 + +SDA X4 - - -X4 - -Molex KK 254 - -female - -5-pin - -1 - -GND - -2 - -+12V - -3 - -MISO - -4 - -MOSI - -5 - -SCK + + +X4 + +Molex KK 254 + +female + +5-pin + +1 + +GND + +2 + ++12V + +3 + +MISO + +4 + +MOSI + +5 + +SCK __F_1 - - -Crimp ferrule - -0.25 mm² - -YE - - + + +Crimp ferrule + +0.25 mm² + +YE + + W4 - - -W4 - -2x - -0.25 mm² (24 AWG) - -0.3 m -  -     1:BK     -X4:1:GND - - - -     2:RD     -X4:2:+12V - - - -  + + +W4 + +2x + +0.25 mm² (24 AWG) + +0.3 m +  +     1:BK     +X4:1:GND + + + +     2:RD     +X4:2:+12V + + + +  __F_1:e--W4:w - - - + + + __F_2 - - -Crimp ferrule - -0.25 mm² - -YE - - + + +Crimp ferrule + +0.25 mm² + +YE + + __F_2:e--W4:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + diff --git a/examples/demo02.png b/examples/demo02.png index 2c8bbf82..9b5577e8 100644 Binary files a/examples/demo02.png and b/examples/demo02.png differ diff --git a/examples/demo02.svg b/examples/demo02.svg index b7d9f96d..a219e171 100644 --- a/examples/demo02.svg +++ b/examples/demo02.svg @@ -1,512 +1,512 @@ - - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -8-pin - -GND - -1 - -+5V - -2 - -SCL - -3 - -SDA - -4 - -MISO - -5 - -MOSI - -6 - -SCK - -7 - -N/C - -8 + + +X1 + +Molex KK 254 + +female + +8-pin + +GND + +1 + ++5V + +2 + +SCL + +3 + +SDA + +4 + +MISO + +5 + +MOSI + +6 + +SCK + +7 + +N/C + +8 W1 - - -W1 - -4x - -0.14 mm² (26 AWG) - -0.2 m -  -X1:1:GND -     BK     -X2:1:GND - - - -X1:2:+5V -     RD     -X2:2:+5V - - - -X1:3:SCL -     YE     -X2:3:SCL - - - -X1:4:SDA -     GN     -X2:4:SDA - - - -  + + +W1 + +4x + +0.14 mm² (26 AWG) + +0.2 m +  +X1:1:GND +     BK     +X2:1:GND + + + +X1:2:+5V +     RD     +X2:2:+5V + + + +X1:3:SCL +     YE     +X2:3:SCL + + + +X1:4:SDA +     GN     +X2:4:SDA + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + W2 - - -W2 - -4x - -0.14 mm² (26 AWG) - -0.4 m -  -X1:1:GND -     BK     -X3:1:GND - - - -X1:2:+5V -     RD     -X3:2:+5V - - - -X1:3:SCL -     YE     -X3:3:SCL - - - -X1:4:SDA -     GN     -X3:4:SDA - - - -  + + +W2 + +4x + +0.14 mm² (26 AWG) + +0.4 m +  +X1:1:GND +     BK     +X3:1:GND + + + +X1:2:+5V +     RD     +X3:2:+5V + + + +X1:3:SCL +     YE     +X3:3:SCL + + + +X1:4:SDA +     GN     +X3:4:SDA + + + +  X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + W3 - - -W3 - -4x - -0.14 mm² (26 AWG) - -0.3 m -  -X1:1:GND -     BK     -X4:1:GND - - - -X1:5:MISO -     BU     -X4:3:MISO - - - -X1:6:MOSI -     OG     -X4:4:MOSI - - - -X1:7:SCK -     VT     -X4:5:SCK - - - -  + + +W3 + +4x + +0.14 mm² (26 AWG) + +0.3 m +  +X1:1:GND +     BK     +X4:1:GND + + + +X1:5:MISO +     BU     +X4:3:MISO + + + +X1:6:MOSI +     OG     +X4:4:MOSI + + + +X1:7:SCK +     VT     +X4:5:SCK + + + +  X1:e--W3:w - - - + + + X1:e--W3:w - - - + + + X1:e--W3:w - - - + + + X1:e--W3:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -+5V - -3 - -SCL - -4 - -SDA + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + ++5V + +3 + +SCL + +4 + +SDA X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -+5V - -3 - -SCL - -4 - -SDA + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + ++5V + +3 + +SCL + +4 + +SDA X4 - - -X4 - -Molex KK 254 - -female - -5-pin - -1 - -GND - -2 - -+12V - -3 - -MISO - -4 - -MOSI - -5 - -SCK + + +X4 + +Molex KK 254 + +female + +5-pin + +1 + +GND + +2 + ++12V + +3 + +MISO + +4 + +MOSI + +5 + +SCK __F_1 - - -Crimp ferrule - -0.25 mm² - -YE - - + + +Crimp ferrule + +0.25 mm² + +YE + + W4 - - -W4 - -2x - -0.25 mm² (24 AWG) - -0.3 m -  -     1:BK     -X4:1:GND - - - -     2:RD     -X4:2:+12V - - - -  + + +W4 + +2x + +0.25 mm² (24 AWG) + +0.3 m +  +     1:BK     +X4:1:GND + + + +     2:RD     +X4:2:+12V + + + +  __F_1:e--W4:w - - - + + + __F_2 - - -Crimp ferrule - -0.25 mm² - -YE - - + + +Crimp ferrule + +0.25 mm² + +YE + + __F_2:e--W4:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + diff --git a/examples/ex01.html b/examples/ex01.html index 2cf77f43..f0849756 100644 --- a/examples/ex01.html +++ b/examples/ex01.html @@ -30,178 +30,178 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -RX - -3 - -TX - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 W1 - - -W1 - -Serial - -4x - -0.25 mm² (24 AWG) - -+ S - -0.2 m -  -X1:1:GND -     1:BN     -X2:1:GND - - - -X1:2:VCC -     2:RD     -X2:2:VCC - - - -X1:3:RX -     3:OG     -X2:4:TX - - - -X1:4:TX -     4:YE     -X2:3:RX - - - -  -X1:1:GND -Shield - -  + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  +X1:1:GND +     1:BN     +X2:1:GND + + + +X1:2:VCC +     2:RD     +X2:2:VCC + + + +X1:3:RX +     3:OG     +X2:4:TX + + + +X1:4:TX +     4:YE     +X2:3:RX + + + +  +X1:1:GND +Shield + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -RX - -4 - -TX + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/examples/ex01.png b/examples/ex01.png index 0107a7a9..c97f996e 100644 Binary files a/examples/ex01.png and b/examples/ex01.png differ diff --git a/examples/ex01.svg b/examples/ex01.svg index b1f29cad..7c3940c5 100644 --- a/examples/ex01.svg +++ b/examples/ex01.svg @@ -1,178 +1,178 @@ - - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -RX - -3 - -TX - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 W1 - - -W1 - -Serial - -4x - -0.25 mm² (24 AWG) - -+ S - -0.2 m -  -X1:1:GND -     1:BN     -X2:1:GND - - - -X1:2:VCC -     2:RD     -X2:2:VCC - - - -X1:3:RX -     3:OG     -X2:4:TX - - - -X1:4:TX -     4:YE     -X2:3:RX - - - -  -X1:1:GND -Shield - -  + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  +X1:1:GND +     1:BN     +X2:1:GND + + + +X1:2:VCC +     2:RD     +X2:2:VCC + + + +X1:3:RX +     3:OG     +X2:4:TX + + + +X1:4:TX +     4:YE     +X2:3:RX + + + +  +X1:1:GND +Shield + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -RX - -4 - -TX + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/examples/ex02.html b/examples/ex02.html index 1192c801..452c5560 100644 --- a/examples/ex02.html +++ b/examples/ex02.html @@ -30,261 +30,261 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex Micro-Fit - -male - -2-pin - -GND - -1 - -VCC - -2 + + +X1 + +Molex Micro-Fit + +male + +2-pin + +GND + +1 + +VCC + +2 W1 - - -W1 - -2x - -0.25 mm² (24 AWG) - -0.2 m -  -X1:1:GND -     1:BK     -X2:1:GND - - - -X1:2:VCC -     2:RD     -X2:2:VCC - - - -  + + +W1 + +2x + +0.25 mm² (24 AWG) + +0.2 m +  +X1:1:GND +     1:BK     +X2:1:GND + + + +X1:2:VCC +     2:RD     +X2:2:VCC + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + W2 - - -W2 - -2x - -0.25 mm² (24 AWG) - -0.2 m -  -X1:1:GND -     1:BK     -X3:1:GND - - - -X1:2:VCC -     2:RD     -X3:2:VCC - - - -  + + +W2 + +2x + +0.25 mm² (24 AWG) + +0.2 m +  +X1:1:GND +     1:BK     +X3:1:GND + + + +X1:2:VCC +     2:RD     +X3:2:VCC + + + +  X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + W3 - - -W3 - -2x - -20 AWG (0.75 mm²) - -0.2 m -  -X1:1:GND -     1:BK     -X4:1:GND - - - -X1:2:VCC -     2:RD     -X4:2:VCC - - - -  + + +W3 + +2x + +20 AWG (0.75 mm²) + +0.2 m +  +X1:1:GND +     1:BK     +X4:1:GND + + + +X1:2:VCC +     2:RD     +X4:2:VCC + + + +  X1:e--W3:w - - - + + + X1:e--W3:w - - - + + + X2 - - -X2 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X2 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC X3 - - -X3 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X3 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC X4 - - -X4 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + diff --git a/examples/ex02.png b/examples/ex02.png index c0c7ef9a..e1224b78 100644 Binary files a/examples/ex02.png and b/examples/ex02.png differ diff --git a/examples/ex02.svg b/examples/ex02.svg index 49e7264b..2d7b8adc 100644 --- a/examples/ex02.svg +++ b/examples/ex02.svg @@ -1,261 +1,261 @@ - - - - + + + X1 - - -X1 - -Molex Micro-Fit - -male - -2-pin - -GND - -1 - -VCC - -2 + + +X1 + +Molex Micro-Fit + +male + +2-pin + +GND + +1 + +VCC + +2 W1 - - -W1 - -2x - -0.25 mm² (24 AWG) - -0.2 m -  -X1:1:GND -     1:BK     -X2:1:GND - - - -X1:2:VCC -     2:RD     -X2:2:VCC - - - -  + + +W1 + +2x + +0.25 mm² (24 AWG) + +0.2 m +  +X1:1:GND +     1:BK     +X2:1:GND + + + +X1:2:VCC +     2:RD     +X2:2:VCC + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + W2 - - -W2 - -2x - -0.25 mm² (24 AWG) - -0.2 m -  -X1:1:GND -     1:BK     -X3:1:GND - - - -X1:2:VCC -     2:RD     -X3:2:VCC - - - -  + + +W2 + +2x + +0.25 mm² (24 AWG) + +0.2 m +  +X1:1:GND +     1:BK     +X3:1:GND + + + +X1:2:VCC +     2:RD     +X3:2:VCC + + + +  X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + W3 - - -W3 - -2x - -20 AWG (0.75 mm²) - -0.2 m -  -X1:1:GND -     1:BK     -X4:1:GND - - - -X1:2:VCC -     2:RD     -X4:2:VCC - - - -  + + +W3 + +2x + +20 AWG (0.75 mm²) + +0.2 m +  +X1:1:GND +     1:BK     +X4:1:GND + + + +X1:2:VCC +     2:RD     +X4:2:VCC + + + +  X1:e--W3:w - - - + + + X1:e--W3:w - - - + + + X2 - - -X2 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X2 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC X3 - - -X3 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X3 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC X4 - - -X4 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + diff --git a/examples/ex03.html b/examples/ex03.html index 8151e7a6..4be54e2e 100644 --- a/examples/ex03.html +++ b/examples/ex03.html @@ -30,231 +30,231 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex Micro-Fit - -male - -2-pin - -GND - -1 - -VCC - -2 + + +X1 + +Molex Micro-Fit + +male + +2-pin + +GND + +1 + +VCC + +2 W1 - - -W1 - -6x - -0.25 mm² (24 AWG) - -0.2 m -  -X1:1:GND -     BK     -X2:1:GND - - - -X1:2:VCC -     RD     -X2:2:VCC - - - -X1:1:GND -     BK     -X3:1:GND - - - -X1:2:VCC -     RD     -X3:2:VCC - - - -X1:1:GND -     BK     -X4:1:GND - - - -X1:2:VCC -     RD     -X4:2:VCC - - - -  + + +W1 + +6x + +0.25 mm² (24 AWG) + +0.2 m +  +X1:1:GND +     BK     +X2:1:GND + + + +X1:2:VCC +     RD     +X2:2:VCC + + + +X1:1:GND +     BK     +X3:1:GND + + + +X1:2:VCC +     RD     +X3:2:VCC + + + +X1:1:GND +     BK     +X4:1:GND + + + +X1:2:VCC +     RD     +X4:2:VCC + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X2 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC X3 - - -X3 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X3 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC X4 - - -X4 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X3:w - - - + + + W1:e--X3:w - - - + + + W1:e--X4:w - - - + + + W1:e--X4:w - - - + + + diff --git a/examples/ex03.png b/examples/ex03.png index 7ca8e8f7..e079fa0e 100644 Binary files a/examples/ex03.png and b/examples/ex03.png differ diff --git a/examples/ex03.svg b/examples/ex03.svg index c29e6be3..97c63858 100644 --- a/examples/ex03.svg +++ b/examples/ex03.svg @@ -1,231 +1,231 @@ - - - - + + + X1 - - -X1 - -Molex Micro-Fit - -male - -2-pin - -GND - -1 - -VCC - -2 + + +X1 + +Molex Micro-Fit + +male + +2-pin + +GND + +1 + +VCC + +2 W1 - - -W1 - -6x - -0.25 mm² (24 AWG) - -0.2 m -  -X1:1:GND -     BK     -X2:1:GND - - - -X1:2:VCC -     RD     -X2:2:VCC - - - -X1:1:GND -     BK     -X3:1:GND - - - -X1:2:VCC -     RD     -X3:2:VCC - - - -X1:1:GND -     BK     -X4:1:GND - - - -X1:2:VCC -     RD     -X4:2:VCC - - - -  + + +W1 + +6x + +0.25 mm² (24 AWG) + +0.2 m +  +X1:1:GND +     BK     +X2:1:GND + + + +X1:2:VCC +     RD     +X2:2:VCC + + + +X1:1:GND +     BK     +X3:1:GND + + + +X1:2:VCC +     RD     +X3:2:VCC + + + +X1:1:GND +     BK     +X4:1:GND + + + +X1:2:VCC +     RD     +X4:2:VCC + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X2 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC X3 - - -X3 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X3 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC X4 - - -X4 - -Molex Micro-Fit - -female - -2-pin - -1 - -GND - -2 - -VCC + + +X4 + +Molex Micro-Fit + +female + +2-pin + +1 + +GND + +2 + +VCC W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X3:w - - - + + + W1:e--X3:w - - - + + + W1:e--X4:w - - - + + + W1:e--X4:w - - - + + + diff --git a/examples/ex04.html b/examples/ex04.html index c21e44d8..f2fced2b 100644 --- a/examples/ex04.html +++ b/examples/ex04.html @@ -30,219 +30,219 @@

Diagram

- - - - + + + __F_1 - - -Crimp ferrule + + +Crimp ferrule W1 - - -W1 - -6x - -0.25 mm² (24 AWG) - -0.2 m -  -     BN     - - - -     RD     - - - -     OG     - - - -     YE     - - - -     GN     - - - -     BU     - - - -  + + +W1 + +6x + +0.25 mm² (24 AWG) + +0.2 m +  +     BN     + + + +     RD     + + + +     OG     + + + +     YE     + + + +     GN     + + + +     BU     + + + +  __F_1:e--W1:w - - - + + + __F_2 - - -Crimp ferrule + + +Crimp ferrule __F_2:e--W1:w - - - + + + __F_3 - - -Crimp ferrule + + +Crimp ferrule __F_3:e--W1:w - - - + + + __F_4 - - -Crimp ferrule + + +Crimp ferrule __F_4:e--W1:w - - - + + + __F_5 - - -Crimp ferrule + + +Crimp ferrule __F_5:e--W1:w - - - + + + __F_6 - - -Crimp ferrule + + +Crimp ferrule __F_6:e--W1:w - - - + + + __F_7 - - -Crimp ferrule + + +Crimp ferrule __F_8 - - -Crimp ferrule + + +Crimp ferrule __F_9 - - -Crimp ferrule + + +Crimp ferrule __F_10 - - -Crimp ferrule + + +Crimp ferrule __F_11 - - -Crimp ferrule + + +Crimp ferrule __F_12 - - -Crimp ferrule + + +Crimp ferrule W1:e--__F_7:w - - - + + + W1:e--__F_8:w - - - + + + W1:e--__F_9:w - - - + + + W1:e--__F_10:w - - - + + + W1:e--__F_11:w - - - + + + W1:e--__F_12:w - - - + + + diff --git a/examples/ex04.png b/examples/ex04.png index b9070bb5..601281eb 100644 Binary files a/examples/ex04.png and b/examples/ex04.png differ diff --git a/examples/ex04.svg b/examples/ex04.svg index 922820de..49abe4ee 100644 --- a/examples/ex04.svg +++ b/examples/ex04.svg @@ -1,219 +1,219 @@ - - - - + + + __F_1 - - -Crimp ferrule + + +Crimp ferrule W1 - - -W1 - -6x - -0.25 mm² (24 AWG) - -0.2 m -  -     BN     - - - -     RD     - - - -     OG     - - - -     YE     - - - -     GN     - - - -     BU     - - - -  + + +W1 + +6x + +0.25 mm² (24 AWG) + +0.2 m +  +     BN     + + + +     RD     + + + +     OG     + + + +     YE     + + + +     GN     + + + +     BU     + + + +  __F_1:e--W1:w - - - + + + __F_2 - - -Crimp ferrule + + +Crimp ferrule __F_2:e--W1:w - - - + + + __F_3 - - -Crimp ferrule + + +Crimp ferrule __F_3:e--W1:w - - - + + + __F_4 - - -Crimp ferrule + + +Crimp ferrule __F_4:e--W1:w - - - + + + __F_5 - - -Crimp ferrule + + +Crimp ferrule __F_5:e--W1:w - - - + + + __F_6 - - -Crimp ferrule + + +Crimp ferrule __F_6:e--W1:w - - - + + + __F_7 - - -Crimp ferrule + + +Crimp ferrule __F_8 - - -Crimp ferrule + + +Crimp ferrule __F_9 - - -Crimp ferrule + + +Crimp ferrule __F_10 - - -Crimp ferrule + + +Crimp ferrule __F_11 - - -Crimp ferrule + + +Crimp ferrule __F_12 - - -Crimp ferrule + + +Crimp ferrule W1:e--__F_7:w - - - + + + W1:e--__F_8:w - - - + + + W1:e--__F_9:w - - - + + + W1:e--__F_10:w - - - + + + W1:e--__F_11:w - - - + + + W1:e--__F_12:w - - - + + + diff --git a/examples/ex05.html b/examples/ex05.html index 838a7761..aef6779e 100644 --- a/examples/ex05.html +++ b/examples/ex05.html @@ -30,301 +30,301 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W1 - - -W1 - -I2C - -4x - -0.25 mm² - -0.2 m -  -X1:1:GND -     PK     -X2:1:GND - - - -X1:2:VCC -     TQ     -X2:2:VCC - - - -X1:3:SCL -     YE     -X2:3:SCL - - - -X1:4:SDA -     VT     -X2:4:SDA - - - -  + + +W1 + +I2C + +4x + +0.25 mm² + +0.2 m +  +X1:1:GND +     PK     +X2:1:GND + + + +X1:2:VCC +     TQ     +X2:2:VCC + + + +X1:3:SCL +     YE     +X2:3:SCL + + + +X1:4:SDA +     VT     +X2:4:SDA + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -1 - -2 - -VCC - -2 - -3 - -SCL - -3 - -4 - -SDA - -4 + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +1 + +2 + +VCC + +2 + +3 + +SCL + +3 + +4 + +SDA + +4 W2 - - -W2 - -I2C - -4x - -0.25 mm² - -0.2 m -  -X2:1:GND -     PK     -X3:1:GND - - - -X2:2:VCC -     TQ     -X3:2:VCC - - - -X2:3:SCL -     YE     -X3:3:SCL - - - -X2:4:SDA -     VT     -X3:4:SDA - - - -  + + +W2 + +I2C + +4x + +0.25 mm² + +0.2 m +  +X2:1:GND +     PK     +X3:1:GND + + + +X2:2:VCC +     TQ     +X3:2:VCC + + + +X2:3:SCL +     YE     +X3:3:SCL + + + +X2:4:SDA +     VT     +X3:4:SDA + + + +  X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + diff --git a/examples/ex05.png b/examples/ex05.png index 3a51a73e..82db4c13 100644 Binary files a/examples/ex05.png and b/examples/ex05.png differ diff --git a/examples/ex05.svg b/examples/ex05.svg index 5fd5bd58..1844bed6 100644 --- a/examples/ex05.svg +++ b/examples/ex05.svg @@ -1,301 +1,301 @@ - - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W1 - - -W1 - -I2C - -4x - -0.25 mm² - -0.2 m -  -X1:1:GND -     PK     -X2:1:GND - - - -X1:2:VCC -     TQ     -X2:2:VCC - - - -X1:3:SCL -     YE     -X2:3:SCL - - - -X1:4:SDA -     VT     -X2:4:SDA - - - -  + + +W1 + +I2C + +4x + +0.25 mm² + +0.2 m +  +X1:1:GND +     PK     +X2:1:GND + + + +X1:2:VCC +     TQ     +X2:2:VCC + + + +X1:3:SCL +     YE     +X2:3:SCL + + + +X1:4:SDA +     VT     +X2:4:SDA + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -1 - -2 - -VCC - -2 - -3 - -SCL - -3 - -4 - -SDA - -4 + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +1 + +2 + +VCC + +2 + +3 + +SCL + +3 + +4 + +SDA + +4 W2 - - -W2 - -I2C - -4x - -0.25 mm² - -0.2 m -  -X2:1:GND -     PK     -X3:1:GND - - - -X2:2:VCC -     TQ     -X3:2:VCC - - - -X2:3:SCL -     YE     -X3:3:SCL - - - -X2:4:SDA -     VT     -X3:4:SDA - - - -  + + +W2 + +I2C + +4x + +0.25 mm² + +0.2 m +  +X2:1:GND +     PK     +X3:1:GND + + + +X2:2:VCC +     TQ     +X3:2:VCC + + + +X2:3:SCL +     YE     +X3:3:SCL + + + +X2:4:SDA +     VT     +X3:4:SDA + + + +  X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + diff --git a/examples/ex06.html b/examples/ex06.html index af4dc8e1..af0fcb71 100644 --- a/examples/ex06.html +++ b/examples/ex06.html @@ -30,661 +30,661 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W1 - - -W1 - -4x - -0.25 mm² - -0.2 m -  -X1:1:GND -     PK     -X2:1:GND - - - -X1:2:VCC -     TQ     -X2:2:VCC - - - -X1:3:SCL -     YE     -X2:3:SCL - - - -X1:4:SDA -     VT     -X2:4:SDA - - - -  + + +W1 + +4x + +0.25 mm² + +0.2 m +  +X1:1:GND +     PK     +X2:1:GND + + + +X1:2:VCC +     TQ     +X2:2:VCC + + + +X1:3:SCL +     YE     +X2:3:SCL + + + +X1:4:SDA +     VT     +X2:4:SDA + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X3 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W2 - - -W2 - -4x - -0.25 mm² - -0.2 m -  -X3:1:GND -     PK     -X2:1:GND - - - -X3:2:VCC -     TQ     -X2:2:VCC - - - -X3:3:SCL -     YE     -X2:3:SCL - - - -X3:4:SDA -     VT     -X2:4:SDA - - - -  + + +W2 + +4x + +0.25 mm² + +0.2 m +  +X3:1:GND +     PK     +X2:1:GND + + + +X3:2:VCC +     TQ     +X2:2:VCC + + + +X3:3:SCL +     YE     +X2:3:SCL + + + +X3:4:SDA +     VT     +X2:4:SDA + + + +  X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + W3 - - -W3 - -4x - -0.25 mm² - -0.2 m -  -X3:1:GND -     PK     -X4:1:GND - - - -X3:2:VCC -     TQ     -X4:2:VCC - - - -X3:3:SCL -     YE     -X4:3:SCL - - - -X3:4:SDA -     VT     -X4:4:SDA - - - -  + + +W3 + +4x + +0.25 mm² + +0.2 m +  +X3:1:GND +     PK     +X4:1:GND + + + +X3:2:VCC +     TQ     +X4:2:VCC + + + +X3:3:SCL +     YE     +X4:3:SCL + + + +X3:4:SDA +     VT     +X4:4:SDA + + + +  X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X4 - - -X4 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X4 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA X5 - - -X5 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X5 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W4 - - -W4 - -4x - -0.25 mm² - -0.2 m -  -X5:1:GND -     PK     -X4:1:GND - - - -X5:2:VCC -     TQ     -X4:2:VCC - - - -X5:3:SCL -     YE     -X4:3:SCL - - - -X5:4:SDA -     VT     -X4:4:SDA - - - -  + + +W4 + +4x + +0.25 mm² + +0.2 m +  +X5:1:GND +     PK     +X4:1:GND + + + +X5:2:VCC +     TQ     +X4:2:VCC + + + +X5:3:SCL +     YE     +X4:3:SCL + + + +X5:4:SDA +     VT     +X4:4:SDA + + + +  X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + W5 - - -W5 - -4x - -0.25 mm² - -0.2 m -  -X5:1:GND -     PK     -X6:1:GND - - - -X5:2:VCC -     TQ     -X6:2:VCC - - - -X5:3:SCL -     YE     -X6:3:SCL - - - -X5:4:SDA -     VT     -X6:4:SDA - - - -  + + +W5 + +4x + +0.25 mm² + +0.2 m +  +X5:1:GND +     PK     +X6:1:GND + + + +X5:2:VCC +     TQ     +X6:2:VCC + + + +X5:3:SCL +     YE     +X6:3:SCL + + + +X5:4:SDA +     VT     +X6:4:SDA + + + +  X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X6 - - -X6 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X6 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + diff --git a/examples/ex06.png b/examples/ex06.png index 61fa0cdb..7b4a6184 100644 Binary files a/examples/ex06.png and b/examples/ex06.png differ diff --git a/examples/ex06.svg b/examples/ex06.svg index 3f39a1f8..30edde48 100644 --- a/examples/ex06.svg +++ b/examples/ex06.svg @@ -1,661 +1,661 @@ - - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W1 - - -W1 - -4x - -0.25 mm² - -0.2 m -  -X1:1:GND -     PK     -X2:1:GND - - - -X1:2:VCC -     TQ     -X2:2:VCC - - - -X1:3:SCL -     YE     -X2:3:SCL - - - -X1:4:SDA -     VT     -X2:4:SDA - - - -  + + +W1 + +4x + +0.25 mm² + +0.2 m +  +X1:1:GND +     PK     +X2:1:GND + + + +X1:2:VCC +     TQ     +X2:2:VCC + + + +X1:3:SCL +     YE     +X2:3:SCL + + + +X1:4:SDA +     VT     +X2:4:SDA + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X3 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W2 - - -W2 - -4x - -0.25 mm² - -0.2 m -  -X3:1:GND -     PK     -X2:1:GND - - - -X3:2:VCC -     TQ     -X2:2:VCC - - - -X3:3:SCL -     YE     -X2:3:SCL - - - -X3:4:SDA -     VT     -X2:4:SDA - - - -  + + +W2 + +4x + +0.25 mm² + +0.2 m +  +X3:1:GND +     PK     +X2:1:GND + + + +X3:2:VCC +     TQ     +X2:2:VCC + + + +X3:3:SCL +     YE     +X2:3:SCL + + + +X3:4:SDA +     VT     +X2:4:SDA + + + +  X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + W3 - - -W3 - -4x - -0.25 mm² - -0.2 m -  -X3:1:GND -     PK     -X4:1:GND - - - -X3:2:VCC -     TQ     -X4:2:VCC - - - -X3:3:SCL -     YE     -X4:3:SCL - - - -X3:4:SDA -     VT     -X4:4:SDA - - - -  + + +W3 + +4x + +0.25 mm² + +0.2 m +  +X3:1:GND +     PK     +X4:1:GND + + + +X3:2:VCC +     TQ     +X4:2:VCC + + + +X3:3:SCL +     YE     +X4:3:SCL + + + +X3:4:SDA +     VT     +X4:4:SDA + + + +  X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X4 - - -X4 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X4 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA X5 - - -X5 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X5 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W4 - - -W4 - -4x - -0.25 mm² - -0.2 m -  -X5:1:GND -     PK     -X4:1:GND - - - -X5:2:VCC -     TQ     -X4:2:VCC - - - -X5:3:SCL -     YE     -X4:3:SCL - - - -X5:4:SDA -     VT     -X4:4:SDA - - - -  + + +W4 + +4x + +0.25 mm² + +0.2 m +  +X5:1:GND +     PK     +X4:1:GND + + + +X5:2:VCC +     TQ     +X4:2:VCC + + + +X5:3:SCL +     YE     +X4:3:SCL + + + +X5:4:SDA +     VT     +X4:4:SDA + + + +  X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + W5 - - -W5 - -4x - -0.25 mm² - -0.2 m -  -X5:1:GND -     PK     -X6:1:GND - - - -X5:2:VCC -     TQ     -X6:2:VCC - - - -X5:3:SCL -     YE     -X6:3:SCL - - - -X5:4:SDA -     VT     -X6:4:SDA - - - -  + + +W5 + +4x + +0.25 mm² + +0.2 m +  +X5:1:GND +     PK     +X6:1:GND + + + +X5:2:VCC +     TQ     +X6:2:VCC + + + +X5:3:SCL +     YE     +X6:3:SCL + + + +X5:4:SDA +     VT     +X6:4:SDA + + + +  X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X6 - - -X6 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X6 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + diff --git a/examples/ex07.html b/examples/ex07.html index 37ddedea..f8577d8f 100644 --- a/examples/ex07.html +++ b/examples/ex07.html @@ -30,105 +30,105 @@

Diagram

- - - - + + + X1 - - -X1 - -TE 776164-1 - -female - -35-pin - -5 - -6 - -Unconnected pins are not shown + + +X1 + +TE 776164-1 + +female + +35-pin + +5 + +6 + +Unconnected pins are not shown C1 - - -C1 - -2x - -20 AWG - -1 m -  -X1:5 -     1:YE     -X2:7 - - - -X1:6 -     2:GN     -X2:2 - - - -  + + +C1 + +2x + +20 AWG + +1 m +  +X1:5 +     1:YE     +X2:7 + + + +X1:6 +     2:GN     +X2:2 + + + +  X1:e--C1:w - - - + + + X1:e--C1:w - - - + + + X2 - - -X2 - -D-Sub - -female - -9-pin - -2 - -7 - -Unconnected pins are not shown + + +X2 + +D-Sub + +female + +9-pin + +2 + +7 + +Unconnected pins are not shown C1:e--X2:w - - - + + + C1:e--X2:w - - - + + + diff --git a/examples/ex07.png b/examples/ex07.png index 060a1acc..16c48500 100644 Binary files a/examples/ex07.png and b/examples/ex07.png differ diff --git a/examples/ex07.svg b/examples/ex07.svg index 90d1dd47..970a4832 100644 --- a/examples/ex07.svg +++ b/examples/ex07.svg @@ -1,105 +1,105 @@ - - - - + + + X1 - - -X1 - -TE 776164-1 - -female - -35-pin - -5 - -6 - -Unconnected pins are not shown + + +X1 + +TE 776164-1 + +female + +35-pin + +5 + +6 + +Unconnected pins are not shown C1 - - -C1 - -2x - -20 AWG - -1 m -  -X1:5 -     1:YE     -X2:7 - - - -X1:6 -     2:GN     -X2:2 - - - -  + + +C1 + +2x + +20 AWG + +1 m +  +X1:5 +     1:YE     +X2:7 + + + +X1:6 +     2:GN     +X2:2 + + + +  X1:e--C1:w - - - + + + X1:e--C1:w - - - + + + X2 - - -X2 - -D-Sub - -female - -9-pin - -2 - -7 - -Unconnected pins are not shown + + +X2 + +D-Sub + +female + +9-pin + +2 + +7 + +Unconnected pins are not shown C1:e--X2:w - - - + + + C1:e--X2:w - - - + + + diff --git a/examples/ex08.html b/examples/ex08.html index f2020e33..30a50076 100644 --- a/examples/ex08.html +++ b/examples/ex08.html @@ -30,113 +30,113 @@

Diagram

- - - - + + + Key - - -Key - -Phone Connector - -male 3.5 - -Dot - -T - -Dash - -R - -Ground - -S - - - -Tip, Ring, and Sleeve + + +Key + +Phone Connector + +male 3.5 + +Dot + +T + +Dash + +R + +Ground + +S + + + +Tip, Ring, and Sleeve W1 - - -W1 - -3x - -24 AWG - -+ S - -0.2 m - -BK - - -  -Key:S:Ground -     1:WH     - - - -Key:R:Dash -     2:BN     - - - -Key:T:Dot -     3:GN     - - - -  -Key:S:Ground -Shield - - - -  - - - -Cross-section + + +W1 + +3x + +24 AWG + ++ S + +0.2 m + +BK + + +  +Key:S:Ground +     1:WH     + + + +Key:R:Dash +     2:BN     + + + +Key:T:Dot +     3:GN     + + + +  +Key:S:Ground +Shield + + + +  + + + +Cross-section Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + diff --git a/examples/ex08.png b/examples/ex08.png index 40db822f..09cac135 100644 Binary files a/examples/ex08.png and b/examples/ex08.png differ diff --git a/examples/ex08.svg b/examples/ex08.svg index d79a129e..a196465a 100644 --- a/examples/ex08.svg +++ b/examples/ex08.svg @@ -1,113 +1,113 @@ - - - - + + + Key - - -Key - -Phone Connector - -male 3.5 - -Dot - -T - -Dash - -R - -Ground - -S - - - -Tip, Ring, and Sleeve + + +Key + +Phone Connector + +male 3.5 + +Dot + +T + +Dash + +R + +Ground + +S + + + +Tip, Ring, and Sleeve W1 - - -W1 - -3x - -24 AWG - -+ S - -0.2 m - -BK - - -  -Key:S:Ground -     1:WH     - - - -Key:R:Dash -     2:BN     - - - -Key:T:Dot -     3:GN     - - - -  -Key:S:Ground -Shield - - - -  - - - -Cross-section + + +W1 + +3x + +24 AWG + ++ S + +0.2 m + +BK + + +  +Key:S:Ground +     1:WH     + + + +Key:R:Dash +     2:BN     + + + +Key:T:Dot +     3:GN     + + + +  +Key:S:Ground +Shield + + + +  + + + +Cross-section Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + Key:e--W1:w - - - + + + diff --git a/examples/ex09.html b/examples/ex09.html index 78b0d917..cd41baf3 100644 --- a/examples/ex09.html +++ b/examples/ex09.html @@ -30,524 +30,524 @@

Diagram

- - - - + + + X1 - - -X1 - -D-Sub - -male - -25-pin - -SENSE_P_1 - -1 - -SENSE_N_1 - -14 - -SENSE_P_2 - -3 - -SENSE_N_2 - -16 - -SENSE_P_3 - -5 - -SENSE_N_3 - -18 - -SENSE_P_4 - -7 - -SENSE_N_4 - -20 - -SENSE_P_5 - -9 - -SENSE_N_5 - -22 - -SENSE_P_6 - -11 - -SENSE_N_6 - -24 - -GND - -13 + + +X1 + +D-Sub + +male + +25-pin + +SENSE_P_1 + +1 + +SENSE_N_1 + +14 + +SENSE_P_2 + +3 + +SENSE_N_2 + +16 + +SENSE_P_3 + +5 + +SENSE_N_3 + +18 + +SENSE_P_4 + +7 + +SENSE_N_4 + +20 + +SENSE_P_5 + +9 + +SENSE_N_5 + +22 + +SENSE_P_6 + +11 + +SENSE_N_6 + +24 + +GND + +13 W1 - - -W1 - -12x - -0.25 mm² - -+ S - -0.2 m -  -X1:14:SENSE_N_1 -     1:WH     -X2:z2 - - - - - -X1:1:SENSE_P_1 -     2:BN     -X2:d4 - - - - - -X1:16:SENSE_N_2 -     3:GN     -X2:z8 - - - - - -X1:3:SENSE_P_2 -     4:YE     -X2:d10 - - - - - -X1:18:SENSE_N_3 -     5:GY     -X2:z14 - - - - - -X1:5:SENSE_P_3 -     6:PK     -X2:d16 - - - - - -X1:20:SENSE_N_4 -     7:BU     -X2:z18 - - - - - -X1:7:SENSE_P_4 -     8:RD     -X2:d20 - - - - - -X1:22:SENSE_N_5 -     9:BK     -X2:z24 - - - - - -X1:9:SENSE_P_5 -     10:VT     -X2:d26 - - - - - -X1:24:SENSE_N_6 -     11:GYPK     -X2:z30 - - - - - -X1:11:SENSE_P_6 -     12:RDBU     -X2:d32 - - - - - -  -X1:13:GND -Shield - -  + + +W1 + +12x + +0.25 mm² + ++ S + +0.2 m +  +X1:14:SENSE_N_1 +     1:WH     +X2:z2 + + + + + +X1:1:SENSE_P_1 +     2:BN     +X2:d4 + + + + + +X1:16:SENSE_N_2 +     3:GN     +X2:z8 + + + + + +X1:3:SENSE_P_2 +     4:YE     +X2:d10 + + + + + +X1:18:SENSE_N_3 +     5:GY     +X2:z14 + + + + + +X1:5:SENSE_P_3 +     6:PK     +X2:d16 + + + + + +X1:20:SENSE_N_4 +     7:BU     +X2:z18 + + + + + +X1:7:SENSE_P_4 +     8:RD     +X2:d20 + + + + + +X1:22:SENSE_N_5 +     9:BK     +X2:z24 + + + + + +X1:9:SENSE_P_5 +     10:VT     +X2:d26 + + + + + +X1:24:SENSE_N_6 +     11:GYPK     +X2:z30 + + + + + +X1:11:SENSE_P_6 +     12:RDBU     +X2:d32 + + + + + +  +X1:13:GND +Shield + +  X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - + X2 - - -X2 - -F48 - -female - -48-pin - -z2 - -b2 - -d2 - -z4 - -b4 - -d4 - -z6 - -b6 - -d6 - -z8 - -b8 - -d8 - -z10 - -b10 - -d10 - -z12 - -b12 - -d12 - -z14 - -b14 - -d14 - -z16 - -b16 - -d16 - -z18 - -b18 - -d18 - -z20 - -b20 - -d20 - -z22 - -b22 - -d22 - -z24 - -b24 - -d24 - -z26 - -b26 - -d26 - -z28 - -b28 - -d28 - -z30 - -b30 - -d30 - -z32 - -b32 - -d32 + + +X2 + +F48 + +female + +48-pin + +z2 + +b2 + +d2 + +z4 + +b4 + +d4 + +z6 + +b6 + +d6 + +z8 + +b8 + +d8 + +z10 + +b10 + +d10 + +z12 + +b12 + +d12 + +z14 + +b14 + +d14 + +z16 + +b16 + +d16 + +z18 + +b18 + +d18 + +z20 + +b20 + +d20 + +z22 + +b22 + +d22 + +z24 + +b24 + +d24 + +z26 + +b26 + +d26 + +z28 + +b28 + +d28 + +z30 + +b30 + +d30 + +z32 + +b32 + +d32 W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + diff --git a/examples/ex09.png b/examples/ex09.png index beb2f735..d9bfc575 100644 Binary files a/examples/ex09.png and b/examples/ex09.png differ diff --git a/examples/ex09.svg b/examples/ex09.svg index d3644420..9a9f8321 100644 --- a/examples/ex09.svg +++ b/examples/ex09.svg @@ -1,524 +1,524 @@ - - - - + + + X1 - - -X1 - -D-Sub - -male - -25-pin - -SENSE_P_1 - -1 - -SENSE_N_1 - -14 - -SENSE_P_2 - -3 - -SENSE_N_2 - -16 - -SENSE_P_3 - -5 - -SENSE_N_3 - -18 - -SENSE_P_4 - -7 - -SENSE_N_4 - -20 - -SENSE_P_5 - -9 - -SENSE_N_5 - -22 - -SENSE_P_6 - -11 - -SENSE_N_6 - -24 - -GND - -13 + + +X1 + +D-Sub + +male + +25-pin + +SENSE_P_1 + +1 + +SENSE_N_1 + +14 + +SENSE_P_2 + +3 + +SENSE_N_2 + +16 + +SENSE_P_3 + +5 + +SENSE_N_3 + +18 + +SENSE_P_4 + +7 + +SENSE_N_4 + +20 + +SENSE_P_5 + +9 + +SENSE_N_5 + +22 + +SENSE_P_6 + +11 + +SENSE_N_6 + +24 + +GND + +13 W1 - - -W1 - -12x - -0.25 mm² - -+ S - -0.2 m -  -X1:14:SENSE_N_1 -     1:WH     -X2:z2 - - - - - -X1:1:SENSE_P_1 -     2:BN     -X2:d4 - - - - - -X1:16:SENSE_N_2 -     3:GN     -X2:z8 - - - - - -X1:3:SENSE_P_2 -     4:YE     -X2:d10 - - - - - -X1:18:SENSE_N_3 -     5:GY     -X2:z14 - - - - - -X1:5:SENSE_P_3 -     6:PK     -X2:d16 - - - - - -X1:20:SENSE_N_4 -     7:BU     -X2:z18 - - - - - -X1:7:SENSE_P_4 -     8:RD     -X2:d20 - - - - - -X1:22:SENSE_N_5 -     9:BK     -X2:z24 - - - - - -X1:9:SENSE_P_5 -     10:VT     -X2:d26 - - - - - -X1:24:SENSE_N_6 -     11:GYPK     -X2:z30 - - - - - -X1:11:SENSE_P_6 -     12:RDBU     -X2:d32 - - - - - -  -X1:13:GND -Shield - -  + + +W1 + +12x + +0.25 mm² + ++ S + +0.2 m +  +X1:14:SENSE_N_1 +     1:WH     +X2:z2 + + + + + +X1:1:SENSE_P_1 +     2:BN     +X2:d4 + + + + + +X1:16:SENSE_N_2 +     3:GN     +X2:z8 + + + + + +X1:3:SENSE_P_2 +     4:YE     +X2:d10 + + + + + +X1:18:SENSE_N_3 +     5:GY     +X2:z14 + + + + + +X1:5:SENSE_P_3 +     6:PK     +X2:d16 + + + + + +X1:20:SENSE_N_4 +     7:BU     +X2:z18 + + + + + +X1:7:SENSE_P_4 +     8:RD     +X2:d20 + + + + + +X1:22:SENSE_N_5 +     9:BK     +X2:z24 + + + + + +X1:9:SENSE_P_5 +     10:VT     +X2:d26 + + + + + +X1:24:SENSE_N_6 +     11:GYPK     +X2:z30 + + + + + +X1:11:SENSE_P_6 +     12:RDBU     +X2:d32 + + + + + +  +X1:13:GND +Shield + +  X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - + X2 - - -X2 - -F48 - -female - -48-pin - -z2 - -b2 - -d2 - -z4 - -b4 - -d4 - -z6 - -b6 - -d6 - -z8 - -b8 - -d8 - -z10 - -b10 - -d10 - -z12 - -b12 - -d12 - -z14 - -b14 - -d14 - -z16 - -b16 - -d16 - -z18 - -b18 - -d18 - -z20 - -b20 - -d20 - -z22 - -b22 - -d22 - -z24 - -b24 - -d24 - -z26 - -b26 - -d26 - -z28 - -b28 - -d28 - -z30 - -b30 - -d30 - -z32 - -b32 - -d32 + + +X2 + +F48 + +female + +48-pin + +z2 + +b2 + +d2 + +z4 + +b4 + +d4 + +z6 + +b6 + +d6 + +z8 + +b8 + +d8 + +z10 + +b10 + +d10 + +z12 + +b12 + +d12 + +z14 + +b14 + +d14 + +z16 + +b16 + +d16 + +z18 + +b18 + +d18 + +z20 + +b20 + +d20 + +z22 + +b22 + +d22 + +z24 + +b24 + +d24 + +z26 + +b26 + +d26 + +z28 + +b28 + +d28 + +z30 + +b30 + +d30 + +z32 + +b32 + +d32 W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + diff --git a/examples/ex10.html b/examples/ex10.html index b7b7cfc2..3dfcd66f 100644 --- a/examples/ex10.html +++ b/examples/ex10.html @@ -30,327 +30,327 @@

Diagram

- - - - + + + X1 - - -X1 - -Stewart Connector SS-37000-002 - -male - -8-pin - -DA+ - -1 - -DA- - -2 - -DB+ - -3 - -DC+ - -4 - -DC- - -5 - -DB- - -6 - -DD+ - -7 - -DD- - -8 + + +X1 + +Stewart Connector SS-37000-002 + +male + +8-pin + +DA+ + +1 + +DA- + +2 + +DB+ + +3 + +DC+ + +4 + +DC- + +5 + +DB- + +6 + +DD+ + +7 + +DD- + +8 W1 - - -W1 - -CAT5e - -8x - -24 AWG - -1 m -  -X1:1:DA+ -     1:WHGN     -X2:3:DA+ - - - - - -X1:2:DA- -     2:GN     -X2:6:DA- - - - - - -X1:3:DB+ -     3:WHOG     -X2:1:DB+ - - - - - -X1:4:DC+ -     4:BU     -X2:7:DC+ - - - - - -X1:5:DC- -     5:WHBU     -X2:8:DC- - - - - - -X1:6:DB- -     6:OG     -X2:2:DB- - - - - - -X1:7:DD+ -     7:WHBN     -X2:4:DD+ - - - - - -X1:8:DD- -     8:BN     -X2:5:DD- - - - - - -  + + +W1 + +CAT5e + +8x + +24 AWG + +1 m +  +X1:1:DA+ +     1:WHGN     +X2:3:DA+ + + + + + +X1:2:DA- +     2:GN     +X2:6:DA- + + + + + +X1:3:DB+ +     3:WHOG     +X2:1:DB+ + + + + + +X1:4:DC+ +     4:BU     +X2:7:DC+ + + + + + +X1:5:DC- +     5:WHBU     +X2:8:DC- + + + + + +X1:6:DB- +     6:OG     +X2:2:DB- + + + + + +X1:7:DD+ +     7:WHBN     +X2:4:DD+ + + + + + +X1:8:DD- +     8:BN     +X2:5:DD- + + + + + +  X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X2 - - -X2 - -Stewart Connector SS-37000-002 - -male - -8-pin - -1 - -DB+ - -2 - -DB- - -3 - -DA+ - -4 - -DD+ - -5 - -DD- - -6 - -DA- - -7 - -DC+ - -8 - -DC- + + +X2 + +Stewart Connector SS-37000-002 + +male + +8-pin + +1 + +DB+ + +2 + +DB- + +3 + +DA+ + +4 + +DD+ + +5 + +DD- + +6 + +DA- + +7 + +DC+ + +8 + +DC- W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + diff --git a/examples/ex10.png b/examples/ex10.png index 4170ffd1..dfd45772 100644 Binary files a/examples/ex10.png and b/examples/ex10.png differ diff --git a/examples/ex10.svg b/examples/ex10.svg index 829aa82d..4158b29b 100644 --- a/examples/ex10.svg +++ b/examples/ex10.svg @@ -1,327 +1,327 @@ - - - - + + + X1 - - -X1 - -Stewart Connector SS-37000-002 - -male - -8-pin - -DA+ - -1 - -DA- - -2 - -DB+ - -3 - -DC+ - -4 - -DC- - -5 - -DB- - -6 - -DD+ - -7 - -DD- - -8 + + +X1 + +Stewart Connector SS-37000-002 + +male + +8-pin + +DA+ + +1 + +DA- + +2 + +DB+ + +3 + +DC+ + +4 + +DC- + +5 + +DB- + +6 + +DD+ + +7 + +DD- + +8 W1 - - -W1 - -CAT5e - -8x - -24 AWG - -1 m -  -X1:1:DA+ -     1:WHGN     -X2:3:DA+ - - - - - -X1:2:DA- -     2:GN     -X2:6:DA- - - - - - -X1:3:DB+ -     3:WHOG     -X2:1:DB+ - - - - - -X1:4:DC+ -     4:BU     -X2:7:DC+ - - - - - -X1:5:DC- -     5:WHBU     -X2:8:DC- - - - - - -X1:6:DB- -     6:OG     -X2:2:DB- - - - - - -X1:7:DD+ -     7:WHBN     -X2:4:DD+ - - - - - -X1:8:DD- -     8:BN     -X2:5:DD- - - - - - -  + + +W1 + +CAT5e + +8x + +24 AWG + +1 m +  +X1:1:DA+ +     1:WHGN     +X2:3:DA+ + + + + + +X1:2:DA- +     2:GN     +X2:6:DA- + + + + + +X1:3:DB+ +     3:WHOG     +X2:1:DB+ + + + + + +X1:4:DC+ +     4:BU     +X2:7:DC+ + + + + + +X1:5:DC- +     5:WHBU     +X2:8:DC- + + + + + +X1:6:DB- +     6:OG     +X2:2:DB- + + + + + +X1:7:DD+ +     7:WHBN     +X2:4:DD+ + + + + + +X1:8:DD- +     8:BN     +X2:5:DD- + + + + + +  X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X1:e--W1:w - - - - - + + + + + X2 - - -X2 - -Stewart Connector SS-37000-002 - -male - -8-pin - -1 - -DB+ - -2 - -DB- - -3 - -DA+ - -4 - -DD+ - -5 - -DD- - -6 - -DA- - -7 - -DC+ - -8 - -DC- + + +X2 + +Stewart Connector SS-37000-002 + +male + +8-pin + +1 + +DB+ + +2 + +DB- + +3 + +DA+ + +4 + +DD+ + +5 + +DD- + +6 + +DA- + +7 + +DC+ + +8 + +DC- W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + W1:e--X2:w - - - - - + + + + + diff --git a/examples/ex11.html b/examples/ex11.html index 227915cc..98b974f4 100644 --- a/examples/ex11.html +++ b/examples/ex11.html @@ -30,172 +30,172 @@

Diagram

- - - - + + + __F_1 - - -Ferrule - -GY - - + + +Ferrule + +GY + + X1 - - -X1 - -Screw connector - -male - -4-pin - -GN - - - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + +X1 + +Screw connector + +male + +4-pin + +GN + + + +1 + +A + +2 + +B + +3 + +C + +4 + +D __F_1:e--X1:w - - + + __F_2 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_2:e--X1:w - - + + __F_3 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_3:e--X1:w - - + + __F_4 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_4:e--X1:w - - + + W1 - - -W1 - -4x - -BK - - -  -     1:BK     - - - -     2:WH     - - - -     3:BU     - - - -     4:BN     - - - -  + + +W1 + +4x + +BK + + +  +     1:BK     + + + +     2:WH     + + + +     3:BU     + + + +     4:BN     + + + +  W1:e--__F_1:w - - - + + + W1:e--__F_2:w - - - + + + W1:e--__F_3:w - - - + + + W1:e--__F_4:w - - - + + + diff --git a/examples/ex11.png b/examples/ex11.png index 780a36ad..ce4bc425 100644 Binary files a/examples/ex11.png and b/examples/ex11.png differ diff --git a/examples/ex11.svg b/examples/ex11.svg index 4cf5c71f..5ab1d799 100644 --- a/examples/ex11.svg +++ b/examples/ex11.svg @@ -1,172 +1,172 @@ - - - - + + + __F_1 - - -Ferrule - -GY - - + + +Ferrule + +GY + + X1 - - -X1 - -Screw connector - -male - -4-pin - -GN - - - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + +X1 + +Screw connector + +male + +4-pin + +GN + + + +1 + +A + +2 + +B + +3 + +C + +4 + +D __F_1:e--X1:w - - + + __F_2 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_2:e--X1:w - - + + __F_3 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_3:e--X1:w - - + + __F_4 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_4:e--X1:w - - + + W1 - - -W1 - -4x - -BK - - -  -     1:BK     - - - -     2:WH     - - - -     3:BU     - - - -     4:BN     - - - -  + + +W1 + +4x + +BK + + +  +     1:BK     + + + +     2:WH     + + + +     3:BU     + + + +     4:BN     + + + +  W1:e--__F_1:w - - - + + + W1:e--__F_2:w - - - + + + W1:e--__F_3:w - - - + + + W1:e--__F_4:w - - - + + + diff --git a/examples/ex12.html b/examples/ex12.html index dcf847ce..12c1d034 100644 --- a/examples/ex12.html +++ b/examples/ex12.html @@ -30,195 +30,195 @@

Diagram

- - - - + + + X1 - - -X1 - -Dupont 2.54mm - -male - -5-pin - -BK - - - -1 - -2 - -3 - -4 - -5 + + +X1 + +Dupont 2.54mm + +male + +5-pin + +BK + + + +1 + +2 + +3 + +4 + +5 X2 - - -X2 - -Dupont 2.54mm - -female - -5-pin - -BK - - - -1 - -2 - -3 - -4 - -5 + + +X2 + +Dupont 2.54mm + +female + +5-pin + +BK + + + +1 + +2 + +3 + +4 + +5 X1:e--X2:w - - - + + + W2 - - -W2 - -4x - -0.2 m -  -X2:1 -     RD     - - - -X2:2 -     BK     - - - -X2:3 -     BU     - - - -X2:4 -     GN     - - - -  + + +W2 + +4x + +0.2 m +  +X2:1 +     RD     + + + +X2:2 +     BK     + + + +X2:3 +     BU     + + + +X2:4 +     GN     + + + +  X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + W1 - - -W1 - -4x - -0.2 m -  -     RD     -X1:1 - - - -     BK     -X1:2 - - - -     BU     -X1:3 - - - -     GN     -X1:4 - - - -  + + +W1 + +4x + +0.2 m +  +     RD     +X1:1 + + + +     BK     +X1:2 + + + +     BU     +X1:3 + + + +     GN     +X1:4 + + + +  W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + diff --git a/examples/ex12.png b/examples/ex12.png index 3b8fa0e0..713e37e2 100644 Binary files a/examples/ex12.png and b/examples/ex12.png differ diff --git a/examples/ex12.svg b/examples/ex12.svg index ef0abd29..9c8fa407 100644 --- a/examples/ex12.svg +++ b/examples/ex12.svg @@ -1,195 +1,195 @@ - - - - + + + X1 - - -X1 - -Dupont 2.54mm - -male - -5-pin - -BK - - - -1 - -2 - -3 - -4 - -5 + + +X1 + +Dupont 2.54mm + +male + +5-pin + +BK + + + +1 + +2 + +3 + +4 + +5 X2 - - -X2 - -Dupont 2.54mm - -female - -5-pin - -BK - - - -1 - -2 - -3 - -4 - -5 + + +X2 + +Dupont 2.54mm + +female + +5-pin + +BK + + + +1 + +2 + +3 + +4 + +5 X1:e--X2:w - - - + + + W2 - - -W2 - -4x - -0.2 m -  -X2:1 -     RD     - - - -X2:2 -     BK     - - - -X2:3 -     BU     - - - -X2:4 -     GN     - - - -  + + +W2 + +4x + +0.2 m +  +X2:1 +     RD     + + + +X2:2 +     BK     + + + +X2:3 +     BU     + + + +X2:4 +     GN     + + + +  X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + W1 - - -W1 - -4x - -0.2 m -  -     RD     -X1:1 - - - -     BK     -X1:2 - - - -     BU     -X1:3 - - - -     GN     -X1:4 - - - -  + + +W1 + +4x + +0.2 m +  +     RD     +X1:1 + + + +     BK     +X1:2 + + + +     BU     +X1:3 + + + +     GN     +X1:4 + + + +  W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + diff --git a/examples/ex13.html b/examples/ex13.html index 21d1e94c..8e511991 100644 --- a/examples/ex13.html +++ b/examples/ex13.html @@ -30,376 +30,376 @@

Diagram

- - - - + + + X1 - - -X1 - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + +X1 + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 C1 - - -C1 - -4x -  -X1:1:A -     1:WH     - - - -X1:2:B -     2:BN     - - - -X1:3:C -     3:GN     - - - -X1:4:D -     4:YE     - - - -  + + +C1 + +4x +  +X1:1:A +     1:WH     + + + +X1:2:B +     2:BN     + + + +X1:3:C +     3:GN     + + + +X1:4:D +     4:YE     + + + +  X1:e--C1:w - - - + + + X1:e--C1:w - - - + + + X1:e--C1:w - - - + + + X1:e--C1:w - - - + + + F1 - - -ferrule + + +ferrule C2 - - -C2 - -4x -  -     1:WH     -X2:1:A - - - -     2:BN     -X2:2:B - - - -     3:GN     -X2:3:C - - - -     4:YE     -X2:4:D - - - -  + + +C2 + +4x +  +     1:WH     +X2:1:A + + + +     2:BN     +X2:2:B + + + +     3:GN     +X2:3:C + + + +     4:YE     +X2:4:D + + + +  F1:e--C2:w - - - + + + C3 - - -C3 - -4x -  -     1:WH     -X3:1:A - - - -     2:BN     -X3:2:B - - - -     3:GN     -X3:3:C - - - -     4:YE     -X3:4:D - - - -  + + +C3 + +4x +  +     1:WH     +X3:1:A + + + +     2:BN     +X3:2:B + + + +     3:GN     +X3:3:C + + + +     4:YE     +X3:4:D + + + +  F1:e--C3:w - - - + + + F2 - - -ferrule + + +ferrule F2:e--C2:w - - - + + + F2:e--C3:w - - - + + + F3 - - -ferrule + + +ferrule F3:e--C2:w - - - + + + F3:e--C3:w - - - + + + F4 - - -ferrule + + +ferrule F4:e--C2:w - - - + + + F4:e--C3:w - - - + + + X2 - - -X2 - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + +X2 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D X3 - - -X3 - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + +X3 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D C1:e--F1:w - - - + + + C1:e--F2:w - - - + + + C1:e--F3:w - - - + + + C1:e--F4:w - - - + + + C2:e--X2:w - - - + + + C2:e--X2:w - - - + + + C2:e--X2:w - - - + + + C2:e--X2:w - - - + + + C3:e--X3:w - - - + + + C3:e--X3:w - - - + + + C3:e--X3:w - - - + + + C3:e--X3:w - - - + + + diff --git a/examples/ex13.png b/examples/ex13.png index 6da2d1bf..f0d4a98b 100644 Binary files a/examples/ex13.png and b/examples/ex13.png differ diff --git a/examples/ex13.svg b/examples/ex13.svg index 8b67e3a6..c2281c18 100644 --- a/examples/ex13.svg +++ b/examples/ex13.svg @@ -1,376 +1,376 @@ - - - - + + + X1 - - -X1 - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + +X1 + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 C1 - - -C1 - -4x -  -X1:1:A -     1:WH     - - - -X1:2:B -     2:BN     - - - -X1:3:C -     3:GN     - - - -X1:4:D -     4:YE     - - - -  + + +C1 + +4x +  +X1:1:A +     1:WH     + + + +X1:2:B +     2:BN     + + + +X1:3:C +     3:GN     + + + +X1:4:D +     4:YE     + + + +  X1:e--C1:w - - - + + + X1:e--C1:w - - - + + + X1:e--C1:w - - - + + + X1:e--C1:w - - - + + + F1 - - -ferrule + + +ferrule C2 - - -C2 - -4x -  -     1:WH     -X2:1:A - - - -     2:BN     -X2:2:B - - - -     3:GN     -X2:3:C - - - -     4:YE     -X2:4:D - - - -  + + +C2 + +4x +  +     1:WH     +X2:1:A + + + +     2:BN     +X2:2:B + + + +     3:GN     +X2:3:C + + + +     4:YE     +X2:4:D + + + +  F1:e--C2:w - - - + + + C3 - - -C3 - -4x -  -     1:WH     -X3:1:A - - - -     2:BN     -X3:2:B - - - -     3:GN     -X3:3:C - - - -     4:YE     -X3:4:D - - - -  + + +C3 + +4x +  +     1:WH     +X3:1:A + + + +     2:BN     +X3:2:B + + + +     3:GN     +X3:3:C + + + +     4:YE     +X3:4:D + + + +  F1:e--C3:w - - - + + + F2 - - -ferrule + + +ferrule F2:e--C2:w - - - + + + F2:e--C3:w - - - + + + F3 - - -ferrule + + +ferrule F3:e--C2:w - - - + + + F3:e--C3:w - - - + + + F4 - - -ferrule + + +ferrule F4:e--C2:w - - - + + + F4:e--C3:w - - - + + + X2 - - -X2 - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + +X2 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D X3 - - -X3 - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + +X3 + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D C1:e--F1:w - - - + + + C1:e--F2:w - - - + + + C1:e--F3:w - - - + + + C1:e--F4:w - - - + + + C2:e--X2:w - - - + + + C2:e--X2:w - - - + + + C2:e--X2:w - - - + + + C2:e--X2:w - - - + + + C3:e--X3:w - - - + + + C3:e--X3:w - - - + + + C3:e--X3:w - - - + + + C3:e--X3:w - - - + + + diff --git a/examples/ex14.html b/examples/ex14.html index a015c442..f53b47cf 100644 --- a/examples/ex14.html +++ b/examples/ex14.html @@ -30,676 +30,676 @@

Diagram

- - - - + + + X1 - - -X1 - -JST SM - -male - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + +X1 + +JST SM + +male + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 W1 - - -W1 - -4x - -0.1 m -  -X1:4:D -     1:WH     - - - -X1:3:C -     2:BN     - - - -X1:2:B -     3:GN     - - - -X1:1:A -     4:YE     - - - -  + + +W1 + +4x + +0.1 m +  +X1:4:D +     1:WH     + + + +X1:3:C +     2:BN     + + + +X1:2:B +     3:GN     + + + +X1:1:A +     4:YE     + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + __S_1 - - -Splice - -CU - - + + +Splice + +CU + + W2 - - -W2 - -4x - -0.1 m -  -     1:WH     - - - -     2:BN     - - - -     3:GN     - - - -     4:YE     - - - -  + + +W2 + +4x + +0.1 m +  +     1:WH     + + + +     2:BN     + + + +     3:GN     + + + +     4:YE     + + + +  __S_1:e--W2:w - - - + + + __S_2 - - -Splice - -CU - - + + +Splice + +CU + + __S_2:e--W2:w - - - + + + S1 - - -Splice - -CU - - + + +Splice + +CU + + S1:e--W2:w - - - + + + __WIRE_1 - - -1x - -0.1 m -  -     1:BK     -X2:4:D - - - -  + + +1x + +0.1 m +  +     1:BK     +X2:4:D + + + +  S1:e--__WIRE_1:w - - - + + + __S_3 - - -Splice - -CU - - + + +Splice + +CU + + __S_3:e--W2:w - - - + + + __S_4 - - -Splice - -CU - - + + +Splice + +CU + + W21 - - -W21 - -4x - -0.1 m -  -     1:WH     -X2:1:A - - - -     2:BN     -X2:2:B - - - -     3:GN     -X2:3:C - - - -     4:YE     -X2:4:D - - - -  + + +W21 + +4x + +0.1 m +  +     1:WH     +X2:1:A + + + +     2:BN     +X2:2:B + + + +     3:GN     +X2:3:C + + + +     4:YE     +X2:4:D + + + +  __S_4:e--W21:w - - - + + + __S_5 - - -Splice - -CU - - + + +Splice + +CU + + __S_5:e--W21:w - - - + + + __S_6 - - -Splice - -CU - - + + +Splice + +CU + + __S_6:e--W21:w - - - + + + __S_7 - - -Splice - -CU - - + + +Splice + +CU + + __S_7:e--W21:w - - - + + + X2 - - -X2 - -JST SM - -female - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + +X2 + +JST SM + +female + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D X3 - - -X3 - -JST SM - -male - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + +X3 + +JST SM + +male + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 X2:e--X3:w - - - - + + + + W3 - - -W3 - -4x - -0.1 m -  -X3:1:A -     1:WH     - - - -X3:2:B -     2:BN     - - - -X3:3:C -     3:GN     - - - -X3:4:D -     4:YE     - - - -  + + +W3 + +4x + +0.1 m +  +X3:1:A +     1:WH     + + + +X3:2:B +     2:BN     + + + +X3:3:C +     3:GN     + + + +X3:4:D +     4:YE     + + + +  X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + __F_1 - - -Ferrule - -GY - - + + +Ferrule + +GY + + X4 - - -X4 - -Screw terminal connector - -4-pin - -GN - - - -1 - -W - -2 - -X - -3 - -Y - -4 - -Z + + +X4 + +Screw terminal connector + +4-pin + +GN + + + +1 + +W + +2 + +X + +3 + +Y + +4 + +Z __F_1:e--X4:w - - + + __F_2 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_2:e--X4:w - - + + __F_3 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_3:e--X4:w - - + + __F_4 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_4:e--X4:w - - + + W1:e--__S_1:w - - - + + + W1:e--__S_2:w - - - + + + W1:e--S1:w - - - + + + W1:e--__S_3:w - - - + + + W2:e--__S_4:w - - - + + + W2:e--__S_5:w - - - + + + W2:e--__S_6:w - - - + + + W2:e--__S_7:w - - - + + + W21:e--X2:w - - - + + + W21:e--X2:w - - - + + + W21:e--X2:w - - - + + + W21:e--X2:w - - - + + + W3:e--__F_1:w - - - + + + W3:e--__F_2:w - - - + + + W3:e--__F_3:w - - - + + + W3:e--__F_4:w - - - + + + __WIRE_1:e--X2:w - - - + + + diff --git a/examples/ex14.png b/examples/ex14.png index fbca417c..8116ed37 100644 Binary files a/examples/ex14.png and b/examples/ex14.png differ diff --git a/examples/ex14.svg b/examples/ex14.svg index b358ca2a..302b7e32 100644 --- a/examples/ex14.svg +++ b/examples/ex14.svg @@ -1,676 +1,676 @@ - - - - + + + X1 - - -X1 - -JST SM - -male - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + +X1 + +JST SM + +male + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 W1 - - -W1 - -4x - -0.1 m -  -X1:4:D -     1:WH     - - - -X1:3:C -     2:BN     - - - -X1:2:B -     3:GN     - - - -X1:1:A -     4:YE     - - - -  + + +W1 + +4x + +0.1 m +  +X1:4:D +     1:WH     + + + +X1:3:C +     2:BN     + + + +X1:2:B +     3:GN     + + + +X1:1:A +     4:YE     + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + __S_1 - - -Splice - -CU - - + + +Splice + +CU + + W2 - - -W2 - -4x - -0.1 m -  -     1:WH     - - - -     2:BN     - - - -     3:GN     - - - -     4:YE     - - - -  + + +W2 + +4x + +0.1 m +  +     1:WH     + + + +     2:BN     + + + +     3:GN     + + + +     4:YE     + + + +  __S_1:e--W2:w - - - + + + __S_2 - - -Splice - -CU - - + + +Splice + +CU + + __S_2:e--W2:w - - - + + + S1 - - -Splice - -CU - - + + +Splice + +CU + + S1:e--W2:w - - - + + + __WIRE_1 - - -1x - -0.1 m -  -     1:BK     -X2:4:D - - - -  + + +1x + +0.1 m +  +     1:BK     +X2:4:D + + + +  S1:e--__WIRE_1:w - - - + + + __S_3 - - -Splice - -CU - - + + +Splice + +CU + + __S_3:e--W2:w - - - + + + __S_4 - - -Splice - -CU - - + + +Splice + +CU + + W21 - - -W21 - -4x - -0.1 m -  -     1:WH     -X2:1:A - - - -     2:BN     -X2:2:B - - - -     3:GN     -X2:3:C - - - -     4:YE     -X2:4:D - - - -  + + +W21 + +4x + +0.1 m +  +     1:WH     +X2:1:A + + + +     2:BN     +X2:2:B + + + +     3:GN     +X2:3:C + + + +     4:YE     +X2:4:D + + + +  __S_4:e--W21:w - - - + + + __S_5 - - -Splice - -CU - - + + +Splice + +CU + + __S_5:e--W21:w - - - + + + __S_6 - - -Splice - -CU - - + + +Splice + +CU + + __S_6:e--W21:w - - - + + + __S_7 - - -Splice - -CU - - + + +Splice + +CU + + __S_7:e--W21:w - - - + + + X2 - - -X2 - -JST SM - -female - -4-pin - -1 - -A - -2 - -B - -3 - -C - -4 - -D + + +X2 + +JST SM + +female + +4-pin + +1 + +A + +2 + +B + +3 + +C + +4 + +D X3 - - -X3 - -JST SM - -male - -4-pin - -A - -1 - -B - -2 - -C - -3 - -D - -4 + + +X3 + +JST SM + +male + +4-pin + +A + +1 + +B + +2 + +C + +3 + +D + +4 X2:e--X3:w - - - - + + + + W3 - - -W3 - -4x - -0.1 m -  -X3:1:A -     1:WH     - - - -X3:2:B -     2:BN     - - - -X3:3:C -     3:GN     - - - -X3:4:D -     4:YE     - - - -  + + +W3 + +4x + +0.1 m +  +X3:1:A +     1:WH     + + + +X3:2:B +     2:BN     + + + +X3:3:C +     3:GN     + + + +X3:4:D +     4:YE     + + + +  X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + __F_1 - - -Ferrule - -GY - - + + +Ferrule + +GY + + X4 - - -X4 - -Screw terminal connector - -4-pin - -GN - - - -1 - -W - -2 - -X - -3 - -Y - -4 - -Z + + +X4 + +Screw terminal connector + +4-pin + +GN + + + +1 + +W + +2 + +X + +3 + +Y + +4 + +Z __F_1:e--X4:w - - + + __F_2 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_2:e--X4:w - - + + __F_3 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_3:e--X4:w - - + + __F_4 - - -Ferrule - -GY - - + + +Ferrule + +GY + + __F_4:e--X4:w - - + + W1:e--__S_1:w - - - + + + W1:e--__S_2:w - - - + + + W1:e--S1:w - - - + + + W1:e--__S_3:w - - - + + + W2:e--__S_4:w - - - + + + W2:e--__S_5:w - - - + + + W2:e--__S_6:w - - - + + + W2:e--__S_7:w - - - + + + W21:e--X2:w - - - + + + W21:e--X2:w - - - + + + W21:e--X2:w - - - + + + W21:e--X2:w - - - + + + W3:e--__F_1:w - - - + + + W3:e--__F_2:w - - - + + + W3:e--__F_3:w - - - + + + W3:e--__F_4:w - - - + + + __WIRE_1:e--X2:w - - - + + + diff --git a/examples/ex15.bom.tsv b/examples/ex15.bom.tsv new file mode 100644 index 00000000..dd1dfe80 --- /dev/null +++ b/examples/ex15.bom.tsv @@ -0,0 +1,3 @@ +Id Description Qty Unit Designators +1 Cable, Serial, 4 x 0.25 mm² shielded 0.2 m W1 +2 Connector, Molex KK 254, female, 7 pins 2 X1, X2 diff --git a/examples/ex15.gv b/examples/ex15.gv new file mode 100644 index 00000000..ed3a7b9a --- /dev/null +++ b/examples/ex15.gv @@ -0,0 +1,240 @@ +graph { +// Graph generated by WireViz 0.5-dev +// https://github.com/formatc1702/WireViz + graph [bgcolor="#FFFFFF" fontname=arial nodesep=0.33 rankdir=LR ranksep=2] + node [fillcolor="#FFFFFF" fontname=arial height=0 margin=0 shape=none style=filled width=0] + edge [fontname=arial style=bold] + X1 [label=< + + + + +
+ + +
X1
+
+ + + + +
Molex KK 254female7-pin
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GND⬤1
VCC⬤2
RX3
TX4
GND⬤5
VCC⬤6
GND⬤7
+
+> fillcolor="#FFFFFF" shape=box style=filled] + X2 [label=< + + + + +
+ + +
X2
+
+ + + + +
Molex KK 254female7-pin
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
1GND⬤
2VCC⬤
3RX
4TX
5GND⬤
6VCC⬤
7GND⬤
+
+> fillcolor="#FFFFFF" shape=box style=filled] + edge [color="#000000:#895956:#000000"] + X1:p1r:e -- W1:w1:w + W1:w1:e -- X2:p1l:w + edge [color="#000000:#ff0000:#000000"] + X1:p2r:e -- W1:w2:w + W1:w2:e -- X2:p2l:w + edge [color="#000000:#ff8000:#000000"] + X1:p3r:e -- W1:w3:w + W1:w3:e -- X2:p4l:w + edge [color="#000000:#ffff00:#000000"] + X1:p4r:e -- W1:w4:w + W1:w4:e -- X2:p3l:w + edge [color="#000000"] + X1:p1r:e -- W1:ws:w + W1 [label=< + + + + +
+ + +
W1
+
+ + + + + + +
Serial4x0.25 mm² (24 AWG)+ S0.2 m
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
X1:1:GND + 1:BN + X2:1:GND
+ + + + +
+
X1:2:VCC + 2:RD + X2:2:VCC
+ + + + +
+
X1:3:RX + 3:OG + X2:4:TX
+ + + + +
+
X1:4:TX + 4:YE + X2:3:RX
+ + + + +
+
 
X1:1:GNDShield
 
+
+> fillcolor="#FFFFFF" shape=box style=filled] +} diff --git a/examples/ex15.html b/examples/ex15.html new file mode 100644 index 00000000..a9f7e2d0 --- /dev/null +++ b/examples/ex15.html @@ -0,0 +1,306 @@ + + + + + ex15 + + +

ex15

+

Diagram

+ +
+ +
+ +
+ + + + + + + + +X1 + + +X1 + +Molex KK 254 + +female + +7-pin + +GND + +⬤ + + +1 + +VCC + + +⬤ + +2 + +RX + + + +3 + +TX + + + +4 + +GND + +⬤ + + +5 + +VCC + + +⬤ + +6 + +GND + +⬤ + + +7 + + + +W1 + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  +X1:1:GND +     1:BN     +X2:1:GND + + + +X1:2:VCC +     2:RD     +X2:2:VCC + + + +X1:3:RX +     3:OG     +X2:4:TX + + + +X1:4:TX +     4:YE     +X2:3:RX + + + +  +X1:1:GND +Shield + +  + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + +X2 + + +X2 + +Molex KK 254 + +female + +7-pin + +1 + +GND + +⬤ + + +2 + +VCC + + +⬤ + +3 + +RX + + + +4 + +TX + + + +5 + +GND + +⬤ + + +6 + +VCC + + +⬤ + +7 + +GND + +⬤ + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + + +
+ +
+ +
+ +

Bill of Materials

+ +
+ + + + + + + + + + + + + + + + + + + + + + +
IdDescriptionQtyUnitDesignators
1Cable, Serial, 4 x 0.25 mm² shielded0.2mW1
2Connector, Molex KK 254, female, 7 pins2X1, X2
+ +
+ + diff --git a/examples/ex15.png b/examples/ex15.png new file mode 100644 index 00000000..ab7aa047 Binary files /dev/null and b/examples/ex15.png differ diff --git a/examples/ex15.svg b/examples/ex15.svg new file mode 100644 index 00000000..a0c9370a --- /dev/null +++ b/examples/ex15.svg @@ -0,0 +1,240 @@ + + + + + + + + + +X1 + + +X1 + +Molex KK 254 + +female + +7-pin + +GND + +⬤ + + +1 + +VCC + + +⬤ + +2 + +RX + + + +3 + +TX + + + +4 + +GND + +⬤ + + +5 + +VCC + + +⬤ + +6 + +GND + +⬤ + + +7 + + + +W1 + + +W1 + +Serial + +4x + +0.25 mm² (24 AWG) + ++ S + +0.2 m +  +X1:1:GND +     1:BN     +X2:1:GND + + + +X1:2:VCC +     2:RD     +X2:2:VCC + + + +X1:3:RX +     3:OG     +X2:4:TX + + + +X1:4:TX +     4:YE     +X2:3:RX + + + +  +X1:1:GND +Shield + +  + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + + + +X1:e--W1:w + + + + +X2 + + +X2 + +Molex KK 254 + +female + +7-pin + +1 + +GND + +⬤ + + +2 + +VCC + + +⬤ + +3 + +RX + + + +4 + +TX + + + +5 + +GND + +⬤ + + +6 + +VCC + + +⬤ + +7 + +GND + +⬤ + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + +W1:e--X2:w + + + + + + diff --git a/examples/ex15.yml b/examples/ex15.yml new file mode 100644 index 00000000..a5e346c2 --- /dev/null +++ b/examples/ex15.yml @@ -0,0 +1,31 @@ +connectors: + X1: + type: Molex KK 254 # more information + subtype: female + pinlabels: [GND, VCC, RX, TX, GND, VCC, GND] # pincount is implicit in pinout + internal_shorts: [[1, 5, 7], [2, 6]] + internal_shorts_color: [PK, RD] + X2: + type: Molex KK 254 + subtype: female + pinlabels: [GND, VCC, RX, TX, GND, VCC, GND] + internal_shorts: [[1, 5, 7], [2, 6]] + +cables: + W1: + color_code: IEC # auto-color wires based on a standard + wirecount: 4 # need to specify number of wires explicitly when using a color code + gauge: 0.25 mm2 # also accepts AWG as unit + show_equiv: true # auto-calculate AWG equivalent from metric gauge + length: 0.2 # length in m + shield: true + type: Serial + +connections: + - + - X1: [1-4] + - W1: [1-4] + - X2: [1,2,4,3] # crossover + - # connection from connector pin to wire shielding + - X1: 1 + - W1: s diff --git a/examples/readme.md b/examples/readme.md index 88a4389c..e785dd39 100644 --- a/examples/readme.md +++ b/examples/readme.md @@ -84,3 +84,9 @@ [Source](ex14.yml) - [Bill of Materials](ex14.bom.tsv) +## Example 15 +![](ex15.png) + +[Source](ex15.yml) - [Bill of Materials](ex15.bom.tsv) + + diff --git a/src/wireviz/DataClasses.py b/src/wireviz/DataClasses.py index 1756ef42..8a144457 100644 --- a/src/wireviz/DataClasses.py +++ b/src/wireviz/DataClasses.py @@ -164,6 +164,8 @@ class Connector: loops: List[List[Pin]] = field(default_factory=list) ignore_in_bom: bool = False additional_components: List[AdditionalComponent] = field(default_factory=list) + internal_shorts: Optional[List[List[Pin]]] = field(default_factory=list) + internal_shorts_color: Optional[List[Color]] = field(default_factory=list) def __post_init__(self) -> None: @@ -212,9 +214,11 @@ def __post_init__(self) -> None: raise Exception("Loops must be between exactly two pins!") for pin in loop: if pin not in self.pins: - raise Exception(f'Unknown loop pin "{pin}" for connector "{self.name}"!') + raise Exception( + f'Unknown loop pin "{pin}" for connector "{self.name}"!' + ) # Make sure loop connected pins are not hidden. - self.activate_pin(pin) + self.activate_pin(pin, None) for i, item in enumerate(self.additional_components): if isinstance(item, dict): @@ -234,7 +238,7 @@ def get_qty_multiplier(self, qty_multiplier: Optional[ConnectorMultiplier]) -> i return self.pincount elif qty_multiplier == "populated": return sum(self.visible_pins.values()) - elif qty_multiplier == 'unpopulated': + elif qty_multiplier == "unpopulated": return max(0, self.pincount - sum(self.visible_pins.values())) else: raise ValueError( @@ -316,7 +320,7 @@ def __post_init__(self) -> None: f"Warning: Cable {self.name} length_unit={self.length_unit} is ignored because its length contains {u}" ) self.length_unit = u - elif not any(isinstance(self.length, t) for t in [int, float]): + elif not isinstance(self.length, (int, float)): raise Exception(f"Cable {self.name} length has a non-numeric value") elif self.length_unit is None: self.length_unit = "m" diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py index da4f2bfd..4a76567b 100644 --- a/src/wireviz/Harness.py +++ b/src/wireviz/Harness.py @@ -53,6 +53,17 @@ ) from wireviz.wv_html import generate_html_output +OLD_CONNECTOR_ATTR = { + "pinout": "was renamed to 'pinlabels' in v0.2", + "pinnumbers": "was renamed to 'pins' in v0.2", + "autogenerate": "is replaced with new syntax in v0.4", +} + +def check_old(node: str, old_attr: dict, args: dict) -> None: + """Raise exception for any outdated attributes in args.""" + for attr, descr in old_attr.items(): + if attr in args: + raise ValueError(f"'{attr}' in {node}: '{attr}' {descr}") @dataclass class Harness: @@ -68,6 +79,7 @@ def __post_init__(self): self.additional_bom_items = [] def add_connector(self, name: str, *args, **kwargs) -> None: + check_old(f"Connector '{name}'", OLD_CONNECTOR_ATTR, kwargs) self.connectors[name] = Connector(name, *args, **kwargs) def add_cable(self, name: str, *args, **kwargs) -> None: @@ -94,7 +106,7 @@ def connect( to_pin: (int, str), ) -> None: # check from and to connectors - for (name, pin) in zip([from_name, to_name], [from_pin, to_pin]): + for name, pin in zip([from_name, to_name], [from_pin, to_pin]): if name is not None and name in self.connectors: connector = self.connectors[name] # check if provided name is ambiguous @@ -234,9 +246,19 @@ def create_graph(self) -> Graph: # fmt: on else: pinhtml.append(' ') + + for short, short_color in zip_longest(connector.internal_shorts, connector.internal_shorts_color): + if short_color == None: + short_color = "BK" + + if pinindex+1 in short: + pinhtml.append(f' ⬤') + else: + pinhtml.append(f' ') if connector.ports_right: pinhtml.append(f' {pinname}') + pinhtml.append(" ") pinhtml.append(" ") @@ -245,6 +267,13 @@ def create_graph(self) -> Graph: row.replace("", "\n".join(pinhtml)) for row in html ] + + for short, short_color in zip_longest(connector.internal_shorts, connector.internal_shorts_color): + print("Short_connections: " + str(short) + str(short_color)) + if short_color == None: + short_color = "BK" + # TODO adding dashed Line for Jumpers + html = "\n".join(html) dot.node( @@ -372,16 +401,20 @@ def create_graph(self) -> Graph: ) manufacturer_info = pn_info_string( HEADER_MPN, - cable.manufacturer[i - 1] - if isinstance(cable.manufacturer, list) - else None, + ( + cable.manufacturer[i - 1] + if isinstance(cable.manufacturer, list) + else None + ), cable.mpn[i - 1] if isinstance(cable.mpn, list) else None, ) supplier_info = pn_info_string( HEADER_SPN, - cable.supplier[i - 1] - if isinstance(cable.supplier, list) - else None, + ( + cable.supplier[i - 1] + if isinstance(cable.supplier, list) + else None + ), cable.spn[i - 1] if isinstance(cable.spn, list) else None, ) if manufacturer_info: @@ -444,9 +477,11 @@ def create_graph(self) -> Graph: # shield is shown with specified color and black borders, or as a thin black wire otherwise dot.attr( "edge", - color=":".join(["#000000", shield_color_hex, "#000000"]) - if isinstance(cable.shield, str) - else "#000000", + color=( + ":".join(["#000000", shield_color_hex, "#000000"]) + if isinstance(cable.shield, str) + else "#000000" + ), ) if connection.from_pin is not None: # connect to left from_connector = self.connectors[connection.from_name] @@ -650,7 +685,6 @@ def svg(self): graph = self.graph return embed_svg_images(graph.pipe(format="svg").decode("utf-8"), Path.cwd()) - def output( self, filename: (str, Path), diff --git a/src/wireviz/__init__.py b/src/wireviz/__init__.py index b70a2a71..f869ecf4 100644 --- a/src/wireviz/__init__.py +++ b/src/wireviz/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Please don't import anything in this file to avoid issues when it is imported in setup.py -__version__ = "0.4" +__version__ = "0.5-dev" CMD_NAME = "wireviz" # Lower case command and module name APP_NAME = "WireViz" # Application name in texts meant to be human readable diff --git a/src/wireviz/wireviz.py b/src/wireviz/wireviz.py index 7bcaa32d..bc974e86 100755 --- a/src/wireviz/wireviz.py +++ b/src/wireviz/wireviz.py @@ -115,8 +115,11 @@ def parse( # keep track of auto-generated designators to avoid duplicates autogenerated_designators = {} + # When title is not given, either deduce it from filename, or use default text. if "title" not in harness.metadata: - harness.metadata["title"] = Path(yaml_file).stem if yaml_file else "" + harness.metadata["title"] = ( + Path(yaml_file).stem if yaml_file else "WireViz diagram and BOM" + ) # add items # parse YAML input file ==================================================== @@ -201,7 +204,6 @@ def alternate_type(): # flip between connector and cable/arrow expected_type = alternating_types[1 - alternating_types.index(expected_type)] for connection_set in connection_sets: - # figure out number of parallel connections within this set connectioncount = [] for entry in connection_set: @@ -407,6 +409,7 @@ def _get_yaml_data_and_path(inp: Union[str, Path, Dict]) -> (Dict, Path): # when trying to expand and resolve it as a path. # Catch this error, but raise any others from errno import ENAMETOOLONG + if type(e) is OSError and e.errno != ENAMETOOLONG: raise e # file does not exist; assume inp is a YAML string diff --git a/src/wireviz/wv_bom.py b/src/wireviz/wv_bom.py index a233eca8..27ee59b0 100644 --- a/src/wireviz/wv_bom.py +++ b/src/wireviz/wv_bom.py @@ -36,7 +36,11 @@ def get_additional_component_table( if component.additional_components: rows.append(["Additional components"]) # Ignore components that have qty 0 - for part in [part for part in component.additional_components if component.get_qty_multiplier(part.qty_multiplier)]: + for part in [ + part + for part in component.additional_components + if component.get_qty_multiplier(part.qty_multiplier) + ]: common_args = { "qty": part.qty * component.get_qty_multiplier(part.qty_multiplier), "unit": part.unit, @@ -65,7 +69,11 @@ def get_additional_component_bom(component: Union[Connector, Cable]) -> List[BOM """Return a list of BOM entries with additional components.""" bom_entries = [] # Ignore components that have qty 0 - for part in [part for part in component.additional_components if component.get_qty_multiplier(part.qty_multiplier)]: + for part in [ + part + for part in component.additional_components + if component.get_qty_multiplier(part.qty_multiplier) + ]: bom_entries.append( { "description": part.description, diff --git a/src/wireviz/wv_cli.py b/src/wireviz/wv_cli.py index 73150720..afb02494 100644 --- a/src/wireviz/wv_cli.py +++ b/src/wireviz/wv_cli.py @@ -14,11 +14,11 @@ from wireviz.wv_helper import open_file_read format_codes = { - "c": "csv", + # "c": "csv", "g": "gv", "h": "html", "p": "png", - "P": "pdf", + # "P": "pdf", "s": "svg", "t": "tsv", } @@ -28,7 +28,11 @@ epilog += ", ".join([f"{key} ({value.upper()})" for key, value in format_codes.items()]) -@click.command(epilog=epilog, no_args_is_help=True) +@click.command( + epilog=epilog, + no_args_is_help=True, + context_settings=dict(help_option_names=["-h", "--help"]), +) @click.argument("file", nargs=-1) @click.option( "-f", diff --git a/src/wireviz/wv_colors.py b/src/wireviz/wv_colors.py index 857f3077..62957f98 100644 --- a/src/wireviz/wv_colors.py +++ b/src/wireviz/wv_colors.py @@ -28,7 +28,7 @@ "BUVT", "VTBU", "OGVT", "VTOG", "GNVT", "VTGN", "BNVT", "VTBN", "SLVT", "VTSL", ], "TELALT": [ # 25x2: Tip and then ring of each pair - "WHBU", "BU", "WHOG", "OG", "WHGN", "GN", "WHBN", "BN", "WHSL", "SL", + "WHBU", "BU", "WHOG", "OG", "WHGN", "GN", "WHBN", "BN", "WHSL", "SL", "RDBU", "BURD", "RDOG", "OGRD", "RDGN", "GNRD", "RDBN", "BNRD", "RDSL", "SLRD", "BKBU", "BUBK", "BKOG", "OGBK", "BKGN", "GNBK", "BKBN", "BNBK", "BKSL", "SLBK", "YEBU", "BUYE", "YEOG", "OGYE", "YEGN", "GNYE", "YEBN", "BNYE", "YESL", "SLYE", @@ -156,7 +156,7 @@ def lookup(c: str) -> str: if len(output) == 2: # Give wires with EXACTLY 2 colors that striped look. output += output[:1] elif pad and len(output) == 1: # Hacky style fix: Give single color wires - output *= 3 # a triple-up so that wires are the same size. + output *= 3 # a triple-up so that wires are the same size return output diff --git a/src/wireviz/wv_html.py b/src/wireviz/wv_html.py index 15342668..763da9d7 100644 --- a/src/wireviz/wv_html.py +++ b/src/wireviz/wv_html.py @@ -97,9 +97,9 @@ def generate_html_output( if isinstance(entry, Dict): replacements[f""] = str(category) for entry_key, entry_value in entry.items(): - replacements[ - f"" - ] = html_line_breaks(str(entry_value)) + replacements[f""] = ( + html_line_breaks(str(entry_value)) + ) replacements['"sheetsize_default"'] = '"{}"'.format( metadata.get("template", {}).get("sheetsize", "") diff --git a/tutorial/tutorial01.html b/tutorial/tutorial01.html index 1809c709..8865161b 100644 --- a/tutorial/tutorial01.html +++ b/tutorial/tutorial01.html @@ -30,139 +30,139 @@

Diagram

- - - - + + + X1 - - -X1 - -4-pin - -1 - -2 - -3 - -4 + + +X1 + +4-pin + +1 + +2 + +3 + +4 W1 - - -W1 - -4x - -1 m -  -X1:1 -     1     -X2:1 - - - -X1:2 -     2     -X2:2 - - - -X1:3 -     3     -X2:3 - - - -X1:4 -     4     -X2:4 - - - -  + + +W1 + +4x + +1 m +  +X1:1 +     1     +X2:1 + + + +X1:2 +     2     +X2:2 + + + +X1:3 +     3     +X2:3 + + + +X1:4 +     4     +X2:4 + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -4-pin - -1 - -2 - -3 - -4 + + +X2 + +4-pin + +1 + +2 + +3 + +4 W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial01.png b/tutorial/tutorial01.png index 2c94e2bf..b94a3902 100644 Binary files a/tutorial/tutorial01.png and b/tutorial/tutorial01.png differ diff --git a/tutorial/tutorial01.svg b/tutorial/tutorial01.svg index 94ef9f54..644ce4c0 100644 --- a/tutorial/tutorial01.svg +++ b/tutorial/tutorial01.svg @@ -1,139 +1,139 @@ - - - - + + + X1 - - -X1 - -4-pin - -1 - -2 - -3 - -4 + + +X1 + +4-pin + +1 + +2 + +3 + +4 W1 - - -W1 - -4x - -1 m -  -X1:1 -     1     -X2:1 - - - -X1:2 -     2     -X2:2 - - - -X1:3 -     3     -X2:3 - - - -X1:4 -     4     -X2:4 - - - -  + + +W1 + +4x + +1 m +  +X1:1 +     1     +X2:1 + + + +X1:2 +     2     +X2:2 + + + +X1:3 +     3     +X2:3 + + + +X1:4 +     4     +X2:4 + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -4-pin - -1 - -2 - -3 - -4 + + +X2 + +4-pin + +1 + +2 + +3 + +4 W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial02.html b/tutorial/tutorial02.html index 11b77f7e..385d895f 100644 --- a/tutorial/tutorial02.html +++ b/tutorial/tutorial02.html @@ -30,149 +30,149 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 W1 - - -W1 - -4x - -0.25 mm² (24 AWG) - -1 m -  -X1:1 -     1:WH     -X2:1 - - - -X1:2 -     2:BN     -X2:2 - - - -X1:3 -     3:GN     -X2:4 - - - -X1:4 -     4:YE     -X2:3 - - - -  + + +W1 + +4x + +0.25 mm² (24 AWG) + +1 m +  +X1:1 +     1:WH     +X2:1 + + + +X1:2 +     2:BN     +X2:2 + + + +X1:3 +     3:GN     +X2:4 + + + +X1:4 +     4:YE     +X2:3 + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial02.png b/tutorial/tutorial02.png index d9076979..bba6a5bc 100644 Binary files a/tutorial/tutorial02.png and b/tutorial/tutorial02.png differ diff --git a/tutorial/tutorial02.svg b/tutorial/tutorial02.svg index 1e00ea6b..348b3d80 100644 --- a/tutorial/tutorial02.svg +++ b/tutorial/tutorial02.svg @@ -1,149 +1,149 @@ - - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 W1 - - -W1 - -4x - -0.25 mm² (24 AWG) - -1 m -  -X1:1 -     1:WH     -X2:1 - - - -X1:2 -     2:BN     -X2:2 - - - -X1:3 -     3:GN     -X2:4 - - - -X1:4 -     4:YE     -X2:3 - - - -  + + +W1 + +4x + +0.25 mm² (24 AWG) + +1 m +  +X1:1 +     1:WH     +X2:1 + + + +X1:2 +     2:BN     +X2:2 + + + +X1:3 +     3:GN     +X2:4 + + + +X1:4 +     4:YE     +X2:3 + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial03.html b/tutorial/tutorial03.html index 63eef03c..b56e399d 100644 --- a/tutorial/tutorial03.html +++ b/tutorial/tutorial03.html @@ -30,176 +30,176 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -RX - -3 - -TX - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 W1 - - -W1 - -4x - -0.25 mm² (24 AWG) - -+ S - -1 m -  -X1:1:GND -     1:WH     -X2:1:GND - - - -X1:2:VCC -     2:BN     -X2:2:VCC - - - -X1:3:RX -     3:GN     -X2:4:TX - - - -X1:4:TX -     4:YE     -X2:3:RX - - - -  -X1:1:GND -Shield - -  + + +W1 + +4x + +0.25 mm² (24 AWG) + ++ S + +1 m +  +X1:1:GND +     1:WH     +X2:1:GND + + + +X1:2:VCC +     2:BN     +X2:2:VCC + + + +X1:3:RX +     3:GN     +X2:4:TX + + + +X1:4:TX +     4:YE     +X2:3:RX + + + +  +X1:1:GND +Shield + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -RX - -4 - -TX + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial03.png b/tutorial/tutorial03.png index 313b0615..4bd8c393 100644 Binary files a/tutorial/tutorial03.png and b/tutorial/tutorial03.png differ diff --git a/tutorial/tutorial03.svg b/tutorial/tutorial03.svg index 647674d6..5344fb80 100644 --- a/tutorial/tutorial03.svg +++ b/tutorial/tutorial03.svg @@ -1,176 +1,176 @@ - - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -RX - -3 - -TX - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +RX + +3 + +TX + +4 W1 - - -W1 - -4x - -0.25 mm² (24 AWG) - -+ S - -1 m -  -X1:1:GND -     1:WH     -X2:1:GND - - - -X1:2:VCC -     2:BN     -X2:2:VCC - - - -X1:3:RX -     3:GN     -X2:4:TX - - - -X1:4:TX -     4:YE     -X2:3:RX - - - -  -X1:1:GND -Shield - -  + + +W1 + +4x + +0.25 mm² (24 AWG) + ++ S + +1 m +  +X1:1:GND +     1:WH     +X2:1:GND + + + +X1:2:VCC +     2:BN     +X2:2:VCC + + + +X1:3:RX +     3:GN     +X2:4:TX + + + +X1:4:TX +     4:YE     +X2:3:RX + + + +  +X1:1:GND +Shield + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -RX - -4 - -TX + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +RX + +4 + +TX W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + diff --git a/tutorial/tutorial04.html b/tutorial/tutorial04.html index 11347566..ef77c9c9 100644 --- a/tutorial/tutorial04.html +++ b/tutorial/tutorial04.html @@ -30,307 +30,307 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex KK 254 - -male - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 - -to microcontroller + + +X1 + +Molex KK 254 + +male + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 + +to microcontroller W1 - - -W1 - -4x - -24 AWG - -0.3 m -  -X1:1:GND -     1:BN     -X2:1:GND - - - -X1:2:VCC -     2:RD     -X2:2:VCC - - - -X1:3:SCL -     3:OG     -X2:3:SCL - - - -X1:4:SDA -     4:YE     -X2:4:SDA - - - -  - -This cable is a bit longer + + +W1 + +4x + +24 AWG + +0.3 m +  +X1:1:GND +     1:BN     +X2:1:GND + + + +X1:2:VCC +     2:RD     +X2:2:VCC + + + +X1:3:SCL +     3:OG     +X2:3:SCL + + + +X1:4:SDA +     4:YE     +X2:4:SDA + + + +  + +This cable is a bit longer X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -1 - -2 - -VCC - -2 - -3 - -SCL - -3 - -4 - -SDA - -4 - -to accelerometer + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +1 + +2 + +VCC + +2 + +3 + +SCL + +3 + +4 + +SDA + +4 + +to accelerometer W2 - - -W2 - -4x - -24 AWG - -0.1 m -  -X2:1:GND -     1:BN     -X3:1:GND - - - -X2:2:VCC -     2:RD     -X3:2:VCC - - - -X2:3:SCL -     3:OG     -X3:3:SCL - - - -X2:4:SDA -     4:YE     -X3:4:SDA - - - -  - -This cable is a bit shorter + + +W2 + +4x + +24 AWG + +0.1 m +  +X2:1:GND +     1:BN     +X3:1:GND + + + +X2:2:VCC +     2:RD     +X3:2:VCC + + + +X2:3:SCL +     3:OG     +X3:3:SCL + + + +X2:4:SDA +     4:YE     +X3:4:SDA + + + +  + +This cable is a bit shorter X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - -to temperature sensor + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + +to temperature sensor W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + diff --git a/tutorial/tutorial04.png b/tutorial/tutorial04.png index 06a2ed96..6f7975a7 100644 Binary files a/tutorial/tutorial04.png and b/tutorial/tutorial04.png differ diff --git a/tutorial/tutorial04.svg b/tutorial/tutorial04.svg index 1bb696e8..e101c734 100644 --- a/tutorial/tutorial04.svg +++ b/tutorial/tutorial04.svg @@ -1,307 +1,307 @@ - - - - + + + X1 - - -X1 - -Molex KK 254 - -male - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 - -to microcontroller + + +X1 + +Molex KK 254 + +male + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 + +to microcontroller W1 - - -W1 - -4x - -24 AWG - -0.3 m -  -X1:1:GND -     1:BN     -X2:1:GND - - - -X1:2:VCC -     2:RD     -X2:2:VCC - - - -X1:3:SCL -     3:OG     -X2:3:SCL - - - -X1:4:SDA -     4:YE     -X2:4:SDA - - - -  - -This cable is a bit longer + + +W1 + +4x + +24 AWG + +0.3 m +  +X1:1:GND +     1:BN     +X2:1:GND + + + +X1:2:VCC +     2:RD     +X2:2:VCC + + + +X1:3:SCL +     3:OG     +X2:3:SCL + + + +X1:4:SDA +     4:YE     +X2:4:SDA + + + +  + +This cable is a bit longer X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -1 - -2 - -VCC - -2 - -3 - -SCL - -3 - -4 - -SDA - -4 - -to accelerometer + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +1 + +2 + +VCC + +2 + +3 + +SCL + +3 + +4 + +SDA + +4 + +to accelerometer W2 - - -W2 - -4x - -24 AWG - -0.1 m -  -X2:1:GND -     1:BN     -X3:1:GND - - - -X2:2:VCC -     2:RD     -X3:2:VCC - - - -X2:3:SCL -     3:OG     -X3:3:SCL - - - -X2:4:SDA -     4:YE     -X3:4:SDA - - - -  - -This cable is a bit shorter + + +W2 + +4x + +24 AWG + +0.1 m +  +X2:1:GND +     1:BN     +X3:1:GND + + + +X2:2:VCC +     2:RD     +X3:2:VCC + + + +X2:3:SCL +     3:OG     +X3:3:SCL + + + +X2:4:SDA +     4:YE     +X3:4:SDA + + + +  + +This cable is a bit shorter X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X2:e--W2:w - - - + + + X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA - -to temperature sensor + + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA + +to temperature sensor W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + diff --git a/tutorial/tutorial05.html b/tutorial/tutorial05.html index 74151af8..0fb1f6d9 100644 --- a/tutorial/tutorial05.html +++ b/tutorial/tutorial05.html @@ -30,184 +30,184 @@

Diagram

- - - - + + + __F1_1 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + W1 - - -W1 - -4x - -0.5 mm² - -0.3 m -  -     YE     -X1:1:+12V - - - -     BK     -X1:2:GND - - - -     BK     -X1:3:GND - - - -     RD     -X1:4:+5V - - - -  + + +W1 + +4x + +0.5 mm² + +0.3 m +  +     YE     +X1:1:+12V + + + +     BK     +X1:2:GND + + + +     BK     +X1:3:GND + + + +     RD     +X1:4:+5V + + + +  __F1_1:e--W1:w - - - + + + __F1_2 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + __F1_2:e--W1:w - - - + + + __F1_3 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + __F1_3:e--W1:w - - - + + + __F1_4 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + __F1_4:e--W1:w - - - + + + X1 - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V + + +X1 + +Molex 8981 + +female + +4-pin + +1 + ++12V + +2 + +GND + +3 + +GND + +4 + ++5V W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + diff --git a/tutorial/tutorial05.png b/tutorial/tutorial05.png index 34808065..44e745ad 100644 Binary files a/tutorial/tutorial05.png and b/tutorial/tutorial05.png differ diff --git a/tutorial/tutorial05.svg b/tutorial/tutorial05.svg index b2bc7186..4f36ca37 100644 --- a/tutorial/tutorial05.svg +++ b/tutorial/tutorial05.svg @@ -1,184 +1,184 @@ - - - - + + + __F1_1 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + W1 - - -W1 - -4x - -0.5 mm² - -0.3 m -  -     YE     -X1:1:+12V - - - -     BK     -X1:2:GND - - - -     BK     -X1:3:GND - - - -     RD     -X1:4:+5V - - - -  + + +W1 + +4x + +0.5 mm² + +0.3 m +  +     YE     +X1:1:+12V + + + +     BK     +X1:2:GND + + + +     BK     +X1:3:GND + + + +     RD     +X1:4:+5V + + + +  __F1_1:e--W1:w - - - + + + __F1_2 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + __F1_2:e--W1:w - - - + + + __F1_3 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + __F1_3:e--W1:w - - - + + + __F1_4 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + __F1_4:e--W1:w - - - + + + X1 - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V + + +X1 + +Molex 8981 + +female + +4-pin + +1 + ++12V + +2 + +GND + +3 + +GND + +4 + ++5V W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + diff --git a/tutorial/tutorial06.html b/tutorial/tutorial06.html index 80dcd929..18589ba8 100644 --- a/tutorial/tutorial06.html +++ b/tutorial/tutorial06.html @@ -30,171 +30,171 @@

Diagram

- - - - + + + __F_05_1 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + W1 - - -W1 - -4x - -0.5 mm² - -0.3 m -  -     YE     -X1:1:+12V - - - -     BK     -X1:2:GND - - - -     BK     -X1:3:GND - - - -     RD     -X1:4:+5V - - - -  + + +W1 + +4x + +0.5 mm² + +0.3 m +  +     YE     +X1:1:+12V + + + +     BK     +X1:2:GND + + + +     BK     +X1:3:GND + + + +     RD     +X1:4:+5V + + + +  __F_05_1:e--W1:w - - - + + + F1 - - -Crimp ferrule - -1.0 mm² - -YE - - + + +Crimp ferrule + +1.0 mm² + +YE + + F1:e--W1:w - - - + + + F1:e--W1:w - - - + + + __F_05_2 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + __F_05_2:e--W1:w - - - + + + X1 - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V + + +X1 + +Molex 8981 + +female + +4-pin + +1 + ++12V + +2 + +GND + +3 + +GND + +4 + ++5V W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + diff --git a/tutorial/tutorial06.png b/tutorial/tutorial06.png index e8a980cd..43e00cbd 100644 Binary files a/tutorial/tutorial06.png and b/tutorial/tutorial06.png differ diff --git a/tutorial/tutorial06.svg b/tutorial/tutorial06.svg index f9badfb3..973fc238 100644 --- a/tutorial/tutorial06.svg +++ b/tutorial/tutorial06.svg @@ -1,171 +1,171 @@ - - - - + + + __F_05_1 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + W1 - - -W1 - -4x - -0.5 mm² - -0.3 m -  -     YE     -X1:1:+12V - - - -     BK     -X1:2:GND - - - -     BK     -X1:3:GND - - - -     RD     -X1:4:+5V - - - -  + + +W1 + +4x + +0.5 mm² + +0.3 m +  +     YE     +X1:1:+12V + + + +     BK     +X1:2:GND + + + +     BK     +X1:3:GND + + + +     RD     +X1:4:+5V + + + +  __F_05_1:e--W1:w - - - + + + F1 - - -Crimp ferrule - -1.0 mm² - -YE - - + + +Crimp ferrule + +1.0 mm² + +YE + + F1:e--W1:w - - - + + + F1:e--W1:w - - - + + + __F_05_2 - - -Crimp ferrule - -0.5 mm² - -OG - - + + +Crimp ferrule + +0.5 mm² + +OG + + __F_05_2:e--W1:w - - - + + + X1 - - -X1 - -Molex 8981 - -female - -4-pin - -1 - -+12V - -2 - -GND - -3 - -GND - -4 - -+5V + + +X1 + +Molex 8981 + +female + +4-pin + +1 + ++12V + +2 + +GND + +3 + +GND + +4 + ++5V W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + W1:e--X1:w - - - + + + diff --git a/tutorial/tutorial07.html b/tutorial/tutorial07.html index a3d054e3..ffb350af 100644 --- a/tutorial/tutorial07.html +++ b/tutorial/tutorial07.html @@ -30,661 +30,661 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W1 - - -W1 - -4x - -0.25 mm² - -0.2 m -  -X1:1:GND -     TQ     -X2:1:GND - - - -X1:2:VCC -     PK     -X2:2:VCC - - - -X1:3:SCL -     YE     -X2:3:SCL - - - -X1:4:SDA -     VT     -X2:4:SDA - - - -  + + +W1 + +4x + +0.25 mm² + +0.2 m +  +X1:1:GND +     TQ     +X2:1:GND + + + +X1:2:VCC +     PK     +X2:2:VCC + + + +X1:3:SCL +     YE     +X2:3:SCL + + + +X1:4:SDA +     VT     +X2:4:SDA + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X3 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W2 - - -W2 - -4x - -0.25 mm² - -0.2 m -  -X3:1:GND -     TQ     -X2:1:GND - - - -X3:2:VCC -     PK     -X2:2:VCC - - - -X3:3:SCL -     YE     -X2:3:SCL - - - -X3:4:SDA -     VT     -X2:4:SDA - - - -  + + +W2 + +4x + +0.25 mm² + +0.2 m +  +X3:1:GND +     TQ     +X2:1:GND + + + +X3:2:VCC +     PK     +X2:2:VCC + + + +X3:3:SCL +     YE     +X2:3:SCL + + + +X3:4:SDA +     VT     +X2:4:SDA + + + +  X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + W3 - - -W3 - -4x - -0.25 mm² - -0.2 m -  -X3:1:GND -     TQ     -X4:1:GND - - - -X3:2:VCC -     PK     -X4:2:VCC - - - -X3:3:SCL -     YE     -X4:3:SCL - - - -X3:4:SDA -     VT     -X4:4:SDA - - - -  + + +W3 + +4x + +0.25 mm² + +0.2 m +  +X3:1:GND +     TQ     +X4:1:GND + + + +X3:2:VCC +     PK     +X4:2:VCC + + + +X3:3:SCL +     YE     +X4:3:SCL + + + +X3:4:SDA +     VT     +X4:4:SDA + + + +  X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X4 - - -X4 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X4 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA X5 - - -X5 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X5 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W4 - - -W4 - -4x - -0.25 mm² - -0.2 m -  -X5:1:GND -     TQ     -X4:1:GND - - - -X5:2:VCC -     PK     -X4:2:VCC - - - -X5:3:SCL -     YE     -X4:3:SCL - - - -X5:4:SDA -     VT     -X4:4:SDA - - - -  + + +W4 + +4x + +0.25 mm² + +0.2 m +  +X5:1:GND +     TQ     +X4:1:GND + + + +X5:2:VCC +     PK     +X4:2:VCC + + + +X5:3:SCL +     YE     +X4:3:SCL + + + +X5:4:SDA +     VT     +X4:4:SDA + + + +  X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + W5 - - -W5 - -4x - -0.25 mm² - -0.2 m -  -X5:1:GND -     TQ     -X6:1:GND - - - -X5:2:VCC -     PK     -X6:2:VCC - - - -X5:3:SCL -     YE     -X6:3:SCL - - - -X5:4:SDA -     VT     -X6:4:SDA - - - -  + + +W5 + +4x + +0.25 mm² + +0.2 m +  +X5:1:GND +     TQ     +X6:1:GND + + + +X5:2:VCC +     PK     +X6:2:VCC + + + +X5:3:SCL +     YE     +X6:3:SCL + + + +X5:4:SDA +     VT     +X6:4:SDA + + + +  X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X6 - - -X6 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X6 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + diff --git a/tutorial/tutorial07.png b/tutorial/tutorial07.png index 8007fa25..c919e02b 100644 Binary files a/tutorial/tutorial07.png and b/tutorial/tutorial07.png differ diff --git a/tutorial/tutorial07.svg b/tutorial/tutorial07.svg index 9a1f84f3..a278a874 100644 --- a/tutorial/tutorial07.svg +++ b/tutorial/tutorial07.svg @@ -1,661 +1,661 @@ - - - - + + + X1 - - -X1 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X1 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W1 - - -W1 - -4x - -0.25 mm² - -0.2 m -  -X1:1:GND -     TQ     -X2:1:GND - - - -X1:2:VCC -     PK     -X2:2:VCC - - - -X1:3:SCL -     YE     -X2:3:SCL - - - -X1:4:SDA -     VT     -X2:4:SDA - - - -  + + +W1 + +4x + +0.25 mm² + +0.2 m +  +X1:1:GND +     TQ     +X2:1:GND + + + +X1:2:VCC +     PK     +X2:2:VCC + + + +X1:3:SCL +     YE     +X2:3:SCL + + + +X1:4:SDA +     VT     +X2:4:SDA + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X2 - - -X2 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA X3 - - -X3 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X3 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W2 - - -W2 - -4x - -0.25 mm² - -0.2 m -  -X3:1:GND -     TQ     -X2:1:GND - - - -X3:2:VCC -     PK     -X2:2:VCC - - - -X3:3:SCL -     YE     -X2:3:SCL - - - -X3:4:SDA -     VT     -X2:4:SDA - - - -  + + +W2 + +4x + +0.25 mm² + +0.2 m +  +X3:1:GND +     TQ     +X2:1:GND + + + +X3:2:VCC +     PK     +X2:2:VCC + + + +X3:3:SCL +     YE     +X2:3:SCL + + + +X3:4:SDA +     VT     +X2:4:SDA + + + +  X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + X3:e--W2:w - - - + + + W3 - - -W3 - -4x - -0.25 mm² - -0.2 m -  -X3:1:GND -     TQ     -X4:1:GND - - - -X3:2:VCC -     PK     -X4:2:VCC - - - -X3:3:SCL -     YE     -X4:3:SCL - - - -X3:4:SDA -     VT     -X4:4:SDA - - - -  + + +W3 + +4x + +0.25 mm² + +0.2 m +  +X3:1:GND +     TQ     +X4:1:GND + + + +X3:2:VCC +     PK     +X4:2:VCC + + + +X3:3:SCL +     YE     +X4:3:SCL + + + +X3:4:SDA +     VT     +X4:4:SDA + + + +  X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X3:e--W3:w - - - + + + X4 - - -X4 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X4 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA X5 - - -X5 - -Molex KK 254 - -female - -4-pin - -GND - -1 - -VCC - -2 - -SCL - -3 - -SDA - -4 + + +X5 + +Molex KK 254 + +female + +4-pin + +GND + +1 + +VCC + +2 + +SCL + +3 + +SDA + +4 W4 - - -W4 - -4x - -0.25 mm² - -0.2 m -  -X5:1:GND -     TQ     -X4:1:GND - - - -X5:2:VCC -     PK     -X4:2:VCC - - - -X5:3:SCL -     YE     -X4:3:SCL - - - -X5:4:SDA -     VT     -X4:4:SDA - - - -  + + +W4 + +4x + +0.25 mm² + +0.2 m +  +X5:1:GND +     TQ     +X4:1:GND + + + +X5:2:VCC +     PK     +X4:2:VCC + + + +X5:3:SCL +     YE     +X4:3:SCL + + + +X5:4:SDA +     VT     +X4:4:SDA + + + +  X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + X5:e--W4:w - - - + + + W5 - - -W5 - -4x - -0.25 mm² - -0.2 m -  -X5:1:GND -     TQ     -X6:1:GND - - - -X5:2:VCC -     PK     -X6:2:VCC - - - -X5:3:SCL -     YE     -X6:3:SCL - - - -X5:4:SDA -     VT     -X6:4:SDA - - - -  + + +W5 + +4x + +0.25 mm² + +0.2 m +  +X5:1:GND +     TQ     +X6:1:GND + + + +X5:2:VCC +     PK     +X6:2:VCC + + + +X5:3:SCL +     YE     +X6:3:SCL + + + +X5:4:SDA +     VT     +X6:4:SDA + + + +  X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X5:e--W5:w - - - + + + X6 - - -X6 - -Molex KK 254 - -female - -4-pin - -1 - -GND - -2 - -VCC - -3 - -SCL - -4 - -SDA + + +X6 + +Molex KK 254 + +female + +4-pin + +1 + +GND + +2 + +VCC + +3 + +SCL + +4 + +SDA W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W2:e--X2:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W3:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W4:e--X4:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + W5:e--X6:w - - - + + + diff --git a/tutorial/tutorial08.html b/tutorial/tutorial08.html index 797acc12..03d07128 100644 --- a/tutorial/tutorial08.html +++ b/tutorial/tutorial08.html @@ -30,326 +30,326 @@

Diagram

- - - - + + + X1 - - -X1 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 - -Additional components - -4 x Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 - -1 x Test -P/N: ABC, Molex: 45454, Mousikey: 9999 + + +X1 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +Additional components + +4 x Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 + +1 x Test +P/N: ABC, Molex: 45454, Mousikey: 9999 W1 - - -W1 - -P/N: CAB1 - -CablesCo: ABC123 - -Cables R Us: 999-888-777 - -4x - -0.25 mm² - -1 m -  -X1:1 -     1:BN     -X2:1 - - - -X1:2 -     2:RD     -X2:2 - - - -X1:3 -     3:OG     -X2:3 - - - -X1:4 -     4:YE     -X2:4 - - - -  + + +W1 + +P/N: CAB1 + +CablesCo: ABC123 + +Cables R Us: 999-888-777 + +4x + +0.25 mm² + +1 m +  +X1:1 +     1:BN     +X2:1 + + + +X1:2 +     2:RD     +X2:2 + + + +X1:3 +     3:OG     +X2:3 + + + +X1:4 +     4:YE     +X2:4 + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + W2 - - -W2 - -4x - -0.25 mm² - -1 m -  -X1:1 -     YE     -X3:1 - - - -P/N: WIRE1 -WiresCo: W1-YE -WireShack: 1001 -X1:2 -     BK     -X3:2 - - - -P/N: WIRE2 -WiresCo: W1-BK -WireShack: 1002 -X1:3 -     BK     -X3:3 - - - -P/N: WIRE2 -WiresCo: W1-BK -WireShack: 1002 -X1:4 -     RD     -X3:4 - - - -P/N: WIRE3 -WiresCo: W1-RD -WireShack: 1009 -  - -Additional components - -1 m x Sleve, Braided nylon, black, 3mm -P/N: SLV-1 + + +W2 + +4x + +0.25 mm² + +1 m +  +X1:1 +     YE     +X3:1 + + + +P/N: WIRE1 +WiresCo: W1-YE +WireShack: 1001 +X1:2 +     BK     +X3:2 + + + +P/N: WIRE2 +WiresCo: W1-BK +WireShack: 1002 +X1:3 +     BK     +X3:3 + + + +P/N: WIRE2 +WiresCo: W1-BK +WireShack: 1002 +X1:4 +     RD     +X3:4 + + + +P/N: WIRE3 +WiresCo: W1-RD +WireShack: 1009 +  + +Additional components + +1 m x Sleve, Braided nylon, black, 3mm +P/N: SLV-1 X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X2 - - -X2 - -P/N: CON4 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 - -Additional components - -4 x Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 - -1 x Test -P/N: ABC, Molex: 45454, Mousikey: 9999 + + +X2 + +P/N: CON4 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +Additional components + +4 x Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 + +1 x Test +P/N: ABC, Molex: 45454, Mousikey: 9999 X3 - - -X3 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 - -Additional components - -4 x Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 - -1 x Test -P/N: ABC, Molex: 45454, Mousikey: 9999 + + +X3 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +Additional components + +4 x Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 + +1 x Test +P/N: ABC, Molex: 45454, Mousikey: 9999 W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + diff --git a/tutorial/tutorial08.png b/tutorial/tutorial08.png index 166bc1b3..8f9d65e2 100644 Binary files a/tutorial/tutorial08.png and b/tutorial/tutorial08.png differ diff --git a/tutorial/tutorial08.svg b/tutorial/tutorial08.svg index 5189a501..ad900afd 100644 --- a/tutorial/tutorial08.svg +++ b/tutorial/tutorial08.svg @@ -1,326 +1,326 @@ - - - - + + + X1 - - -X1 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 - -Additional components - -4 x Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 - -1 x Test -P/N: ABC, Molex: 45454, Mousikey: 9999 + + +X1 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +Additional components + +4 x Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 + +1 x Test +P/N: ABC, Molex: 45454, Mousikey: 9999 W1 - - -W1 - -P/N: CAB1 - -CablesCo: ABC123 - -Cables R Us: 999-888-777 - -4x - -0.25 mm² - -1 m -  -X1:1 -     1:BN     -X2:1 - - - -X1:2 -     2:RD     -X2:2 - - - -X1:3 -     3:OG     -X2:3 - - - -X1:4 -     4:YE     -X2:4 - - - -  + + +W1 + +P/N: CAB1 + +CablesCo: ABC123 + +Cables R Us: 999-888-777 + +4x + +0.25 mm² + +1 m +  +X1:1 +     1:BN     +X2:1 + + + +X1:2 +     2:RD     +X2:2 + + + +X1:3 +     3:OG     +X2:3 + + + +X1:4 +     4:YE     +X2:4 + + + +  X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + X1:e--W1:w - - - + + + W2 - - -W2 - -4x - -0.25 mm² - -1 m -  -X1:1 -     YE     -X3:1 - - - -P/N: WIRE1 -WiresCo: W1-YE -WireShack: 1001 -X1:2 -     BK     -X3:2 - - - -P/N: WIRE2 -WiresCo: W1-BK -WireShack: 1002 -X1:3 -     BK     -X3:3 - - - -P/N: WIRE2 -WiresCo: W1-BK -WireShack: 1002 -X1:4 -     RD     -X3:4 - - - -P/N: WIRE3 -WiresCo: W1-RD -WireShack: 1009 -  - -Additional components - -1 m x Sleve, Braided nylon, black, 3mm -P/N: SLV-1 + + +W2 + +4x + +0.25 mm² + +1 m +  +X1:1 +     YE     +X3:1 + + + +P/N: WIRE1 +WiresCo: W1-YE +WireShack: 1001 +X1:2 +     BK     +X3:2 + + + +P/N: WIRE2 +WiresCo: W1-BK +WireShack: 1002 +X1:3 +     BK     +X3:3 + + + +P/N: WIRE2 +WiresCo: W1-BK +WireShack: 1002 +X1:4 +     RD     +X3:4 + + + +P/N: WIRE3 +WiresCo: W1-RD +WireShack: 1009 +  + +Additional components + +1 m x Sleve, Braided nylon, black, 3mm +P/N: SLV-1 X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X1:e--W2:w - - - + + + X2 - - -X2 - -P/N: CON4 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 - -Additional components - -4 x Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 - -1 x Test -P/N: ABC, Molex: 45454, Mousikey: 9999 + + +X2 + +P/N: CON4 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +Additional components + +4 x Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 + +1 x Test +P/N: ABC, Molex: 45454, Mousikey: 9999 X3 - - -X3 - -Molex: 22013047 - -Digimouse: 1234 - -Molex KK 254 - -female - -4-pin - -1 - -2 - -3 - -4 - -Additional components - -4 x Crimp, Molex KK 254, 22-30 AWG -Molex: 08500030 - -1 x Test -P/N: ABC, Molex: 45454, Mousikey: 9999 + + +X3 + +Molex: 22013047 + +Digimouse: 1234 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +Additional components + +4 x Crimp, Molex KK 254, 22-30 AWG +Molex: 08500030 + +1 x Test +P/N: ABC, Molex: 45454, Mousikey: 9999 W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W1:e--X2:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + + W2:e--X3:w - - - + + +