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

[KiCad 7] Allow using KICAD6_ and KICAD7_

This commit is contained in:
Salvador E. Tropea 2023-02-24 14:01:12 -03:00
parent 164d36bbca
commit 3707db83a9
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kibot/globals.py
View File

@ -54,18 +54,20 @@ class Environment(Optionable):
defs['KICAD_USER_TEMPLATE_DIR'] = self.user_templates defs['KICAD_USER_TEMPLATE_DIR'] = self.user_templates
def define_k6_vars(self, defs): def define_k6_vars(self, defs):
if self.symbols:
defs['KICAD6_SYMBOL_DIR'] = self.symbols
if self.footprints:
defs['KICAD6_FOOTPRINT_DIR'] = self.footprints
if self.models_3d:
defs['KICAD6_3DMODEL_DIR'] = self.models_3d
if self.templates:
defs['KICAD6_TEMPLATE_DIR'] = self.templates
if self.user_templates: if self.user_templates:
defs['KICAD_USER_TEMPLATE_DIR'] = self.user_templates defs['KICAD_USER_TEMPLATE_DIR'] = self.user_templates
for n in reversed(range(6, GS.kicad_version_major+1)):
ki_ver = 'KICAD'+str(n)
if self.symbols:
defs[ki_ver+'_SYMBOL_DIR'] = self.symbols
if self.footprints:
defs[ki_ver+'_FOOTPRINT_DIR'] = self.footprints
if self.models_3d:
defs[ki_ver+'_3DMODEL_DIR'] = self.models_3d
if self.templates:
defs[ki_ver+'_TEMPLATE_DIR'] = self.templates
if self.third_party: if self.third_party:
defs['KICAD6_3RD_PARTY'] = self.third_party defs[ki_ver+'_3RD_PARTY'] = self.third_party
def config(self, parent): def config(self, parent):
super().config(parent) super().config(parent)

3
kibot/kicad/config.py
View File

@ -337,7 +337,8 @@ class KiConf(object):
names = [] names = []
if GS.ki6 and ki6_diff: if GS.ki6 and ki6_diff:
# KiCad 6 specific name goes first when using KiCad 6 # KiCad 6 specific name goes first when using KiCad 6
names.append('KICAD{}_{}'.format(GS.kicad_version_major, base_name)) for n in reversed(range(6, GS.kicad_version_major+1)):
names.append('KICAD{}_{}'.format(n, base_name))
# KiCad 5 names, allowed even when using KiCad 6 # KiCad 5 names, allowed even when using KiCad 6
if not only_old: if not only_old:
# A KICAD_* is valid # A KICAD_* is valid