diff --git a/images/usb_connector.jpeg b/images/usb_connector.jpeg new file mode 100644 index 0000000..35396e5 Binary files /dev/null and b/images/usb_connector.jpeg differ diff --git a/wireviz/p1_water.bom.tsv b/wireviz/p1_water.bom.tsv index 71f9c33..fec19af 100644 --- a/wireviz/p1_water.bom.tsv +++ b/wireviz/p1_water.bom.tsv @@ -1,12 +1,15 @@ Id Description Qty Unit Designators 1 Connector, 16 pins 1 D1Mini 2 Connector, 3 pins 2 P1Connector, Water -3 Connector, 6 pins 1 P1 -4 Wire, BK 0 m -5 Wire, BN 0 m -6 Wire, BU 0 m -7 Wire, GN 0 m -8 Wire, OG 0 m -9 Wire, VT 0 m -10 Wire, WH 0 m -11 Wire, WHGN 0 m +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 diff --git a/wireviz/p1_water.html b/wireviz/p1_water.html index 116b792..96d754b 100644 --- a/wireviz/p1_water.html +++ b/wireviz/p1_water.html @@ -191,437 +191,535 @@ - - + + %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 + +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 + + - + 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 + + + + + +     N.C.     + + + +     Data     + + + +     Power GND     + + + +  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: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 + + 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 + + + + + @@ -636,68 +734,89 @@
- + - + - + - + + + + + + + + - + + + + + + + + - + - + - + - + + + + + + + + diff --git a/wireviz/p1_water.png b/wireviz/p1_water.png index b8fb313..5867230 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 b694c67..b468b5c 100644 --- a/wireviz/p1_water.svg +++ b/wireviz/p1_water.svg @@ -4,437 +4,535 @@ - - + + %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 + +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 + + - + 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 + + + + + +     N.C.     + + + +     Data     + + + +     Power GND     + + + +  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: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 + + 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 + + + + + diff --git a/wireviz/p1_water.yml b/wireviz/p1_water.yml index 7cd6aa8..3740fd5 100644 --- a/wireviz/p1_water.yml +++ b/wireviz/p1_water.yml @@ -32,6 +32,12 @@ cables: # length: 0.3 wirelabels: [+5V, Signal, GND] colors: [BN, BK, BU] + USBPowerc: + <<: *wire +# gauge: 0.14 mm2 +# length: 0.2 + wirelabels: [+5V, D+, D-, GND] + colors: [RD, WH,GR, BK] connectors: P1Connector: pins: [1,2,3] @@ -56,6 +62,12 @@ connectors: <<: *img_width pins: [1,2,3] pinlabels: [+5V, Signal, GND] + USB: + image: + src: ../images/usb_connector.jpeg # path to the image file + <<: *img_width +# pins: [1-4] + pinlabels: [+5V, D+, D-, GND] connections: - @@ -70,6 +82,10 @@ connections: - D1Mini: [+5V, GND, GPIO00] - Waterc: [1,2,3] - Water: [+5V, Signal, GND] + - + - D1Mini: [+5V, GND] + - USBPowerc: [+5V, GND] + - USB: [+5V, GND] tweak:
1114 Wire, WHGN 0 m
1013 Wire, WH 0 m
912 Wire, VT 0 m
811Wire, RD0m
10 Wire, OG 0 m
79Wire, GR0m
8 Wire, GN 0 m
67 Wire, BU 0 m
56 Wire, BN 0 m
45 Wire, BK 0 m
34 Connector, 6 pins 1 P1
3Connector, 4 pins1USB
2 Connector, 3 pins