diff options
| -rw-r--r-- | gerbonara/aperture_macros/parse.py | 6 | ||||
| -rw-r--r-- | gerbonara/cad/kicad/footprints.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gerbonara/aperture_macros/parse.py b/gerbonara/aperture_macros/parse.py index 16c6585..84c35e0 100644 --- a/gerbonara/aperture_macros/parse.py +++ b/gerbonara/aperture_macros/parse.py @@ -224,9 +224,9 @@ class GenericMacros: # w must be larger than h # params: width, height, *hole, rotation obround = ApertureMacro('GNO', [ - ap.CenterLine('mm', [1, var(1), var(2), 0, 0, var(5) * -deg_per_rad]), - ap.Circle('mm', [1, var(2), +var(1)/2, 0, var(5) * -deg_per_rad]), - ap.Circle('mm', [1, var(2), -var(1)/2, 0, var(5) * -deg_per_rad]), + ap.CenterLine('mm', [1, var(1)-var(2), var(2), 0, 0, var(5) * -deg_per_rad]), + ap.Circle('mm', [1, var(2), +(var(1)-var(2))/2, 0, var(5) * -deg_per_rad]), + ap.Circle('mm', [1, var(2), -(var(1)-var(2))/2, 0, var(5) * -deg_per_rad]), *_generic_hole(3) ]) polygon = ApertureMacro('GNP', [ diff --git a/gerbonara/cad/kicad/footprints.py b/gerbonara/cad/kicad/footprints.py index 00fa5f5..13cad7d 100644 --- a/gerbonara/cad/kicad/footprints.py +++ b/gerbonara/cad/kicad/footprints.py @@ -402,7 +402,7 @@ class Pad: elif self.shape == Atom.rect: if margin: return ap.ApertureMacroInstance(GenericMacros.rounded_rect, - [x+2*margin, y+2*margin, + [self.size.x+2*margin, self.size.y+2*margin, margin, 0, 0, # no hole rotation], unit=MM) |