Skip to content

Commit 0af2e0a

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents eb1473f + f3093fb commit 0af2e0a

File tree

26 files changed

+3715
-210
lines changed

26 files changed

+3715
-210
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ body:
99
required: true
1010
- label: I have searched existing issues (including closed ones)
1111
required: true
12-
- label: I use KiKit at least version 1.6.0 (older version are not supported)
12+
- label: I use KiKit at least version 1.7.0 (older version are not supported)
1313
required: true
1414
- type: input
1515
attributes:

.github/workflows/test-kikit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-22.04
1111
strategy:
1212
matrix:
13-
kicad-version: [v7, v7-testing, v8, v8-testing]
13+
kicad-version: [v7, v7-testing, v8, v8-testing, nightly]
1414
steps:
1515
- uses: actions/checkout@v4
1616
- uses: ./.github/actions/setup-kicad

docs/fabrication/jlcpcb.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ kikit fab jlcpcb [OPTIONS] BOARD OUTPUTDIR
77

88
When you run this command, you will find file `gerbers.zip` in `OUTPUTDIR`. This
99
file can be directly uploaded to JLC PCB site. KiKit automatically detects the
10-
number of layers.
10+
number of layers. If you would like to include the project name in the archive
11+
name, you can supply `--autoname`
1112

1213
If you want to name your files differently, you can specify `--nametemplate`.
1314
This option takes a string that should contain `{}`. This string will be

docs/panelization/cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ are present. You can read more about multi-board project [here](../multiboard.md
206206

207207
- `stack`: specify the number of layers of the panel. Valid options are
208208
`2layer`, `4layer`, `6layer` or `inehrit` (default). The use case for this
209-
option is when you design a multiple boards in a single desing and you
209+
option is when you design a multiple boards in a single design and you
210210
separate them, however, one boards is e.g., 4 layer and one 2 layer. Then you
211211
design both of them as 4 layer and you specify `stack: 2layer` for the 2 layer
212212
one when panelizing or separating.
@@ -398,7 +398,7 @@ Add a frame around the board.
398398
- `cuts` - one of `none`, `both`, `v`, `h` - specify whether to add cuts to the
399399
corners of the frame for easy removal. Default `both`.
400400

401-
#### Tighframe
401+
#### Tightframe
402402

403403
Add a frame around the board which fills the whole area of the panel - the
404404
boards have just a milled slot around their perimeter.
@@ -511,7 +511,7 @@ the `plugin` field.
511511

512512
Sets page size on the resulting panel and position the panel in the page. The
513513
type of style dictates paper size. The default `inherit` option inherits paper
514-
size from the source board. This feature is not supported on KiCAD 5
514+
size from the source board. This feature is not supported on KiCAD 5.
515515

516516
**Types**: `inherit`, `custom`, `A0`, `A1`, `A2`, `A3`, `A4`, `A5`, `A`, `B`,
517517
`C`, `D`, `E`, `USLetter`, `USLegal`, `USLedger`, `A0-portrait`, `A1-portrait`,

kikit/actionPlugins/panelize.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ def presetDifferential(source, target):
5252
def transplateBoard(source, target, update=lambda x: None):
5353
CLEAR_MSG = "Clearing the old board in UI"
5454
RENDER_MSG = "Rendering the new board in UI"
55+
56+
target.ClearProject()
57+
target.DeleteAllFootprints()
58+
5559
items = chain(
5660
list(target.GetDrawings()),
5761
list(target.GetFootprints()),
@@ -88,10 +92,6 @@ def transplateBoard(source, target, update=lambda x: None):
8892
update(RENDER_MSG)
8993
appendItem(target, x)
9094

91-
for n in [n for _, n in source.GetNetInfo().NetsByNetcode().items()]:
92-
update(RENDER_MSG)
93-
target.Add(n)
94-
9595
update(RENDER_MSG)
9696
d = target.GetDesignSettings()
9797
d.CloneFrom(source.GetDesignSettings())

kikit/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from typing import List, Optional, Tuple, Union, Callable
55
from kikit.defs import Layer
66
from kikit.typing import Box
7-
from pcbnewTransition import pcbnew, isV7, isV8, isV9
7+
from pcbnewTransition import pcbnew, kicad_major
88
from kikit.intervals import AxialLine
99
from pcbnewTransition.pcbnew import BOX2I, VECTOR2I, EDA_ANGLE
1010
import os
@@ -44,7 +44,7 @@ def fitsIn(what: Union[BOX2I, VECTOR2I], where: BOX2I) -> bool:
4444
Return true iff 'what' (BOX2I or VECTOR2I) is fully contained in 'where'
4545
(BOX2I)
4646
"""
47-
if isV7() or isV8() or isV9():
47+
if kicad_major() >= 7:
4848
assert isinstance(what, (BOX2I, VECTOR2I, pcbnew.wxPoint))
4949
else:
5050
assert isinstance(what, (BOX2I, VECTOR2I, pcbnew.wxPoint, pcbnew.EDA_RECT))

0 commit comments

Comments
 (0)