Merge branch 'master' into v1.3-dev
This commit is contained in:
commit
13ba733671
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
|||
update=Fri 03 Jan 2020 08:43:13 PM CET
|
||||
update=Tue 18 Feb 2020 09:42:41 PM CET
|
||||
version=1
|
||||
last_client=kicad
|
||||
[general]
|
||||
|
@ -12,16 +12,6 @@ NetIExt=net
|
|||
version=1
|
||||
LibDir=
|
||||
[eeschema/libraries]
|
||||
[schematic_editor]
|
||||
version=1
|
||||
PageLayoutDescrFile=
|
||||
PlotDirectoryName=
|
||||
SubpartIdSeparator=0
|
||||
SubpartFirstId=65
|
||||
NetFmtName=Pcbnew
|
||||
SpiceAjustPassiveValues=0
|
||||
LabSize=50
|
||||
ERC_TestSimilarLabels=1
|
||||
[pcbnew]
|
||||
version=1
|
||||
PageLayoutDescrFile=
|
||||
|
@ -264,3 +254,13 @@ uViaDrill=0.1
|
|||
dPairWidth=0.21
|
||||
dPairGap=0.25
|
||||
dPairViaGap=0.25
|
||||
[schematic_editor]
|
||||
version=1
|
||||
PageLayoutDescrFile=
|
||||
PlotDirectoryName=
|
||||
SubpartIdSeparator=0
|
||||
SubpartFirstId=65
|
||||
NetFmtName=Pcbnew
|
||||
SpiceAjustPassiveValues=0
|
||||
LabSize=50
|
||||
ERC_TestSimilarLabels=1
|
||||
|
|
|
@ -19,7 +19,7 @@ U 1 1 5D6DCF6A
|
|||
P 1100 1000
|
||||
F 0 "J1" H 1018 675 50 0000 C CNN
|
||||
F 1 "230VAC IN" H 1018 766 50 0000 C CNN
|
||||
F 2 "TerminalBlock:TerminalBlock_Altech_AK300-3_P5.00mm" H 1100 1000 50 0001 C CNN
|
||||
F 2 "TerminalBlock_RND:TerminalBlock_RND_205-00068_1x03_P7.50mm_Horizontal" H 1100 1000 50 0001 C CNN
|
||||
F 3 "~" H 1100 1000 50 0001 C CNN
|
||||
1 1100 1000
|
||||
-1 0 0 1
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue