warehack.ing/WireViz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add unnamed connector ('ferrule') support proof of concept

Browse Source
This commit is contained in:
Daniel Rojas 2020-05-27 21:49:18 +02:00
parent c58cda04b1
commit 591829b6fc
2 changed files with 180 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
examples/ferrules.yml Normal file
View File

@ -0,0 +1,36 @@
nodes:
X1:
type: D-Sub
gender: female
num_pins: 4
X2:
type: Molex KK 254
gender: female
num_pins: 3
wires:
W1:
mm2: 0.25
length: 0.2
color_code: IEC
num_wires: 10
shield: true
ferrules:
F_test:
type: crimp
connections:
-
- X1: [1-3]
- W1: [1-3]
- X2: [1-3]
-
- X1: 4
- W1: s
-
- F_test
- W1: [4-10]
-
- W1: [10-4]
- F_test

221
src/yaml2wireviz.py
View File

@ -1,7 +1,7 @@
import yaml
import wireviz
filename = '../examples/example2.yml'
filename = '../examples/ferrules.yml'
def check_designators(what, where):
for i,x in enumerate(what):
@ -46,82 +46,149 @@ with open(filename, 'r') as stream:
h = wireviz.Harness()
# add nodes
for k, o in input['nodes'].items():
h.add_node(k, type=o.get('type'),
gender=o.get('gender'),
num_pins=o.get('num_pins'),
pinout=o.get('pinout'))
# add wires
for k, o in input['wires'].items():
h.add_cable(k, mm2=o.get('mm2'),
awg=o.get('awg'),
length=o.get('length'),
num_wires=o.get('num_wires'),
colors=o.get('colors'),
color_code=o.get('color_code'),
shield=o.get('shield'))
# add connections
conlist = input['connections']
for con in conlist:
if len(con) == 3: # format: connector -- wire -- conector
for c in con:
if len(list(c.keys())) != 1: # check that each entry in con has only one key, which is the designator
raise Exception('Too many keys')
from_name = list(con[0].keys())[0]
via_name = list(con[1].keys())[0]
to_name = list(con[2].keys())[0]
if not check_designators([from_name,via_name,to_name],('nodes','wires','nodes')):
raise Exception('Bad connection definition (3)')
from_pins = expand(con[0][from_name])
via_pins = expand(con[1][via_name])
to_pins = expand(con[2][to_name])
if len(from_pins) != len(via_pins) or len(via_pins) != len(to_pins):
raise Exception('List length mismatch')
for (from_pin, via_pin, to_pin) in zip(from_pins, via_pins, to_pins):
h.connect(from_name, from_pin, via_name, via_pin, to_name, to_pin)
elif len(con) == 2:
for c in con:
if len(list(c.keys())) != 1: # check that each entry in con has only one key, which is the designator
raise Exception('Too many keys')
from_name = list(con[0].keys())[0]
to_name = list(con[1].keys())[0]
n_w = check_designators([from_name, to_name],('nodes','wires'))
w_n = check_designators([from_name, to_name],('wires','nodes'))
n_n = check_designators([from_name, to_name],('nodes','nodes'))
if not n_w and not w_n and not n_n:
raise Exception('Wrong designators')
from_pins = expand(con[0][from_name])
to_pins = expand(con[1][to_name])
if len(from_pins) != len(to_pins):
raise Exception('List length mismatch')
if n_w == True or w_n == True:
for (from_pin, to_pin) in zip(from_pins, to_pins):
if n_w:
h.connect(from_name, from_pin, to_name, to_pin, None, None)
else: # w_n
h.connect(None, None, from_name, from_pin, to_name, to_pin)
elif n_n == True:
con_name = list(con[0].keys())[0]
from_pins = expand(con[0][from_name])
to_pins = expand(con[1][to_name])
for (from_pin, to_pin) in zip(from_pins, to_pins):
h.loop(con_name, from_pin, to_pin)
if 'nodes' in input and type(input['nodes']) == dict:
if len(input['nodes']) > 0:
for k, o in input['nodes'].items():
h.add_node(k, type=o.get('type'),
gender=o.get('gender'),
num_pins=o.get('num_pins'),
pinout=o.get('pinout'))
else:
raise Exception('Wrong number of connection parameters')
print('Node list empty')
else:
print('No node list found')
input['nodes'] = {}
# add wires
if 'wires' in input and type(input['wires']) == dict:
if len(input['wires']) > 0:
for k, o in input['wires'].items():
h.add_cable(k, mm2=o.get('mm2'),
awg=o.get('awg'),
length=o.get('length'),
num_wires=o.get('num_wires'),
colors=o.get('colors'),
color_code=o.get('color_code'),
shield=o.get('shield'))
else:
print('Wire list empty')
else:
print('No wire list found')
input['wires'] = {}
# add connections
if 'connections' in input:
if len(input['connections']) > 0:
ferrule_counter = 0
conlist = input['connections']
for con in conlist:
if len(con) == 3: # format: connector -- wire -- conector
for c in con:
if len(list(c.keys())) != 1: # check that each entry in con has only one key, which is the designator
raise Exception('Too many keys')
from_name = list(con[0].keys())[0]
via_name = list(con[1].keys())[0]
to_name = list(con[2].keys())[0]
if not check_designators([from_name,via_name,to_name],('nodes','wires','nodes')):
raise Exception('Bad connection definition (3)')
from_pins = expand(con[0][from_name])
via_pins = expand(con[1][via_name])
to_pins = expand(con[2][to_name])
if len(from_pins) != len(via_pins) or len(via_pins) != len(to_pins):
raise Exception('List length mismatch')
for (from_pin, via_pin, to_pin) in zip(from_pins, via_pins, to_pins):
h.connect(from_name, from_pin, via_name, via_pin, to_name, to_pin)
elif len(con) == 2:
for c in con:
if type(c) is dict:
if len(list(c.keys())) != 1: # check that each entry in con has only one key, which is the designator
raise Exception('Too many keys')
# hack to make the format for ferrules compatible with the formats for connectors and wires
if type(con[0]) == str:
name = con[0]
con[0] = {}
con[0][name] = name
if type(con[1]) == str:
name = con[1]
con[1] = {}
con[1][name] = name
from_name = list(con[0].keys())[0]
to_name = list(con[1].keys())[0]
n_w = check_designators([from_name, to_name],('nodes','wires'))
w_n = check_designators([from_name, to_name],('wires','nodes'))
n_n = check_designators([from_name, to_name],('nodes','nodes'))
f_w = check_designators([from_name, to_name],('ferrules','wires'))
w_f = check_designators([from_name, to_name],('wires','ferrules'))
if not n_w and not w_n and not n_n and not f_w and not w_f:
raise Exception('Wrong designators')
from_pins = expand(con[0][from_name])
to_pins = expand(con[1][to_name])
if n_w or w_n or n_n:
if len(from_pins) != len(to_pins):
raise Exception('List length mismatch')
if n_w == True or w_n == True:
for (from_pin, to_pin) in zip(from_pins, to_pins):
if n_w:
h.connect(from_name, from_pin, to_name, to_pin, None, None)
else: # w_n
h.connect(None, None, from_name, from_pin, to_name, to_pin)
elif n_n == True:
con_name = list(con[0].keys())[0]
from_pins = expand(con[0][from_name])
to_pins = expand(con[1][to_name])
for (from_pin, to_pin) in zip(from_pins, to_pins):
h.loop(con_name, from_pin, to_pin)
if f_w == True or w_f == True:
from_pins = expand(con[0][from_name])
to_pins = expand(con[1][to_name])
if f_w == True:
ferrule_name = from_name
wire_name = to_name
wire_pins = to_pins
else:
ferrule_name = to_name
wire_name = from_name
wire_pins = from_pins
ferrule = input['ferrules'][ferrule_name]
for wire_pin in wire_pins:
ferrule_counter = ferrule_counter + 1
ferrule_id = 'F{}'.format(ferrule_counter)
h.add_node(ferrule_id, type=ferrule.get('type'),
gender=ferrule.get('gender'),
num_pins=ferrule.get('num_pins'),
pinout=ferrule.get('pinout'))
if f_w == True:
h.connect(ferrule_id, 1, wire_name, wire_pin, None, None)
else:
h.connect(None, None, wire_name, wire_pin, ferrule_id, 1)
else:
raise Exception('Wrong number of connection parameters')
else:
print('Connection list empty')
else:
print('No connection list found')
input['connections'] = {}
h.output(filename='output', format=('png','svg'), view=False)