Merge branch 'master' into v1.0.0-release

Author: thejpster

neotron-32-rescue.lib

@@ -1247,6 +1247,36 @@ X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
+# SW_Push_DPDT-Switch
+#
+DEF SW_Push_DPDT-Switch SW 0 0 Y N 1 F N
+F0 "SW" 0 350 50 H V C CNN
+F1 "SW_Push_DPDT-Switch" 0 -400 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 -200 20 0 0 0 N
+C -80 200 20 0 0 0 N
+C 80 -300 20 0 0 0 N
+C 80 100 20 0 0 0 N
+C 80 -100 20 0 1 0 N
+C 80 300 20 0 1 0 N
+P 2 0 1 0 -60 -190 100 -120 N
+P 2 0 1 0 -60 210 100 280 N
+P 2 0 1 0 0 -90 0 -160 N
+P 2 0 1 0 0 -40 0 0 N
+P 2 0 1 0 0 50 0 90 N
+P 2 0 1 0 0 140 0 180 N
+P 2 0 1 0 0 310 0 240 N
+X A 1 200 300 100 L 50 50 1 1 P
+X B 2 -200 200 100 R 50 50 1 1 P
+X C 3 200 100 100 L 50 50 1 1 P
+X A 4 200 -100 100 L 50 50 1 1 P
+X B 5 -200 -200 100 R 50 50 1 1 P
+X C 6 200 -300 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # SW_SPDT-Switch
 #
 DEF SW_SPDT-Switch SW 0 0 Y N 1 F N

neotron-32.kicad_pcb

@@ -74,7 +74,7 @@
     (aux_axis_origin 0 0)
     (visible_elements 7FFFFFFF)
     (pcbplotparams
-      (layerselection 0x09030_7ffffffe)
+      (layerselection 0x01020_ffffffff)
       (usegerberextensions false)
       (usegerberattributes false)
       (usegerberadvancedattributes false)
@@ -95,11 +95,11 @@
       (plotinvisibletext false)
       (padsonsilk false)
       (subtractmaskfromsilk false)
-      (outputformat 3)
+      (outputformat 1)
       (mirror false)
       (drillshape 0)
       (scaleselection 1)
-      (outputdirectory "dxf/"))
+      (outputdirectory "gerbers/"))
   )
 
   (net 0 "")
@@ -6720,7 +6720,7 @@
   (segment (start 211.455 19.685) (end 222.167501 19.685) (width 0.25) (layer F.Cu) (net 116))
   (segment (start 222.167501 19.685) (end 224.707501 22.225) (width 0.25) (layer F.Cu) (net 116))
 
-  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 5E117C10) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 5E113BBA) (hatch edge 0.508)
     (connect_pads (clearance 0.5))
     (min_thickness 0.5)
     (fill yes (arc_segments 32) (thermal_gap 0.5) (thermal_bridge_width 0.6) (smoothing chamfer))

neotron-32.pro

@@ -12,16 +12,6 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-[schematic_editor]
-version=1
-PageLayoutDescrFile=
-PlotDirectoryName=pdf
-SubpartIdSeparator=0
-SubpartFirstId=65
-NetFmtName=Pcbnew
-SpiceAjustPassiveValues=0
-LabSize=100
-ERC_TestSimilarLabels=1
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -260,3 +250,13 @@ uViaDrill=0.1
 dPairWidth=0.2
 dPairGap=0.25
 dPairViaGap=0.25
+[schematic_editor]
+version=1
+PageLayoutDescrFile=
+PlotDirectoryName=pdf
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=Pcbnew
+SpiceAjustPassiveValues=0
+LabSize=100
+ERC_TestSimilarLabels=1