Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

Fix decimal pincounts in custom names #649

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,16 @@ def __createFootprintVariant(self, device_params, header, dimensions, with_therm
pincount_full = device_params['num_pins_x']*2 + device_params['num_pins_y']*2

if 'hidden_pins' in device_params:
pincount_text = '{}-{}'.format(pincount_full - len(device_params['hidden_pins']), pincount_full)
pincount = pincount_full - len(device_params['hidden_pins'])
pincount2 = '{}'.format(pincount_full)
present_pins = pincount_full - len(device_params['hidden_pins'])
elif 'deleted_pins' in device_params:
pincount_text = '{}-{}'.format(pincount_full, pincount_full - len(device_params['deleted_pins']))
pincount = pincount_full - len(device_params['deleted_pins'])
pincount = pincount_full
pincount2 = '{}'.format(pincount_full - len(device_params['deleted_pins']))
present_pins = pincount_full - len(device_params['deleted_pins'])
else:
pincount_text = '{}'.format(pincount_full)
pincount = pincount_full
present_pins = pincount

ipc_reference = 'ipc_spec_gw_large_pitch' if device_params['pitch'] >= 0.625 else 'ipc_spec_gw_small_pitch'
if device_params.get('force_small_pitch_ipc_definition', False):
Expand All @@ -187,12 +189,20 @@ def __createFootprintVariant(self, device_params, header, dimensions, with_therm

pitch = device_params['pitch']

name_format = self.configuration['fp_name_format_string_no_trailing_zero_pincount_text']
if 'hidden_pins' in device_params or 'deleted_pins' in device_params:
name_format = self.configuration['fp_name_format_string_no_trailing_zero_2pincount']
else:
name_format = self.configuration['fp_name_format_string_no_trailing_zero']

EP_size = {'x':0, 'y':0}
EP_mask_size = {'x':0, 'y':0}

if dimensions['has_EP']:
name_format = self.configuration['fp_name_EP_format_string_no_trailing_zero_pincount_text']
if 'hidden_pins' in device_params or 'deleted_pins' in device_params:
name_format = self.configuration['fp_name_EP_format_string_no_trailing_zero_2pincount']
else:
name_format = self.configuration['fp_name_EP_format_string_no_trailing_zero']

if 'EP_size_x_overwrite' in device_params:
EP_size = {
'x':device_params['EP_size_x_overwrite'],
Expand All @@ -204,7 +214,11 @@ def __createFootprintVariant(self, device_params, header, dimensions, with_therm
'y':dimensions['EP_size_y'].nominal
}
if 'EP_mask_x' in dimensions:
name_format = self.configuration['fp_name_EP_custom_mask_format_string_no_trailing_zero_pincount_text']
if 'hidden_pins' in device_params or 'deleted_pins' in device_params:
name_format = self.configuration['fp_name_EP_custom_mask_format_string_no_trailing_zero_2pincount']
else:
name_format = self.configuration['fp_name_EP_custom_mask_format_string_no_trailing_zero']

EP_mask_size = {'x':dimensions['EP_mask_x'].nominal, 'y':dimensions['EP_mask_y'].nominal}
EP_size = Vector2D(EP_size)

Expand All @@ -222,7 +236,8 @@ def __createFootprintVariant(self, device_params, header, dimensions, with_therm
man=device_params.get('manufacturer',''),
mpn=device_params.get('part_number',''),
pkg=header['device_type'],
pincount=pincount_text,
pincount=pincount,
pincount2='_{}N'.format(pincount2) if 'hidden_pins' in device_params or 'deleted_pins' in device_params else '',
size_y=size_y,
size_x=size_x,
pitch=device_params['pitch'],
Expand All @@ -239,7 +254,8 @@ def __createFootprintVariant(self, device_params, header, dimensions, with_therm
man=device_params.get('manufacturer',''),
mpn=device_params.get('part_number',''),
pkg=header['device_type'],
pincount=pincount_text,
pincount=pincount,
pincount2='_{}N'.format(pincount2) if 'hidden_pins' in device_params or 'deleted_pins' in device_params else '',
size_y=size_y,
size_x=size_x,
pitch=device_params['pitch'],
Expand Down Expand Up @@ -268,7 +284,7 @@ def __createFootprintVariant(self, device_params, header, dimensions, with_therm
manufacturer = device_params.get('manufacturer',''),
package = header['device_type'],
mpn = device_params.get('part_number',''),
pincount = pincount,
pincount = present_pins,
datasheet = device_params['size_source'],
scriptname = os.path.basename(__file__).replace(" ", " ")
).lstrip())
Expand Down Expand Up @@ -297,7 +313,7 @@ def __createFootprintVariant(self, device_params, header, dimensions, with_therm
device_params.get('EP_paste_coverage', DEFAULT_PASTE_COVERAGE))

EP = ExposedPad(
number=pincount+1, size=EP_size, mask_size=EP_mask_size,
number=present_pins+1, size=EP_size, mask_size=EP_mask_size,
paste_layout=thermals.get('EP_num_paste_pads'),
paste_coverage=paste_coverage,
via_layout=thermals.get('count', 0),
Expand All @@ -313,7 +329,7 @@ def __createFootprintVariant(self, device_params, header, dimensions, with_therm
)
else:
EP = ExposedPad(
number=pincount+1, size=EP_size, mask_size=EP_mask_size,
number=present_pins+1, size=EP_size, mask_size=EP_mask_size,
paste_layout=device_params.get('EP_num_paste_pads', 1),
paste_coverage=device_params.get('EP_paste_coverage', DEFAULT_PASTE_COVERAGE),
**pad_shape_details
Expand Down
6 changes: 3 additions & 3 deletions scripts/Packages/package_config_KLCv3.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
fp_name_format_string: '{man:s}_{mpn:s}_{pkg:s}-{pincount:d}_{size_x:.1f}x{size_y:.1f}mm_P{pitch:.2f}mm{suffix:s}'
fp_name_format_string_pincount_text: '{man:s}_{mpn:s}_{pkg:s}-{pincount:s}_{size_x:.1f}x{size_y:.1f}mm_P{pitch:.2f}mm{suffix:s}'
fp_name_format_string_two_2pincount: '{man:s}_{mpn:s}_{pkg:s}-{pincount:d}{pincount2:s}_{size_x:.1f}x{size_y:.1f}mm_P{pitch:.2f}mm{suffix:s}'

keyword_fp_string: '{man:s} {package:s} {category:s}'

lib_name_format_string: 'Package_{category:s}'

fp_name_format_string_no_trailing_zero: '{man:s}_{mpn:s}_{pkg:s}-{pincount:d}_{size_x:g}x{size_y:g}mm_P{pitch:g}mm{suffix:s}{suffix2:s}'
fp_name_format_string_no_trailing_zero_pincount_text: '{man:s}_{mpn:s}_{pkg:s}-{pincount:s}_{size_x:g}x{size_y:g}mm_P{pitch:g}mm{suffix:s}{suffix2:s}'
fp_name_format_string_no_trailing_zero_2pincount: '{man:s}_{mpn:s}_{pkg:s}-{pincount:d}{pincount2:s}_{size_x:g}x{size_y:g}mm_P{pitch:g}mm{suffix:s}{suffix2:s}'

fp_name_lga_format_string_no_trailing_zero: '{man:s}_{mpn:s}_{pkg:s}-{pincount:d}_{size_x:g}x{size_y:g}mm_P{pitch:g}mm{layout:s}{suffix:s}{suffix2:s}'

Expand All @@ -17,6 +17,6 @@ fp_name_EP_format_string_no_trailing_zero: '{man:s}_{mpn:s}_{pkg:s}-{pincount:d}
fp_name_EP_format_string_no_trailing_zero_pincount_text: '{man:s}_{mpn:s}_{pkg:s}-{pincount:s}-1EP_{size_x:g}x{size_y:g}mm_P{pitch:g}mm{suffix:s}_EP{ep_size_x:g}x{ep_size_y:g}mm{suffix2:s}{vias:s}'

fp_name_EP_custom_mask_format_string_no_trailing_zero: '{man:s}_{mpn:s}_{pkg:s}-{pincount:d}-1EP_{size_x:g}x{size_y:g}mm_P{pitch:g}mm{suffix:s}_EP{ep_size_x:g}x{ep_size_y:g}mm_Mask{mask_size_x:g}x{mask_size_y:g}mm{suffix2:s}{vias:s}'
fp_name_EP_custom_mask_format_string_no_trailing_zero_pincount_text: '{man:s}_{mpn:s}_{pkg:s}-{pincount:s}-1EP_{size_x:g}x{size_y:g}mm_P{pitch:g}mm{suffix:s}_EP{ep_size_x:g}x{ep_size_y:g}mm_Mask{mask_size_x:g}x{mask_size_y:g}mm{suffix2:s}{vias:s}'
fp_name_EP_custom_mask_format_string_no_trailing_zero_2pincount: '{man:s}_{mpn:s}_{pkg:s}-{pincount:d}{pincount2:s}-1EP_{size_x:g}x{size_y:g}mm_P{pitch:g}mm{suffix:s}_EP{ep_size_x:g}x{ep_size_y:g}mm_Mask{mask_size_x:g}x{mask_size_y:g}mm{suffix2:s}{vias:s}'

thermal_via_suffix: "_ThermalVias"