diff --git a/examples/ex15.gv b/examples/ex15.gv index 402948e..8dd548d 100644 --- a/examples/ex15.gv +++ b/examples/ex15.gv @@ -167,19 +167,19 @@ graph { > fillcolor="#FFFFFF" shape=box style=filled] - edge [color="#000000:#895956:#000000"] + edge [color="#000000:#0066ff:#ffffff:#0066ff:#000000"] X1:p1r:e -- W1:w1:w W1:w1:e -- X2:p1l:w W1:w1:w -- W1:w1:e [straight=straight] - edge [color="#000000:#ff0000:#000000"] + edge [color="#000000:#ffffff:#0066ff:#ffffff:#000000"] X1:p2r:e -- W1:w2:w W1:w2:e -- X2:p2l:w W1:w2:w -- W1:w2:e [straight=straight] - edge [color="#000000:#ff8000:#000000"] + edge [color="#000000:#ff8000:#ffffff:#ff8000:#000000"] X1:p3r:e -- W1:w3:w W1:w3:e -- X2:p4l:w W1:w3:w -- W1:w3:e [straight=straight] - edge [color="#000000:#ffff00:#000000"] + edge [color="#000000:#ffffff:#ff8000:#ffffff:#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p3l:w W1:w4:w -- W1:w4:e [straight=straight] @@ -208,12 +208,12 @@ graph { X1:1:GND - 1:BN + 1:BUWH X2:1:GND - +
@@ -222,12 +222,12 @@ graph { X1:2:VCC - 2:RD + 2:WHBU X2:2:VCC - +
@@ -236,12 +236,12 @@ graph { X1:3:RX - 3:OG + 3:OGWH X2:4:TX - +
@@ -250,12 +250,12 @@ graph { X1:4:TX - 4:YE + 4:WHOG X2:3:RX - +
diff --git a/examples/ex15.html b/examples/ex15.html index 00c976c..c0b19c5 100644 --- a/examples/ex15.html +++ b/examples/ex15.html @@ -33,10 +33,10 @@ - - - + + + X1 @@ -122,206 +122,230 @@ 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:BUWH     +X2:1:GND +X1:2:VCC +     2:WHBU     +X2:2:VCC +X1:3:RX +     3:OGWH     +X2:4:TX +X1:4:TX +     4:WHOG     +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 - + W1:w--W1:e - - - + + + + + W1:w--W1:e - - - + + + + + W1:w--W1:e - - - + + + + + W1:w--W1:e - - - + + + + + W1:w--W1:e - + X2 - - -X2 - -Molex KK 254 - -female - -7-pin - - - -SH1 - -SH2 - -1 - -GND - - - -2 - -VCC - - - -3 - -RX - - - -4 - -TX - - - -5 - -GND - - - -6 - -VCC - - - -7 - -GND - - + + +X2 + +Molex KK 254 + +female + +7-pin + + + +SH1 + +SH2 + +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 - - - + + + + + X2:c--X2:c - + X2:c--X2:c - + X2:c--X2:c - + @@ -356,32 +380,32 @@ __CIRCLE__7 - + __CIRCLE__8 - + __CIRCLE__9 - + __CIRCLE__10 - + __CIRCLE__11 - + __CIRCLE__12 - + diff --git a/examples/ex15.png b/examples/ex15.png index 9ec5ee9..38b804b 100644 Binary files a/examples/ex15.png and b/examples/ex15.png differ diff --git a/examples/ex15.svg b/examples/ex15.svg index 6b18f9f..528c4e4 100644 --- a/examples/ex15.svg +++ b/examples/ex15.svg @@ -4,10 +4,10 @@ - - - + + + X1 @@ -93,206 +93,230 @@ 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:BUWH     +X2:1:GND +X1:2:VCC +     2:WHBU     +X2:2:VCC +X1:3:RX +     3:OGWH     +X2:4:TX +X1:4:TX +     4:WHOG     +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 - + W1:w--W1:e - - - + + + + + W1:w--W1:e - - - + + + + + W1:w--W1:e - - - + + + + + W1:w--W1:e - - - + + + + + W1:w--W1:e - + X2 - - -X2 - -Molex KK 254 - -female - -7-pin - - - -SH1 - -SH2 - -1 - -GND - - - -2 - -VCC - - - -3 - -RX - - - -4 - -TX - - - -5 - -GND - - - -6 - -VCC - - - -7 - -GND - - + + +X2 + +Molex KK 254 + +female + +7-pin + + + +SH1 + +SH2 + +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 - - - + + + + + X2:c--X2:c - + X2:c--X2:c - + X2:c--X2:c - + @@ -327,32 +351,32 @@ __CIRCLE__7 - + __CIRCLE__8 - + __CIRCLE__9 - + __CIRCLE__10 - + __CIRCLE__11 - + __CIRCLE__12 - + diff --git a/examples/ex15.yml b/examples/ex15.yml index e97f56c..9fb30f1 100644 --- a/examples/ex15.yml +++ b/examples/ex15.yml @@ -29,7 +29,7 @@ connectors: # This is based on ex1 and adds some Shorts to the connectors cables: W1: - color_code: IEC + color_code: TEL wirecount: 4 gauge: 0.25 mm2 show_equiv: true