Skip to content

Commit 8feaf6b

Browse files
committed
Add name format substitution for variant field
1 parent bb64138 commit 8feaf6b

File tree

5 files changed

+9
-0
lines changed

5 files changed

+9
-0
lines changed

DATAFORMAT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ pcbdata = {
9696
"revision": "rev",
9797
"company": "Horns and Hoofs",
9898
"date": "2019-04-18",
99+
"variant": "var" // optional
99100
},
100101
// Contains full bom table as well as filtered by front/back.
101102
// See bom row description below.

InteractiveHtmlBom/core/config.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ class Config:
1515
' %p : pcb/project title from pcb metadata.\n'
1616
' %c : company from pcb metadata.\n'
1717
' %r : revision from pcb metadata.\n'
18+
' %v : pcb variant.\n'
19+
' %V : pcb variant or \'default\', if empty.\n'
1820
' %d : pcb date from metadata if available, '
1921
'file modification date otherwise.\n'
2022
' %D : bom generation date.\n'

InteractiveHtmlBom/core/ibom.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ def process_substitutions(bom_name_format, pcb_file_name, metadata):
232232
name = name.replace('%c', metadata['company'])
233233
name = name.replace('%r', metadata['revision'])
234234
name = name.replace('%d', metadata['date'].replace(':', '-'))
235+
name = name.replace('%v', metadata.get('variant', ''))
236+
name = name.replace('%V', metadata.get('variant', '') or 'default')
235237
now = datetime.now()
236238
name = name.replace('%D', now.strftime('%Y-%m-%d'))
237239
name = name.replace('%T', now.strftime('%H-%M-%S'))

InteractiveHtmlBom/ecad/kicad.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,7 @@ def parse(self):
863863
"revision": revision,
864864
"company": company,
865865
"date": file_date,
866+
"variant": self.config.kicad_variant,
866867
},
867868
"bom": {},
868869
"font_data": self.font_parser.get_parsed_font()

InteractiveHtmlBom/ecad/schema/genericjsonpcbdata_v1.schema

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@
305305
},
306306
"date": {
307307
"type": "string"
308+
},
309+
"variant": {
310+
"type": "string"
308311
}
309312
},
310313
"required": ["title", "revision", "company", "date"],

0 commit comments

Comments
 (0)