templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Atmelfan/KiBot into Atmelfan-master

This commit is contained in:
Salvador E. Tropea 2022-01-29 15:16:48 -03:00
parent 8c3bb74eb7 70fdb9c617
commit 3b7b200d4f
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
kibot/kicad/v6_sch.py
View File

@ -756,7 +756,11 @@ class LibComponent(object):
comp.lib_id = comp.name = _check_str(c, 1, 'name')
res = comp.name.split(':')
comp.lib = None
if len(res) == 2:
if len(res) == 1:
# Apperas valid: https://docs.kicad.org/doxygen/classLIB__ID.html#a195467cfd12903226615d74540ec647a
comp.name = res[0]
comp.lib = ''
elif len(res) == 2:
comp.name = res[1]
comp.lib = res[0]
else:
@ -961,21 +965,38 @@ class SchematicComponentV6(SchematicComponent):
# comp.sheet_path_h = parent.sheet_path_h
comp.parent_sheet = parent
name = 'component'
# First argument is the LIB:NAME
comp.lib_id = comp.name = _check_symbol_str(c, 1, name, 'lib_id')
res = comp.name.split(':')
comp.lib = None
if len(res) == 2:
comp.name = res[1]
comp.lib = res[0]
else:
logger.warning(W_NOLIB + "Component `{}` doesn't specify its library".format(comp.name))
# 2 The position
comp.x, comp.y, comp.ang = _get_at(c, 2, name)
lib_id_found = False
at_found = False
# Variable list
for i in c[3:]:
for i in c[1:]:
i_type = _check_is_symbol_list(i)
if i_type == 'unit':
if i_type == 'lib_id':
# First argument is the LIB:NAME
comp.lib_id = comp.name = _check_str(i, 1, name + ' lib_id')
res = comp.name.split(':')
comp.lib = None
if len(res) == 1:
comp.name = res[1]
comp.lib = ''
elif len(res) == 2:
comp.name = res[1]
comp.lib = res[0]
else:
logger.warning(W_NOLIB + "Component `{}` doesn't specify its library".format(comp.name))
lib_id_found = True
elif i_type == 'lib_name':
# Symbol defined in schematic
comp.schlib_name = _check_str(i, 1, name + ' lib_name')
elif i_type == 'at':
# 2 The position
if len(i) > 3:
comp.ang = _check_float(i, 3, 'at angle')
else:
comp.ang = 0
comp.x, comp.y = _check_float(i, 1, 'at x'), _check_float(i, 2, 'at y')
at_found = True
elif i_type == 'unit':
# This is documented as mandatory, but isn't always there
comp.unit = _check_integer(i, 1, name+' unit')
comp.unit_specified = True
@ -1004,6 +1025,9 @@ class SchematicComponentV6(SchematicComponent):
pin_name = _check_str(i, 1, name + 'pin name')
pin_uuid = _get_uuid(i, 2, name)
comp.pins[pin_name] = pin_uuid
if not lib_id_found or not at_found:
raise SchError("Component missing 'lib_id' and/or 'at'")
# Fake 'Part' field
field = SchematicFieldV6()
field.name = 'part'