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

Ring pad support inspired by wuerth electronics smd mounting hardware #351

Merged
merged 39 commits into from
Oct 5, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
1829761
copper only ring pad prototype
poeschlr May 8, 2019
08f04bf
Workaround for mask margin bugs
poeschlr May 8, 2019
43d3007
Workaround for single paste zone (kicad bug)
poeschlr May 8, 2019
e7a2549
add interface to rotate a vector2d around a given origin
poeschlr May 8, 2019
64d2f17
handle solder paste parameters
poeschlr May 8, 2019
98603c8
use rotate function instead of calculating coordinates
poeschlr May 8, 2019
684e006
added polar coordinate handling to Vector2D
poeschlr May 9, 2019
b1c455b
extended arc interface
poeschlr May 9, 2019
a64340f
ensure -0 is not created by float formater
poeschlr May 10, 2019
19f3de8
More arc testcases
poeschlr May 10, 2019
03bd06c
ode style
poeschlr May 10, 2019
7a50885
python 2 compatibility
poeschlr May 10, 2019
12bc2f6
add rotation interface for basic nodes
poeschlr May 10, 2019
53b59eb
Add translation and intersection
poeschlr May 11, 2019
e008043
Add docstrings
poeschlr May 11, 2019
01a5f19
intersection supports arcs
poeschlr May 11, 2019
2957b34
cut line implemented
poeschlr May 11, 2019
244847b
Introduced geometric base clases for lines, circles and arcs
poeschlr May 12, 2019
6719d3f
Add cut functionallity to arcs
poeschlr May 12, 2019
f942451
arc pad primitive used for paste parts of ring pad
poeschlr May 13, 2019
4ddd2c3
Finish paste pad handling for ring pads
poeschlr May 14, 2019
3dca632
cleanups and docu
poeschlr May 14, 2019
3bda5f9
Correct overlap, paste radius and arc width calculation
poeschlr May 25, 2019
de61209
correct handling of paste to paste clearance
poeschlr May 26, 2019
c159b56
Add commandline interface script for generating ring pads
poeschlr May 26, 2019
f2a46bb
Add wuerth smt mouniting hardware with inner through hole
poeschlr May 26, 2019
ac37b7f
klc fixes
poeschlr May 26, 2019
191f472
fix ring pad paste for 2 zones
poeschlr May 27, 2019
3c2728b
Add M1.6 (including blind hole) and new naming convention
poeschlr May 27, 2019
9e7cb69
add reverse type
poeschlr May 27, 2019
f127438
add snap rivet version
poeschlr May 27, 2019
961ca20
script renamed to reflect the fact that it is generic
poeschlr May 28, 2019
23be404
add external thread version
poeschlr May 28, 2019
9f6bfe5
add maximum round radius to ring pad
poeschlr May 28, 2019
cb79753
handle 0 inner diameter
poeschlr May 28, 2019
6385473
add non npth version
poeschlr May 28, 2019
e12a59c
rename script folder to reflect the generic content
poeschlr May 29, 2019
a0706d7
Improved naming and description
poeschlr May 29, 2019
3244af2
typo in description
poeschlr Sep 1, 2019
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
Prev Previous commit
Next Next commit
add rotation interface for basic nodes
  • Loading branch information
poeschlr committed May 10, 2019
commit 12bc2f6c9c30dd9087eebba28792bc3bbad1120c
5 changes: 5 additions & 0 deletions KicadModTree/PolygonPoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ def cut(self, other):

self.nodes.insert(idx_self+1, other[idx_other])

def rotate(self, angle, origin=(0, 0), use_degrees=True):
for p in self.nodes:
p.rotate(angle=angle, origin=origin, use_degrees=use_degrees)
return self

def __iter__(self):
for n in self.nodes:
yield n
Expand Down
16 changes: 7 additions & 9 deletions KicadModTree/Vector.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,21 +191,19 @@ def __iter__(self):
def __copy__(self):
return Vector2D(self.x, self.y)

def rotate(self, angle, origin=(0, 0), apply_on_copy=False, use_degrees=False):
point = self if not apply_on_copy else copy(self)

def rotate(self, angle, origin=(0, 0), use_degrees=True):
op = Vector2D(origin)

if use_degrees:
angle = radians(angle)

temp = op.x + cos(angle) * (point.x - op.x) - sin(angle) * (point.y - op.y)
point.y = op.y + sin(angle) * (point.x - op.x) + cos(angle) * (point.y - op.y)
point.x = temp
temp = op.x + cos(angle) * (self.x - op.x) - sin(angle) * (self.y - op.y)
self.y = op.y + sin(angle) * (self.x - op.x) + cos(angle) * (self.y - op.y)
self.x = temp

return point
return self

def to_polar(self, origin=(0, 0), use_degrees=False):
def to_polar(self, origin=(0, 0), use_degrees=True):
op = Vector2D(origin)

diff = self - op
Expand All @@ -218,7 +216,7 @@ def to_polar(self, origin=(0, 0), use_degrees=False):
return (radius, angle)

@staticmethod
def from_polar(radius, angle, origin=(0, 0), use_degrees=False):
def from_polar(radius, angle, origin=(0, 0), use_degrees=True):
if use_degrees:
angle = radians(angle)

Expand Down
5 changes: 5 additions & 0 deletions KicadModTree/nodes/base/Arc.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ def _initFromCenterAndEnd(self, **kwargs):
else:
raise KeyError('Arcs defined with center and endpoint must define the start point.')

def rotate(self, angle, origin=(0, 0), use_degrees=True):
self.center_pos.rotate(angle=angle, origin=origin, use_degrees=use_degrees)
self.start_pos.rotate(angle=angle, origin=origin, use_degrees=use_degrees)
return self

def calculateBoundingBox(self):
# TODO: finish implementation
min_x = min(self.start_pos.x, self._calulateEndPos().x)
Expand Down
10 changes: 9 additions & 1 deletion KicadModTree/nodes/base/Circle.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,19 @@ def __init__(self, **kwargs):
self.center_pos = Vector2D(kwargs['center'])
self.radius = kwargs['radius']

self.end_pos = Vector2D([self.center_pos.x+self.radius, self.center_pos.y])
self._calcEndPos()

self.layer = kwargs.get('layer', 'F.SilkS')
self.width = kwargs.get('width')

def _calcEndPos(self):
self.end_pos = Vector2D([self.center_pos.x+self.radius, self.center_pos.y])

def rotate(self, angle, origin=(0, 0), use_degrees=True):
self.center_pos.rotate(angle=angle, origin=origin, use_degrees=use_degrees)
self._calcEndPos()
return self

def calculateBoundingBox(self):
min_x = self.center_pos.x-self.radius
min_y = self.center_pos.y-self.radius
Expand Down
5 changes: 5 additions & 0 deletions KicadModTree/nodes/base/Line.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ def __init__(self, **kwargs):
self.layer = kwargs.get('layer', 'F.SilkS')
self.width = kwargs.get('width')

def rotate(self, angle, origin=(0, 0), use_degrees=True):
self.start_pos.rotate(angle=angle, origin=origin, use_degrees=use_degrees)
self.end_pos.rotate(angle=angle, origin=origin, use_degrees=use_degrees)
return self

def calculateBoundingBox(self):
render_start_pos = self.getRealPosition(self.start_pos)
render_end_pos = self.getRealPosition(self.end_pos)
Expand Down
8 changes: 8 additions & 0 deletions KicadModTree/nodes/base/Pad.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,14 @@ def _initShapeInZone(self, **kwargs):
raise ValueError('{shape} is an illegal specifier for the shape in zone option'
.format(shape=self.shape_in_zone))

def rotate(self, angle, origin=(0, 0), use_degrees=True):
self.at.rotate(angle=angle, origin=origin, use_degrees=use_degrees)
a = angle if use_degrees else math.degrees(angle)

# subtraction because kicad text field rotation is the wrong way round
self.rotation -= a
return self

# calculate the outline of a pad
def calculateBoundingBox(self):
return Node.calculateBoundingBox(self)
Expand Down
4 changes: 4 additions & 0 deletions KicadModTree/nodes/base/Polygon.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ def __init__(self, **kwargs):
self.layer = kwargs.get('layer', 'F.SilkS')
self.width = kwargs.get('width')

def rotate(self, angle, origin=(0, 0), use_degrees=True):
self.nodes.rotate(angle=angle, origin=origin, use_degrees=use_degrees)
return self

def calculateBoundingBox(self):
return nodes.calculateBoundingBox()

Expand Down
21 changes: 20 additions & 1 deletion KicadModTree/nodes/base/Text.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,15 @@ class Text(Node):
>>> Text(type='value', text="footprint name", at=[0, 3], layer='F.Fab')
"""

TYPE_REFERENCE = 'reference'
TYPE_VALUE = 'value'
TYPE_USER = 'user'
_TYPES = [TYPE_REFERENCE, TYPE_VALUE, TYPE_USER]

def __init__(self, **kwargs):
Node.__init__(self)
self.type = kwargs['type']
self._initType(**kwargs)

self.text = kwargs['text']
self.at = Vector2D(kwargs['at'])
self.rotation = kwargs.get('rotation', 0)
Expand All @@ -61,6 +67,19 @@ def __init__(self, **kwargs):

self.hide = kwargs.get('hide', False)

def _initType(self, **kwargs):
self.type = kwargs['type']
if self.type not in Text._TYPES:
raise ValueError('Illegal type selected for text field.')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The documentation for type should get updated as well.

  • Specify that the argument is mandatory (I assume this will fail for None)
  • Specify the 3 options for the type


def rotate(self, angle, origin=(0, 0), use_degrees=True):
self.at.rotate(angle=angle, origin=origin, use_degrees=use_degrees)
a = angle if use_degrees else math.degrees(angle)

# subtraction because kicad text field rotation is the wrong way round
self.rotation -= a
return self

def calculateBoundingBox(self):
width = len(self.text)*self.size['x']
height = self.size['y']
Expand Down
4 changes: 2 additions & 2 deletions KicadModTree/nodes/specialized/RingPad.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def _generatePads(self):
self._generatePastePads()

def _generatePastePads(self):
a = 2*pi/self.num_paste_zones
a = 360/self.num_paste_zones
pos = Vector2D(self.radius, 0).rotate(a/2)
paste_width = self.width + 2*self.solder_paste_margin

Expand Down Expand Up @@ -195,7 +195,7 @@ def _generateCopperPads(self):
radius=self.radius
))

a = 2*pi/self.num_anchor
a = 360/self.num_anchor
pos = Vector2D(self.radius, 0)
for i in range(1, self.num_anchor):
pos.rotate(a)
Expand Down
1 change: 1 addition & 0 deletions KicadModTree/tests/moduletests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
from .test_kicad5_padshapes import Kicad5PadsTests
from .test_exposed_pad import ExposedPadTests
from .test_arc import ArcTests
from .test_rotation import RotationTests
Loading