diff --git a/tutorial/readme.md b/tutorial/readme.md index 9f73220..31b7c70 100644 --- a/tutorial/readme.md +++ b/tutorial/readme.md @@ -115,9 +115,10 @@ Output: ![](tutorial03.png) -## Templates (II), American standards, daisy chaining (I) +## Templates (II), notes,American standards, daisy chaining (I) * Overriding template parameters +* Add nodes to connectors (and cables) * American standards: AWG gauge and IEC colors * Linear daisy-chain @@ -145,9 +146,11 @@ cables: length: 0.3 gauge: 24 AWG # specifying guage in AWG directly color_code: IEC # IEC 62 colors also supported + notes: This cable is a bit longer W2: <<: *template_cbl length: 0.1 + notes: This cable is a bit shorter connections: - @@ -195,7 +198,6 @@ cables: length: 0.3 gauge: 0.5 mm colors: [YE, BK, BK, RD] # custom colors, wirecount is implicit - notes: hello! connections: - # attach ferrules diff --git a/tutorial/tutorial04.gv b/tutorial/tutorial04.gv index bc89b14..b61e32a 100644 --- a/tutorial/tutorial04.gv +++ b/tutorial/tutorial04.gv @@ -19,7 +19,7 @@ graph { edge [color="#000000:#ffff00:#000000"] X1:p4r:e -- W1:w4:w W1:w4:e -- X2:p4l:w - W1 [label=<
W1
4x24 AWG0.3 m
 
X1:1BNX2:1
X1:2RDX2:2
X1:3OGX2:3
X1:4YEX2:4
 
> fillcolor=white margin=0 shape=box style=""] + W1 [label=<
W1
4x24 AWG0.3 m
 
X1:1BNX2:1
X1:2RDX2:2
X1:3OGX2:3
X1:4YEX2:4
 
This cable is a bit longer
 
> fillcolor=white margin=0 shape=box style=""] edge [color="#000000:#666600:#000000"] X2:p1r:e -- W2:w1:w W2:w1:e -- X3:p1l:w @@ -32,5 +32,5 @@ graph { edge [color="#000000:#ffff00:#000000"] X2:p4r:e -- W2:w4:w W2:w4:e -- X3:p4l:w - W2 [label=<
W2
4x24 AWG0.1 m
 
X2:1BNX3:1
X2:2RDX3:2
X2:3OGX3:3
X2:4YEX3:4
 
> fillcolor=white margin=0 shape=box style=""] + W2 [label=<
W2
4x24 AWG0.1 m
 
X2:1BNX3:1
X2:2RDX3:2
X2:3OGX3:3
X2:4YEX3:4
 
This cable is a bit shorter
 
> fillcolor=white margin=0 shape=box style=""] } diff --git a/tutorial/tutorial04.html b/tutorial/tutorial04.html index 2174704..c32828d 100644 --- a/tutorial/tutorial04.html +++ b/tutorial/tutorial04.html @@ -4,297 +4,301 @@ - - - + + + X1 - -X1 - -Molex KK 254 - -male - -4-pin - -GND - -VCC - -SCL - -SDA - -1 - -2 - -3 - -4 - -to microcontroller + +X1 + +Molex KK 254 + +male + +4-pin + +GND + +VCC + +SCL + +SDA + +1 + +2 + +3 + +4 + +to microcontroller W1 - - -W1 - -4x - -24 AWG - -0.3 m -  -X1:1 -BN -X2:1 - - - -X1:2 -RD -X2:2 - - - -X1:3 -OG -X2:3 - - - -X1:4 -YE -X2:4 - - - -  + + +W1 + +4x + +24 AWG + +0.3 m +  +X1:1 +BN +X2:1 + + + +X1:2 +RD +X2:2 + + + +X1:3 +OG +X2:3 + + + +X1:4 +YE +X2:4 + + + +  +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 - -2 - -3 - -4 - -GND - -VCC - -SCL - -SDA - -1 - -2 - -3 - -4 - -to accelerometer + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +GND + +VCC + +SCL + +SDA + +1 + +2 + +3 + +4 + +to accelerometer W2 - - -W2 - -4x - -24 AWG - -0.1 m -  -X2:1 -BN -X3:1 - - - -X2:2 -RD -X3:2 - - - -X2:3 -OG -X3:3 - - - -X2:4 -YE -X3:4 - - - -  + + +W2 + +4x + +24 AWG + +0.1 m +  +X2:1 +BN +X3:1 + + + +X2:2 +RD +X3:2 + + + +X2:3 +OG +X3:3 + + + +X2:4 +YE +X3:4 + + + +  +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 - -2 - -3 - -4 - -GND - -VCC - -SCL - -SDA - -to temperature sensor + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +GND + +VCC + +SCL + +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.md b/tutorial/tutorial04.md index 7465b6b..a2ed709 100644 --- a/tutorial/tutorial04.md +++ b/tutorial/tutorial04.md @@ -1,5 +1,6 @@ -## Templates (II), American standards, daisy chaining (I) +## Templates (II), notes,American standards, daisy chaining (I) * Overriding template parameters +* Add nodes to connectors (and cables) * American standards: AWG gauge and IEC colors * Linear daisy-chain diff --git a/tutorial/tutorial04.png b/tutorial/tutorial04.png index 1af706f..51e24e5 100644 Binary files a/tutorial/tutorial04.png and b/tutorial/tutorial04.png differ diff --git a/tutorial/tutorial04.svg b/tutorial/tutorial04.svg index d831c04..31fbb73 100644 --- a/tutorial/tutorial04.svg +++ b/tutorial/tutorial04.svg @@ -4,297 +4,301 @@ - - - + + + X1 - -X1 - -Molex KK 254 - -male - -4-pin - -GND - -VCC - -SCL - -SDA - -1 - -2 - -3 - -4 - -to microcontroller + +X1 + +Molex KK 254 + +male + +4-pin + +GND + +VCC + +SCL + +SDA + +1 + +2 + +3 + +4 + +to microcontroller W1 - - -W1 - -4x - -24 AWG - -0.3 m -  -X1:1 -BN -X2:1 - - - -X1:2 -RD -X2:2 - - - -X1:3 -OG -X2:3 - - - -X1:4 -YE -X2:4 - - - -  + + +W1 + +4x + +24 AWG + +0.3 m +  +X1:1 +BN +X2:1 + + + +X1:2 +RD +X2:2 + + + +X1:3 +OG +X2:3 + + + +X1:4 +YE +X2:4 + + + +  +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 - -2 - -3 - -4 - -GND - -VCC - -SCL - -SDA - -1 - -2 - -3 - -4 - -to accelerometer + +X2 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +GND + +VCC + +SCL + +SDA + +1 + +2 + +3 + +4 + +to accelerometer W2 - - -W2 - -4x - -24 AWG - -0.1 m -  -X2:1 -BN -X3:1 - - - -X2:2 -RD -X3:2 - - - -X2:3 -OG -X3:3 - - - -X2:4 -YE -X3:4 - - - -  + + +W2 + +4x + +24 AWG + +0.1 m +  +X2:1 +BN +X3:1 + + + +X2:2 +RD +X3:2 + + + +X2:3 +OG +X3:3 + + + +X2:4 +YE +X3:4 + + + +  +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 - -2 - -3 - -4 - -GND - -VCC - -SCL - -SDA - -to temperature sensor + +X3 + +Molex KK 254 + +female + +4-pin + +1 + +2 + +3 + +4 + +GND + +VCC + +SCL + +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.yml b/tutorial/tutorial04.yml index 25e4ac5..b6ef9d6 100644 --- a/tutorial/tutorial04.yml +++ b/tutorial/tutorial04.yml @@ -19,9 +19,11 @@ cables: length: 0.3 gauge: 24 AWG # specifying guage in AWG directly color_code: IEC # IEC 62 colors also supported + notes: This cable is a bit longer W2: <<: *template_cbl length: 0.1 + notes: This cable is a bit shorter connections: - diff --git a/tutorial/tutorial05.gv b/tutorial/tutorial05.gv index dca9b6f..3f4b791 100644 --- a/tutorial/tutorial05.gv +++ b/tutorial/tutorial05.gv @@ -61,5 +61,5 @@ graph { W1:w3:e -- X1:p3l:w edge [color="#000000:#ff0000:#000000"] W1:w4:e -- X1:p4l:w - W1 [label=<
W1
4x0.5 mm0.3 m
 
YEX1:1
BKX1:2
BKX1:3
RDX1:4
 
hello!
 
> fillcolor=white margin=0 shape=box style="filled,dashed"] + W1 [label=<
W1
4x0.5 mm0.3 m
 
YEX1:1
BKX1:2
BKX1:3
RDX1:4
 
> fillcolor=white margin=0 shape=box style="filled,dashed"] } diff --git a/tutorial/tutorial05.html b/tutorial/tutorial05.html index e099d07..445d948 100644 --- a/tutorial/tutorial05.html +++ b/tutorial/tutorial05.html @@ -50,7 +50,7 @@ W1 - + W1 @@ -81,8 +81,6 @@   -hello! -  diff --git a/tutorial/tutorial05.png b/tutorial/tutorial05.png index 920a5c9..6518896 100644 Binary files a/tutorial/tutorial05.png and b/tutorial/tutorial05.png differ diff --git a/tutorial/tutorial05.svg b/tutorial/tutorial05.svg index 082c3c0..fb6361f 100644 --- a/tutorial/tutorial05.svg +++ b/tutorial/tutorial05.svg @@ -50,7 +50,7 @@ W1 - + W1 @@ -81,8 +81,6 @@   -hello! -  diff --git a/tutorial/tutorial05.yml b/tutorial/tutorial05.yml index e3bbf14..d027c57 100644 --- a/tutorial/tutorial05.yml +++ b/tutorial/tutorial05.yml @@ -16,7 +16,6 @@ cables: length: 0.3 gauge: 0.5 mm colors: [YE, BK, BK, RD] # custom colors, wirecount is implicit - notes: hello! connections: - # attach ferrules