diff --git a/wireviz/p1_water.bom.tsv b/wireviz/p1_water.bom.tsv index fec19af..1ffae01 100644 --- a/wireviz/p1_water.bom.tsv +++ b/wireviz/p1_water.bom.tsv @@ -1,15 +1,7 @@ Id Description Qty Unit Designators -1 Connector, 16 pins 1 D1Mini -2 Connector, 3 pins 2 P1Connector, Water -3 Connector, 4 pins 1 USB -4 Connector, 6 pins 1 P1 -5 Wire, BK 0 m -6 Wire, BN 0 m -7 Wire, BU 0 m -8 Wire, GN 0 m -9 Wire, GR 0 m -10 Wire, OG 0 m -11 Wire, RD 0 m -12 Wire, VT 0 m -13 Wire, WH 0 m -14 Wire, WHGN 0 m +1 Cable, 3 wires 0 m +2 Cable, 4 wires 0 m +3 Connector, 20 pins 1 D1Mini +4 Connector, 3 pins 2 P1Connector, Water +5 Connector, 4 pins 1 USB +6 Connector, 6 pins 1 P1 diff --git a/wireviz/p1_water.html b/wireviz/p1_water.html index 96d754b..639570a 100644 --- a/wireviz/p1_water.html +++ b/wireviz/p1_water.html @@ -191,535 +191,579 @@ - - + + %3 - + D1Mini - - -D1Mini - -16-pin - -+5V - -1 - -GND - -2 - -GPIO02 - -3 - -GPIO00 - -4 - -GPIO04 - -5 - -GPIO05 - -6 - -RX - -7 - -TX - -8 - -RST - -9 - -ADC - -10 - -GPIO16 - -11 - -GPIO14 - -12 - -GPIO12 - -13 - -GPIO13 - -14 - -GPIO15 - -15 - -+3.3V - -16 - - + + +D1Mini + +20-pin + ++5V + +1 + +GND + +2 + +GPIO02 + +3 + +GPIO00 + +4 + +GPIO04 + +5 + +GPIO05 + +6 + +RX + +7 + +TX + +8 + +RST + +9 + +ADC + +10 + +GPIO16 + +11 + +GPIO14 + +12 + +GPIO12 + +13 + +GPIO13 + +14 + +GPIO15 + +15 + ++3.3V + +16 + +USB5V + +17 + +USBd+ + +18 + +USBd- + +19 + +USBGND + +20 + + P1c1 - -  -D1Mini:1:+5V -     WH:+5V     -P1Connector:1:+3.3V - - - - - -D1Mini:2:GND -     VT:Request     -P1Connector:2:Data GND - - - - - -D1Mini:7:RX -     BU:Data GND     -P1Connector:3:Data - - - - - -     N.C.     - - - -     Data     - - - -     Power GND     - - - -  + +  +D1Mini:1:+5V +     WH:+5V     +P1Connector:1:+3.3V + + + + + +D1Mini:2:GND +     VT:Request     +P1Connector:2:Data GND + + + + + +D1Mini:7:RX +     BU:Data GND     +P1Connector:3:Data + + + + + +  D1Mini:e--P1c1:w - - - - - + + + + + D1Mini:e--P1c1:w - - - - - + + + + + D1Mini:e--P1c1:w - - - - - + + + + + Waterc - -  -D1Mini:1:+5V -     BN:+5V     -Water:1:+5V - - - - - -D1Mini:2:GND -     BK:Signal     -Water:2:Signal - - - - - -D1Mini:4:GPIO00 -     BU:GND     -Water:3:GND - - - - - -  + +  +D1Mini:1:+5V +     BN:+5V     +Water:1:+5V + + + + + +D1Mini:2:GND +     BK:Signal     +Water:2:Signal + + + + + +D1Mini:4:GPIO00 +     BU:GND     +Water:3:GND + + + + + +  D1Mini:e--Waterc:w - - - - - + + + + + D1Mini:e--Waterc:w - - - - - + + + + + D1Mini:e--Waterc:w - - - - - + + + + + USBPowerc - -  -D1Mini:1:+5V -     RD:+5V     -USB:1:+5V - - - - - -     WH:D+     - - - - - -     GR:D-     - - - - - -D1Mini:2:GND -     BK:GND     -USB:4:GND - - - - - -  + +  +D1Mini:17:USB5V +     RD:+5V     +USB:1:+5V + + + + + +D1Mini:18:USBd+ +     WH:D+     +USB:2:D+ + + + + + +D1Mini:19:USBd- +     GN:D-     +USB:3:D- + + + + + +D1Mini:20:USBGND +     BK:GND     +USB:4:GND + + + + + +  D1Mini:e--USBPowerc:w - - - - - + + + + + D1Mini:e--USBPowerc:w - - - - - + + + + + + + + +D1Mini:e--USBPowerc:w + + + + + + + + +D1Mini:e--USBPowerc:w + + + + + P1Connector - - -P1Connector - -3-pin - -1 - -+3.3V - -1 - -2 - -Data GND - -2 - -3 - -Data - -3 + + +P1Connector + +3-pin + +1 + ++3.3V + +1 + +2 + +Data GND + +2 + +3 + +Data + +3 P1c2 - -  -P1Connector:1:+3.3V -     WHGN     -P1:1:+5V - - - - - -P1Connector:2:Data GND -     GN     -P1:3:Data GND - - - - - -P1Connector:3:Data -     OG     -P1:5:Data - - - - - -  + +  +P1Connector:1:+3.3V +     WHGN     +P1:1:+5V + + + + + +P1Connector:2:Data GND +     GN     +P1:3:Data GND + + + + + +P1Connector:3:Data +     OG     +P1:5:Data + + + + + +  P1Connector:e--P1c2:w - - - - - + + + + + P1Connector:e--P1c2:w - - - - - + + + + + P1Connector:e--P1c2:w - - - - - + + + + + P1 - - -P1 - -6-pin - -1 - -+5V - -2 - -Request - -3 - -Data GND - -4 - -N.C. - -5 - -Data - -6 - -Power GND - - + + +P1 + +6-pin + +1 + ++5V + +2 + +Request + +3 + +Data GND + +4 + +N.C. + +5 + +Data + +6 + +Power GND + + Water - - -Water - -3-pin - -1 - -+5V - -2 - -Signal - -3 - -GND - - + + +Water + +3-pin + +1 + ++5V + +2 + +Signal + +3 + +GND + + USB - - -USB - -4-pin - -1 - -+5V - -2 - -D+ - -3 - -D- - -4 - -GND - - + + +USB + +4-pin + +1 + ++5V + +2 + +D+ + +3 + +D- + +4 + +GND + + P1c1:e--P1Connector:w - - - - - + + + + + P1c1:e--P1Connector:w - - - - - + + + + + P1c1:e--P1Connector:w - - - - - + + + + + P1c2:e--P1:w - - - - - + + + + + P1c2:e--P1:w - - - - - + + + + + P1c2:e--P1:w - - - - - + + + + + Waterc:e--Water:w - - - - - + + + + + Waterc:e--Water:w - - - - - + + + + + Waterc:e--Water:w - - - - - + + + + + USBPowerc:e--USB:w - - - - - + + + + + USBPowerc:e--USB:w - - - - - + + + + + + + + +USBPowerc:e--USB:w + + + + + + + + +USBPowerc:e--USB:w + + + + + @@ -733,104 +777,48 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + + + + + + + + + + + + + + + diff --git a/wireviz/p1_water.png b/wireviz/p1_water.png index 5867230..e72e68a 100644 Binary files a/wireviz/p1_water.png and b/wireviz/p1_water.png differ diff --git a/wireviz/p1_water.svg b/wireviz/p1_water.svg index b468b5c..b66dee9 100644 --- a/wireviz/p1_water.svg +++ b/wireviz/p1_water.svg @@ -4,535 +4,579 @@ - - + + %3 - + D1Mini - - -D1Mini - -16-pin - -+5V - -1 - -GND - -2 - -GPIO02 - -3 - -GPIO00 - -4 - -GPIO04 - -5 - -GPIO05 - -6 - -RX - -7 - -TX - -8 - -RST - -9 - -ADC - -10 - -GPIO16 - -11 - -GPIO14 - -12 - -GPIO12 - -13 - -GPIO13 - -14 - -GPIO15 - -15 - -+3.3V - -16 - - + + +D1Mini + +20-pin + ++5V + +1 + +GND + +2 + +GPIO02 + +3 + +GPIO00 + +4 + +GPIO04 + +5 + +GPIO05 + +6 + +RX + +7 + +TX + +8 + +RST + +9 + +ADC + +10 + +GPIO16 + +11 + +GPIO14 + +12 + +GPIO12 + +13 + +GPIO13 + +14 + +GPIO15 + +15 + ++3.3V + +16 + +USB5V + +17 + +USBd+ + +18 + +USBd- + +19 + +USBGND + +20 + + P1c1 - -  -D1Mini:1:+5V -     WH:+5V     -P1Connector:1:+3.3V - - - - - -D1Mini:2:GND -     VT:Request     -P1Connector:2:Data GND - - - - - -D1Mini:7:RX -     BU:Data GND     -P1Connector:3:Data - - - - - -     N.C.     - - - -     Data     - - - -     Power GND     - - - -  + +  +D1Mini:1:+5V +     WH:+5V     +P1Connector:1:+3.3V + + + + + +D1Mini:2:GND +     VT:Request     +P1Connector:2:Data GND + + + + + +D1Mini:7:RX +     BU:Data GND     +P1Connector:3:Data + + + + + +  D1Mini:e--P1c1:w - - - - - + + + + + D1Mini:e--P1c1:w - - - - - + + + + + D1Mini:e--P1c1:w - - - - - + + + + + Waterc - -  -D1Mini:1:+5V -     BN:+5V     -Water:1:+5V - - - - - -D1Mini:2:GND -     BK:Signal     -Water:2:Signal - - - - - -D1Mini:4:GPIO00 -     BU:GND     -Water:3:GND - - - - - -  + +  +D1Mini:1:+5V +     BN:+5V     +Water:1:+5V + + + + + +D1Mini:2:GND +     BK:Signal     +Water:2:Signal + + + + + +D1Mini:4:GPIO00 +     BU:GND     +Water:3:GND + + + + + +  D1Mini:e--Waterc:w - - - - - + + + + + D1Mini:e--Waterc:w - - - - - + + + + + D1Mini:e--Waterc:w - - - - - + + + + + USBPowerc - -  -D1Mini:1:+5V -     RD:+5V     -USB:1:+5V - - - - - -     WH:D+     - - - - - -     GR:D-     - - - - - -D1Mini:2:GND -     BK:GND     -USB:4:GND - - - - - -  + +  +D1Mini:17:USB5V +     RD:+5V     +USB:1:+5V + + + + + +D1Mini:18:USBd+ +     WH:D+     +USB:2:D+ + + + + + +D1Mini:19:USBd- +     GN:D-     +USB:3:D- + + + + + +D1Mini:20:USBGND +     BK:GND     +USB:4:GND + + + + + +  D1Mini:e--USBPowerc:w - - - - - + + + + + D1Mini:e--USBPowerc:w - - - - - + + + + + + + + +D1Mini:e--USBPowerc:w + + + + + + + + +D1Mini:e--USBPowerc:w + + + + + P1Connector - - -P1Connector - -3-pin - -1 - -+3.3V - -1 - -2 - -Data GND - -2 - -3 - -Data - -3 + + +P1Connector + +3-pin + +1 + ++3.3V + +1 + +2 + +Data GND + +2 + +3 + +Data + +3 P1c2 - -  -P1Connector:1:+3.3V -     WHGN     -P1:1:+5V - - - - - -P1Connector:2:Data GND -     GN     -P1:3:Data GND - - - - - -P1Connector:3:Data -     OG     -P1:5:Data - - - - - -  + +  +P1Connector:1:+3.3V +     WHGN     +P1:1:+5V + + + + + +P1Connector:2:Data GND +     GN     +P1:3:Data GND + + + + + +P1Connector:3:Data +     OG     +P1:5:Data + + + + + +  P1Connector:e--P1c2:w - - - - - + + + + + P1Connector:e--P1c2:w - - - - - + + + + + P1Connector:e--P1c2:w - - - - - + + + + + P1 - - -P1 - -6-pin - -1 - -+5V - -2 - -Request - -3 - -Data GND - -4 - -N.C. - -5 - -Data - -6 - -Power GND - - + + +P1 + +6-pin + +1 + ++5V + +2 + +Request + +3 + +Data GND + +4 + +N.C. + +5 + +Data + +6 + +Power GND + + Water - - -Water - -3-pin - -1 - -+5V - -2 - -Signal - -3 - -GND - - + + +Water + +3-pin + +1 + ++5V + +2 + +Signal + +3 + +GND + + USB - - -USB - -4-pin - -1 - -+5V - -2 - -D+ - -3 - -D- - -4 - -GND - - + + +USB + +4-pin + +1 + ++5V + +2 + +D+ + +3 + +D- + +4 + +GND + + P1c1:e--P1Connector:w - - - - - + + + + + P1c1:e--P1Connector:w - - - - - + + + + + P1c1:e--P1Connector:w - - - - - + + + + + P1c2:e--P1:w - - - - - + + + + + P1c2:e--P1:w - - - - - + + + + + P1c2:e--P1:w - - - - - + + + + + Waterc:e--Water:w - - - - - + + + + + Waterc:e--Water:w - - - - - + + + + + Waterc:e--Water:w - - - - - + + + + + USBPowerc:e--USB:w - - - - - + + + + + USBPowerc:e--USB:w - - - - - + + + + + + + + +USBPowerc:e--USB:w + + + + + + + + +USBPowerc:e--USB:w + + + + + diff --git a/wireviz/p1_water.yml b/wireviz/p1_water.yml index 3740fd5..6adbec0 100644 --- a/wireviz/p1_water.yml +++ b/wireviz/p1_water.yml @@ -2,18 +2,19 @@ templates: # defining templates to be used later on - &img_width width: 375 - &wire - category: bundle + # category: bundle shield: false show_equiv: false show_name: false show_wirecount: false show_wirenumbers: false + cables: P1c1: <<: *wire # gauge: 0.14 mm2 # length: 0.2 - wirelabels: [+5V, Request, Data GND, N.C., Data, Power GND] + wirelabels: [+5V, Request, Data GND] colors: [WH,VT, BU] P1c2: <<: *wire @@ -37,7 +38,8 @@ cables: # gauge: 0.14 mm2 # length: 0.2 wirelabels: [+5V, D+, D-, GND] - colors: [RD, WH,GR, BK] + colors: [RD, WH,GN, BK] + connectors: P1Connector: pins: [1,2,3] @@ -47,9 +49,10 @@ connectors: image: src: ../images/d1_mini_pinout.png # path to the image file <<: *img_width - pins: [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16] + pins: [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20] pinlabels: [+5V, GND, GPIO02, GPIO00, GPIO04, GPIO05, RX, TX, - RST, ADC, GPIO16, GPIO14, GPIO12, GPIO13, GPIO15, +3.3V] + RST, ADC, GPIO16, GPIO14, GPIO12, GPIO13, GPIO15, +3.3V, + USB5V, USBd+, USBd-, USBGND] P1: image: src: ../images/P1I.png # path to the image file @@ -83,9 +86,9 @@ connections: - Waterc: [1,2,3] - Water: [+5V, Signal, GND] - - - D1Mini: [+5V, GND] - - USBPowerc: [+5V, GND] - - USB: [+5V, GND] + - D1Mini: [USB5V, USBd+, USBd-, USBGND] + - USBPowerc: [+5V,D+, D-, GND] + - USB: [+5V, D+, D-, GND] tweak:
14Wire, WHGN0m
13Wire, WH0m
12Wire, VT0m
11Wire, RD0m
10Wire, OG0m
9Wire, GR0m
8Wire, GN0m
7Wire, BU0m
6Wire, BN0m
5Wire, BK0m
4 Connector, 6 pins 1 P1
35 Connector, 4 pins 1 USB
24 Connector, 3 pins 2 P1Connector, Water
1Connector, 16 pins3Connector, 20 pins 1 D1Mini
2Cable, 4 wires0m
1Cable, 3 wires0m
Id Description