Add enclosure generator

2019-03-04 15:34:59 +02:00 · 2019-03-04 15:34:59 +02:00 · abe586f7e4
commit abe586f7e4
parent e99b9ffd00
8 changed files with 899 additions and 296 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,11 @@
 _saved*
 *-bak
 *.bak
+*.ngc
+flt/*.g*
+flt/*.svg
+flt/*.png
+flt/*.ps
+flt/*.drl
+flt/*rescue*
+flt/sym-lib-table
--- a/README.md
+++ b/README.md
@ -0,0 +1,54 @@
+
+# Specs
+
+High end compact shelf speakers
+
+* Dimensions 35x20x34cm
+* Wavecor WF146WA05 as the woofer
+* Dynavox AMT-1 as the tweeter
+* Crossover around 4kHz
+* Power handling 55W
+* Nominal impedance 4 ohm
+
+Order kits from 
+http://www.lautsprecher-berlin-shop.de/epages/62721881.sf/de_DE/?ObjectPath=/Shops/62721881/Products/amt-box
+
+NAD 3045 delivers just enough juice for these speakers.
+
+# Enclosure
+
+Generate toolpaths, following assumes 18mm plywood:
+
+```bash
+python3 enclosure.py --swap-axes --workpiece=front | tee amt-box-1-front.ngc amt-box-2-front.ngc
+python3 enclosure.py --swap-axes --workpiece=side | tee amt-box-1-right.ngc amt-box-2-left.ngc
+python3 enclosure.py --swap-axes --workpiece=back | tee amt-box-1-back.ngc amt-box-2-back.ngc
+python3 enclosure.py --swap-axes --workpiece=cap | tee amt-box-1-top.ngc amt-box-1-bottom.ngc amt-box-2-top.ngc amt-box-2-bottom.ngc
+python3 enclosure.py --swap-axes --workpiece=side --port-enable > amt-box-1-left.ngc
+python3 enclosure.py --swap-axes --workpiece=side --port-enable --port-mirror > amt-box-2-right.ngc
+python3 enclosure.py --workpiece=support | tee amt-box-1-support.ngc amt-box-2-support.ngc
+```
+
+Prepare approx 40cm by 90cm piece of plywood to accommodate following:
+
+1. Mill support (8cm), this should leave enough room for clamps
+2. Mill front (30cm)
+3. Mill side (20cm)
+4. Mill top (20cm)
+
+Cut another 40 by 80cm piece:
+
+5. Mill bottom (20cm), again this should leave enough room for clamps
+6. Mill back (30cm)
+7. Mill side (20cm)
+
+Glue parts with wood glue (PVA).
+Finish with 
+
+# Filter
+
+Use single sided PCB, mill traces with the supplied circuit. Use possibly liquid tin to increase the
+cross section of traces.
+
+
+
--- a/enclosure.py
+++ b/enclosure.py
@ -0,0 +1,401 @@
+#!/usr/bin/python3
+
+import argparse
+parser = argparse.ArgumentParser(description='AMT Box')
+parser.add_argument('--material-thickness', type=float, default=17.4, help='Plywood/MDF thickness (mm)')
+parser.add_argument('--internal-height', type=float, default=350-18-18, help='Speaker internal height (mm)')
+parser.add_argument('--internal-width', type=float, default=200-18-18, help='Speaker internal width (mm)')
+parser.add_argument('--internal-depth', type=float, default=300, help='Speaker internal depth (mm)')
+parser.add_argument('--support-placement', type=float, default=160, help='Internal support placement (mm)')
+parser.add_argument('--support-width', type=float, default=80, help='Internal support width (mm)')
+
+# This is for Wavecor WF146WA05/06
+parser.add_argument('--woofer-placement', type=float, default=200-18, help='Woofer placement (mm)')
+parser.add_argument('--woofer-cutout-diameter', type=float, default=119, help='Woofer cutout diameter (mm)')
+parser.add_argument('--woofer-mount-count', type=float, default=4, help='Count of woofer mounting holes (mm)')
+parser.add_argument('--woofer-mount-diameter', type=float, default=138, help='Diameter of woofer mounting holes (mm)')
+
+# Dynavox AMT-1
+parser.add_argument('--tweeter-diameter', type=float, default=66, help='Tweeter diameter (mm)')
+parser.add_argument('--tweeter-placement', type=float, default=80-18, help='Tweeter placement (mm)')
+parser.add_argument('--tweeter-mount-count', type=float, default=4, help='Count of tweeter mounting holes (mm)')
+parser.add_argument('--tweeter-mount-diameter', type=float, default=79.165, help='Diameter of tweeter mounting holes (mm)')
+
+# Bass reflex port
+parser.add_argument('--port-enable', action="store_true", help="Enable cutting hole for bass reflex port")
+parser.add_argument('--port-mirror', action="store_true", help="Mirror port placement")
+parser.add_argument('--port-diameter', type=float, default=68, help='Bass reflex port diameter (mm)')
+parser.add_argument('--port-placement', type=float, default=80, help='Bass reflex port placement (mm)')
+
+parser.add_argument('--joint', type=float, default=5, help='Joint thickness (mm)')
+parser.add_argument('--joint-margin', type=float, default=0.2, help='Joint error margin (mm)')
+parser.add_argument('--safe-height', type=float, default=3, help='Safe height for moving the bit')
+parser.add_argument('--cut-bit-diameter', type=float, default=3, help='Cutting bit diameter (mm)')
+parser.add_argument('--bridge-thickness', type=float, default=2, help='Bridge thickness, set to 150% of plywood layer depth (mm)')
+parser.add_argument('--bridge-width', type=float, default=8, help='Bridge width (mm)')
+parser.add_argument('--pocket-bit-diameter', type=float, default=3, help='Pocket milling bit diameter (mm)')
+parser.add_argument('--pass-depth', type=float, default=6, help='Pocket milling depth per pass (mm)')
+parser.add_argument('--workpiece', default="front", help='Which side to generate (front, back, side, cap, support)')
+parser.add_argument('--swap-axes', action="store_true", help="Swap axes")
+
+GCODE_TOOL_CHANGE = """
+G00 Z50.00000 (Retract)
+T2
+M5    (Spindle stop.)
+G04 P%.1f
+(MSG, Change tool bit to drill size 2mm)
+M6    (Tool change.)
+M0    (Temporary machine stop.)
+M3    (Spindle on clockwise.)
+"""
+
+args = parser.parse_args()
+
+external_width = args.internal_width + 2*args.material_thickness
+external_height = args.internal_height + 2*args.material_thickness
+external_depth = args.internal_depth + 2*args.material_thickness
+
+bridge_depth = args.material_thickness - args.bridge_thickness
+
+
+print("; Plywood thickness:", args.material_thickness)
+print("; External dimensions: %.2fx%.2fx%.2f (mm)" % (external_width, external_height, external_depth))
+print("; Internal volume: %.1fL" % (args.internal_width*args.internal_height*args.internal_depth*10**-6))
+print("; Woofer diameter:", args.woofer_cutout_diameter)
+print("; Tweeter diameter:", args.tweeter_diameter)
+print("; Bass reflex port diameter:", args.port_diameter)
+print("; Bridge depth:", bridge_depth)
+
+
+# 2159 mm/min, 18k RPM and 3x6mm passes.
+GCODE_HEADER = """
+G94 ( mm per min feed rate )
+G21 ( metric system )
+G90 ( absolute coordinates )
+F2000 ( feedrate )
+S20000 ( spindle rpm )
+T1
+G00 Z3.00000 ( retract )
+X0 Y0
+G64 P0.05080 ( set maximum deviation from commanded toolpath )
+M3 ( spindle on clockwise )
+G04 P0 ( dwell for no time -- G64 should not smooth over this point )
+"""
+
+GCODE_FOOTER = """
+G04 P0 ( dwell for no time -- G64 should not smooth over this point )
+G00 Z50.000 ( retract )
+M5 ( Spindle off. )
+G04 P2.000000
+M9 ( Coolant off. )
+M2 ( Program end. )
+"""
+
+import math
+
+# Primitives are swap aware
+def goto(x,y):
+    if args.swap_axes:
+        x, y = y, x
+    print("X%03.02f Y%03.02f" % (x,y))
+
+def drill(depth):
+    print("G01 Z-%03.02f" % depth)
+
+def arc(x,y,r):
+    cmd = 2
+    if args.swap_axes:
+        x, y = y, x
+        cmd = 3
+    print("G%02d X%03.02f Y%03.02f R%03.02f" % (cmd, x, y, r))
+
+def retract():
+    print("G00 Z%03.02f ( retract )" % args.safe_height)
+
+# Higher level functions
+def mounting_holes(cx, cy, radius, count=4, offset=45):
+    retract()
+    for j in range(count):
+        a = j*math.pi*2/count+offset*math.pi/180
+        goto(cx+math.cos(a)*radius, cy+math.sin(a)*radius)
+        drill(8)
+        retract()
+
+def cutout_circle(cx, cy, radius):
+    retract()
+    mr = args.cut_bit_diameter / 2
+    goto(cx+(radius-mr)*0.8, cy+(radius-mr)*0.6) # arc algab siit
+    r = radius-mr
+    dz = 0
+    while dz < args.material_thickness:
+        dz += args.pass_depth
+        if dz > args.material_thickness:
+            dz = args.material_thickness+args.cut_bit_diameter/2
+        drill(dz)
+
+        bridging = dz > bridge_depth
+
+        # Right
+        if bridging:
+            drill(dz)
+        arc(cx+r*0.8, cy-r*0.6, r) # kuhu jouab arc
+        if bridging:
+            drill(bridge_depth)
+
+
+        # Bottom
+        arc(cx+r*0.6, cy-r*0.8, r) # kuhu jouab arc
+        if bridging:
+            drill(dz)
+        arc(cx-r*0.6, cy-r*0.8, r) # kuhu jouab arc
+        if bridging:
+            drill(bridge_depth)
+
+        # Left
+        arc(cx-r*0.8, cy-r*0.6, r) # arc algab siit
+        if bridging:
+            drill(dz)
+        arc(cx-r*0.8, cy+r*0.6, r) # kuhu jouab arc
+
+        if bridging:
+            drill(bridge_depth)
+
+        # Top
+        arc(cx-r*0.6, cy+r*0.8, r) # arc algab siit
+        if bridging:
+            drill(dz)
+        arc(cx+r*0.6, cy+r*0.8, r) # kuhu jouab arc
+        if bridging:
+            drill(bridge_depth)
+
+
+        arc(cx+r*0.8, cy+r*0.6, r)
+
+def cutout_rect(x1, y1, x2, y2, outer=True):
+    retract()
+    if x2 < x1:
+        x1, x2 = x2, x1
+    if y2 < y1:
+        y1, y2 = y2, y1
+    w = x2-x1
+    h = y2-y1
+
+    radius = args.cut_bit_diameter / 2
+    if not outer:
+        radius = - radius
+
+    dz = 0
+    goto(x1-radius, y1-radius)
+
+    while dz < args.material_thickness:
+      dz += args.pass_depth
+      if dz > args.material_thickness:
+          dz = args.material_thickness+args.cut_bit_diameter/2
+      drill(dz)
+      bridging = dz > bridge_depth
+      for r in [radius]: # (radius*2, radius):
+
+        # Left
+        goto(x1-r, y1-r)
+        if bridging:
+            goto(x1-r, y1+h/2-args.bridge_width/2)
+            drill(bridge_depth)
+            goto(x1-r, y1+h/2+args.bridge_width/2)
+            drill(dz)
+
+        # Bottom
+        goto(x1-r, y2+r)
+        if bridging:
+            goto(x1+w/2-args.bridge_width/2, y2+r)
+            drill(bridge_depth)
+            goto(x1+w/2+args.bridge_width/2, y2+r)
+            drill(dz)
+
+        # Right
+        goto(x2+r, y2+r)
+        if bridging:
+            goto(x2+r, y1+h/2+args.bridge_width/2)
+            drill(bridge_depth)
+            goto(x2+r, y1+h/2-args.bridge_width/2)
+            drill(dz)
+
+        # Top
+        goto(x2+r, y1-r)
+        if bridging:
+            goto(x1+w/2+args.bridge_width/2, y1-r)
+            drill(bridge_depth)
+            goto(x1+w/2-args.bridge_width/2, y1-r)
+            drill(dz)
+
+        goto(x1-r, y1-r)
+
+
+def pocket_rect(x1, y1, x2, y2, depth):
+    retract()
+    dia = args.pocket_bit_diameter
+    r = dia/2
+
+    if x2 < x1:
+        x1, x2 = x2, x1
+    if y2 < y1:
+        y1, y2 = y2, y1
+    w = x2-x1
+    h = y2-y1
+    se = w if w < h else h # shortest edge
+
+    goto(x1+r, y1+r)
+    dz = 0
+    while dz < depth:
+        dz += args.pass_depth
+        if dz > depth:
+            dz = depth
+        drill(dz)
+        dx = r
+        while dx <= se / 2:
+            goto(x1+dx, y1+dx)
+            goto(x1+dx, y2-dx)
+            goto(x2-dx, y2-dx)
+            goto(x2-dx, y1+dx)
+            goto(x1+dx, y1+dx)
+            dx += 0.5*dia
+
+print(GCODE_HEADER)
+
+if args.workpiece == "front":
+    print(GCODE_TOOL_CHANGE % 2)
+    mounting_holes(
+        external_width / 2,
+        args.woofer_placement+args.material_thickness,
+        args.woofer_mount_diameter / 2, args.woofer_mount_count)
+    mounting_holes(
+        external_width / 2,
+        args.tweeter_placement+args.material_thickness,
+        args.tweeter_mount_diameter / 2, args.tweeter_mount_count)
+
+    print(GCODE_TOOL_CHANGE % 3)
+    cutout_circle(
+        external_width / 2,
+        args.woofer_placement+args.material_thickness,
+        args.woofer_cutout_diameter / 2)
+    cutout_circle(
+        external_width / 2,
+        args.tweeter_placement+args.material_thickness,
+        args.tweeter_diameter / 2)
+
+elif args.workpiece in ("side"):
+    cutout_rect(0, 0, args.internal_depth, external_height)
+
+    # Joint pocket bottom
+    pocket_rect(
+        -args.pocket_bit_diameter/2,
+        args.material_thickness - args.joint,
+        args.internal_depth + args.pocket_bit_diameter / 2,
+        args.material_thickness,
+        args.joint + args.joint_margin)
+
+
+    # Joint pocket top
+    pocket_rect(
+        -args.pocket_bit_diameter/2,
+        external_height - args.material_thickness + args.joint,
+        args.internal_depth + args.pocket_bit_diameter / 2,
+        external_height - args.material_thickness,
+        args.joint + args.joint_margin)
+
+    # Joint pocket support
+    pocket_rect(
+        args.internal_depth / 2 - args.support_width / 2 - args.pocket_bit_diameter / 2,
+        args.support_placement,
+        args.internal_depth / 2 + args.support_width / 2 + args.pocket_bit_diameter / 2,
+        args.support_placement + args.joint,
+        args.joint + args.joint_margin)
+
+# Bass reflex port
+if args.port_enable:
+    cutout_circle(
+        (2 if args.port_mirror else 1) * args.internal_depth / 3.0,
+        args.port_placement,
+        args.port_diameter / 2)
+
+if args.workpiece == "cap":
+    pocket_rect(
+        -args.joint,
+        -args.joint-args.pocket_bit_diameter,
+        0,
+        args.internal_depth+args.pocket_bit_diameter+args.joint,
+        args.material_thickness-args.joint)
+    pocket_rect(
+        -args.pocket_bit_diameter,
+        -args.joint,
+        args.internal_width+args.pocket_bit_diameter,
+        0,
+        args.material_thickness-args.joint)
+    pocket_rect(
+        args.internal_width,
+        -args.joint-args.pocket_bit_diameter,
+        args.internal_width+args.joint,
+        args.internal_depth+args.pocket_bit_diameter+args.joint,
+        args.material_thickness-args.joint)
+    pocket_rect(
+        -args.pocket_bit_diameter,
+        args.internal_depth,
+        args.internal_width+args.pocket_bit_diameter,
+        args.internal_depth+args.joint,
+        args.material_thickness-args.joint)
+    cutout_rect(
+        -args.joint,
+        -args.joint,
+        args.joint+args.internal_width,
+        args.joint+args.internal_depth)
+
+if args.workpiece == "support":
+    cutout_rect(
+        -args.joint,
+        0,
+        args.joint+args.internal_width,
+        args.support_width)
+    pocket_rect(
+        -args.joint,
+        -args.pocket_bit_diameter/2,
+        0,
+        args.support_width+args.pocket_bit_diameter,
+        args.material_thickness-args.joint)
+    pocket_rect(
+        args.internal_width,
+        -args.pocket_bit_diameter / 2,
+        args.internal_width + args.joint,
+        args.support_width + args.pocket_bit_diameter,
+        args.material_thickness - args.joint)
+
+# Wire terminals
+if args.workpiece == "back":
+    retract()
+    goto(external_width / 2 - 15, 80)
+    drill(args.material_thickness)
+    retract()
+    goto(external_width / 2 + 15, 80)
+    drill(args.material_thickness)
+    retract()
+
+
+if args.workpiece in ("front", "back"):
+    # Joint pocket bottom
+    pocket_rect(
+        args.material_thickness-args.joint-args.pocket_bit_diameter/2,
+        args.material_thickness-args.joint,
+        external_width-args.material_thickness+args.joint+args.pocket_bit_diameter/2,
+        args.material_thickness,
+        args.joint + args.joint_margin)
+
+    # Joint pocket top
+    pocket_rect(
+        args.material_thickness-args.joint-args.pocket_bit_diameter/2,
+        external_height - args.material_thickness+args.joint,
+        external_width-args.material_thickness+args.joint+args.pocket_bit_diameter/2,
+        external_height - args.material_thickness,
+        args.joint + args.joint_margin)
+
+    # Cutout
+    cutout_rect(0, 0, external_width, external_height)
+
+print(GCODE_FOOTER)
--- a/flt/flt-cache.lib
+++ b/flt/flt-cache.lib
@ -1,11 +1,28 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# C
+# Connector_Conn_01x01_Female
 #
-DEF C C 0 10 N Y 1 F N
+DEF Connector_Conn_01x01_Female J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Connector_Conn_01x01_Female" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*
+$ENDFPLIST
+DRAW
+A 0 0 20 901 -901 1 1 6 N 0 20 0 -20
+P 2 1 1 6 -50 0 -20 0 N
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# flt-rescue_C
+#
+DEF flt-rescue_C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
+F1 "flt-rescue_C" 25 -100 50 H V L CNN
 F2 "" 38 -150 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -19,11 +36,11 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Conn_01x02
+# flt-rescue_Conn_01x02
 #
-DEF Conn_01x02 J 0 40 Y N 1 F N
+DEF flt-rescue_Conn_01x02 J 0 40 Y N 1 F N
 F0 "J" 0 100 50 H V C CNN
-F1 "Conn_01x02" 0 -200 50 H V C CNN
+F1 "flt-rescue_Conn_01x02" 0 -200 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -43,11 +60,11 @@ X Pin_2 2 -200 -100 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L
+# flt-rescue_L
 #
-DEF L L 0 40 N N 1 F N
+DEF flt-rescue_L L 0 40 N N 1 F N
 F0 "L" -50 0 50 V V C CNN
-F1 "L" 75 0 50 V V C CNN
+F1 "flt-rescue_L" 75 0 50 V V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -66,11 +83,11 @@ X 2 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# R
+# flt-rescue_R
 #
-DEF R R 0 0 N Y 1 F N
+DEF flt-rescue_R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F1 "flt-rescue_R" 0 0 50 V V C CNN
 F2 "" -70 0 50 V I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -84,4 +101,17 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# power_GND
+#
+DEF power_GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power_GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
 #End Library
--- a/flt/flt.kicad_pcb
+++ b/flt/flt.kicad_pcb
@ -1,14 +1,11 @@
-(kicad_pcb (version 4) (host pcbnew 4.0.7)
+(kicad_pcb (version 20171130) (host pcbnew 5.0.2-bee76a0~70~ubuntu18.04.1)

  (general
-    (links 13)
-    (no_connects 8)
-    (area 120.574999 51.359999 223.595001 108.025001)
    (thickness 1.6)
    (drawings 6)
-    (tracks 23)
+    (tracks 25)
    (zones 0)
-    (modules 10)
+    (modules 12)
    (nets 8)
  )

@ -37,7 +34,7 @@
  )

  (setup
-    (last_trace_width 4)
+    (last_trace_width 1)
    (user_trace_width 1)
    (user_trace_width 2)
    (user_trace_width 3)
@ -67,11 +64,15 @@
    (pad_size 3 3)
    (pad_drill 1.5)
    (pad_to_mask_clearance 0.2)
+    (solder_mask_min_width 0.25)
    (aux_axis_origin 0 0)
    (visible_elements FFFFFF7F)
    (pcbplotparams
-      (layerselection 0x00030_80000001)
+      (layerselection 0x01030_ffffffff)
      (usegerberextensions false)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
      (excludeedgelayer true)
      (linewidth 0.100000)
      (plotframeref false)
@ -80,8 +81,7 @@
      (useauxorigin false)
      (hpglpennumber 1)
      (hpglpenspeed 20)
-      (hpglpendiameter 15)
-      (hpglpenoverlay 2)
+      (hpglpendiameter 15.000000)
      (psnegative false)
      (psa4output false)
      (plotreference true)
@ -91,7 +91,7 @@
      (subtractmaskfromsilk false)
      (outputformat 1)
      (mirror false)
-      (drillshape 1)
+      (drillshape 0)
      (scaleselection 1)
      (outputdirectory ""))
  )
@ -101,9 +101,9 @@
  (net 2 "Net-(C2-Pad1)")
  (net 3 "Net-(C2-Pad2)")
  (net 4 "Net-(C3-Pad1)")
-  (net 5 "Net-(C3-Pad2)")
-  (net 6 "Net-(J1-Pad2)")
-  (net 7 "Net-(C1-Pad2)")
+  (net 5 "Net-(J1-Pad2)")
+  (net 6 "Net-(C1-Pad2)")
+  (net 7 GND)

  (net_class Default "This is the default net class."
    (clearance 0.2)
@ -112,17 +112,17 @@
    (via_drill 0.4)
    (uvia_dia 0.3)
    (uvia_drill 0.1)
+    (add_net GND)
    (add_net "Net-(C1-Pad1)")
    (add_net "Net-(C1-Pad2)")
    (add_net "Net-(C2-Pad1)")
    (add_net "Net-(C2-Pad2)")
    (add_net "Net-(C3-Pad1)")
-    (add_net "Net-(C3-Pad2)")
    (add_net "Net-(J1-Pad2)")
  )

  (module Capacitors_THT:CP_Axial_L29.0mm_D13.0mm_P35.00mm_Horizontal (layer F.Cu) (tedit 597BC7C3) (tstamp 5C5C9BB1)
-    (at 152.325 59.69)
+    (at 176.784 43.688)
    (descr "CP, Axial series, Axial, Horizontal, pin pitch=35mm, , length*diameter=29*13mm^2, Electrolytic Capacitor, , http://www.kemet.com/Lists/ProductCatalog/Attachments/424/KEM_AC102.pdf")
    (tags "CP Axial series Axial Horizontal pin pitch 35mm  length 29mm diameter 13mm Electrolytic Capacitor")
    (path /5C5C9D1E)
@ -170,7 +170,7 @@
    (pad 1 thru_hole rect (at 0 0) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask)
      (net 1 "Net-(C1-Pad1)"))
    (pad 2 thru_hole oval (at 35 0) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask)
-      (net 7 "Net-(C1-Pad2)"))
+      (net 6 "Net-(C1-Pad2)"))
    (model ${KISYS3DMOD}/Capacitors_THT.3dshapes/CP_Axial_L29.0mm_D13.0mm_P35.00mm_Horizontal.wrl
      (at (xyz 0 0 0))
      (scale (xyz 1 1 1))
@ -179,7 +179,7 @@
  )

  (module Capacitors_THT:CP_Axial_L26.5mm_D20.0mm_P33.00mm_Horizontal (layer F.Cu) (tedit 597BC7C3) (tstamp 5C5C9BB7)
-    (at 212.725 99.675 90)
+    (at 245.872 93.98 90)
    (descr "CP, Axial series, Axial, Horizontal, pin pitch=33mm, , length*diameter=26.5*20mm^2, Electrolytic Capacitor, , http://www.kemet.com/Lists/ProductCatalog/Attachments/424/KEM_AC102.pdf")
    (tags "CP Axial series Axial Horizontal pin pitch 33mm  length 26.5mm diameter 20mm Electrolytic Capacitor")
    (path /5C5CA0B5)
@ -236,7 +236,7 @@
  )

  (module Capacitors_THT:CP_Axial_L38.0mm_D21.0mm_P44.00mm_Horizontal (layer F.Cu) (tedit 597BC7C3) (tstamp 5C5C9BBD)
-    (at 132.08 62.045 270)
+    (at 141.478 51.562 270)
    (descr "CP, Axial series, Axial, Horizontal, pin pitch=44mm, , length*diameter=38*21mm^2, Electrolytic Capacitor, , http://www.vishay.com/docs/28325/021asm.pdf")
    (tags "CP Axial series Axial Horizontal pin pitch 44mm  length 38mm diameter 21mm Electrolytic Capacitor")
    (path /5C5C9EED)
@ -284,7 +284,7 @@
    (pad 1 thru_hole rect (at 0 0 270) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask)
      (net 4 "Net-(C3-Pad1)"))
    (pad 2 thru_hole oval (at 44 0 270) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask)
-      (net 5 "Net-(C3-Pad2)"))
+      (net 7 GND))
    (model ${KISYS3DMOD}/Capacitors_THT.3dshapes/CP_Axial_L38.0mm_D21.0mm_P44.00mm_Horizontal.wrl
      (at (xyz 0 0 0))
      (scale (xyz 1 1 1))
@ -292,94 +292,8 @@
    )
  )

-  (module Inductors_THT:L_Toroid_Horizontal_D28.0mm_P26.67mm_Bourns_2200 (layer F.Cu) (tedit 5880B84D) (tstamp 5C5C9BDB)
-    (at 172.72 80.645)
-    (descr "L_Toroid, Horizontal series, Radial, pin pitch=26.67mm, , diameter=28mm, Bourns, 2200, http://www.bourns.com/docs/Product-Datasheets/2100_series.pdf?sfvrsn=3")
-    (tags "L_Toroid Horizontal series Radial pin pitch 26.67mm  diameter 28mm Bourns 2200")
-    (path /5C5C9B3A)
-    (fp_text reference L1 (at 13.335 -15.31) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 0.68mH (at 13.335 15.31) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_circle (center 13.335 0) (end 27.335 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 13.335 0) (end 18.001667 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 13.335 0) (end 27.425 0) (layer F.SilkS) (width 0.12))
-    (fp_circle (center 13.335 0) (end 17.911667 0) (layer F.SilkS) (width 0.12))
-    (fp_line (start 27.1432 0) (end 17.844144 1.208184) (layer F.Fab) (width 0.1))
-    (fp_line (start 25.293359 6.903915) (end 16.635992 3.300839) (layer F.Fab) (width 0.1))
-    (fp_line (start 20.239469 11.958039) (end 14.543393 4.509088) (layer F.Fab) (width 0.1))
-    (fp_line (start 13.33564 13.8082) (end 12.127025 4.5092) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.431639 11.958678) (end 10.034314 3.301145) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.377281 6.905023) (end 8.825968 1.208602) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.4732 0.001279) (end 8.825744 -1.207766) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.376002 -6.902807) (end 10.033702 -3.300534) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.429423 -11.957399) (end 12.126189 -4.508976) (layer F.Fab) (width 0.1))
-    (fp_line (start 13.333081 -13.8082) (end 14.542558 -4.509312) (layer F.Fab) (width 0.1))
-    (fp_line (start 20.237253 -11.959318) (end 16.635381 -3.301451) (layer F.Fab) (width 0.1))
-    (fp_line (start 25.292079 -6.906131) (end 17.84392 -1.20902) (layer F.Fab) (width 0.1))
-    (fp_line (start 27.1432 -0.002559) (end 17.844368 1.207349) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.75 -14.35) (end -1.75 14.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 14.35) (end 28.45 14.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 28.45 14.35) (end 28.45 -14.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 28.45 -14.35) (end -1.75 -14.35) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole circle (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask)
-      (net 4 "Net-(C3-Pad1)"))
-    (pad 2 thru_hole circle (at 26.67 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask)
-      (net 6 "Net-(J1-Pad2)"))
-    (model Inductors_THT.3dshapes/L_Toroid_Horizontal_D28.0mm_P26.67mm_Bourns_2200.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.393701 0.393701 0.393701))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Inductors_THT:L_Toroid_Horizontal_D25.4mm_P22.90mm_Vishay_TJ5_BigPads (layer F.Cu) (tedit 5880B84D) (tstamp 5C5C9BE1)
-    (at 145.375 82.55)
-    (descr "L_Toroid, Horizontal series, Radial, pin pitch=22.90mm, , diameter=25.4mm, Vishay, TJ5, BigPads, http://www.vishay.com/docs/34079/tj.pdf")
-    (tags "L_Toroid Horizontal series Radial pin pitch 22.90mm  diameter 25.4mm Vishay TJ5 BigPads")
-    (path /5C5C9C40)
-    (fp_text reference L2 (at 11.45 -14.01) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1mH (at 11.45 14.01) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_circle (center 11.45 0) (end 24.15 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 11.45 0) (end 15.683333 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 11.45 0) (end 24.24 0) (layer F.SilkS) (width 0.12))
-    (fp_circle (center 11.45 0) (end 15.593333 0) (layer F.SilkS) (width 0.12))
-    (fp_line (start 23.9842 0) (end 15.532204 1.09379) (layer F.Fab) (width 0.1))
-    (fp_line (start 22.305032 6.266932) (end 14.438444 2.988305) (layer F.Fab) (width 0.1))
-    (fp_line (start 17.717435 10.854742) (end 12.543979 4.082153) (layer F.Fab) (width 0.1))
-    (fp_line (start 11.450581 12.5342) (end 10.3564 4.082255) (layer F.Fab) (width 0.1))
-    (fp_line (start 5.183571 10.855323) (end 8.461833 2.988582) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.595548 6.267938) (end 7.367897 1.094168) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.0842 0.001161) (end 7.367695 -1.093411) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.594387 -6.265927) (end 8.461279 -2.988029) (layer F.Fab) (width 0.1))
-    (fp_line (start 5.181559 -10.854161) (end 10.355643 -4.082052) (layer F.Fab) (width 0.1))
-    (fp_line (start 11.448258 -12.5342) (end 12.543222 -4.082356) (layer F.Fab) (width 0.1))
-    (fp_line (start 17.715424 -10.855903) (end 14.43789 -2.988859) (layer F.Fab) (width 0.1))
-    (fp_line (start 22.303871 -6.268944) (end 15.532001 -1.094546) (layer F.Fab) (width 0.1))
-    (fp_line (start 23.9842 -0.002323) (end 15.532407 1.093033) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.75 -13.05) (end -1.75 13.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.75 13.05) (end 24.65 13.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 24.65 13.05) (end 24.65 -13.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 24.65 -13.05) (end -1.75 -13.05) (layer F.CrtYd) (width 0.05))
-    (pad 1 thru_hole circle (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask)
-      (net 5 "Net-(C3-Pad2)"))
-    (pad 2 thru_hole circle (at 22.9 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask)
-      (net 7 "Net-(C1-Pad2)"))
-    (model Inductors_THT.3dshapes/L_Toroid_Horizontal_D25.4mm_P22.90mm_Vishay_TJ5_BigPads.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.393701 0.393701 0.393701))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
  (module Resistors_THT:R_Axial_Power_L25.0mm_W9.0mm_P27.94mm (layer F.Cu) (tedit 5874F706) (tstamp 5C5C9BE7)
-    (at 220.98 59.69 180)
+    (at 247.142 43.942 180)
    (descr "Resistor, Axial_Power series, Axial, Horizontal, pin pitch=27.94mm, 7W, length*diameter=25*9mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/5WAXIAL_9WAXIAL_11WAXIAL_17WAXIAL%23YAG.pdf")
    (tags "Resistor Axial_Power series Axial Horizontal pin pitch 27.94mm 7W length 25mm diameter 9mm")
    (path /5C5CA03C)
@ -408,7 +322,7 @@
    (pad 1 thru_hole circle (at 0 0 180) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask)
      (net 3 "Net-(C2-Pad2)"))
    (pad 2 thru_hole oval (at 27.94 0 180) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask)
-      (net 6 "Net-(J1-Pad2)"))
+      (net 5 "Net-(J1-Pad2)"))
    (model ${KISYS3DMOD}/Resistors_THT.3dshapes/R_Axial_Power_L25.0mm_W9.0mm_P27.94mm.wrl
      (at (xyz 0 0 0))
      (scale (xyz 0.393701 0.393701 0.393701))
@ -417,7 +331,7 @@
  )

  (module Resistors_THT:R_Axial_Power_L20.0mm_W6.4mm_P22.40mm (layer F.Cu) (tedit 5874F706) (tstamp 5C5C9BED)
-    (at 145.415 55.88 180)
+    (at 169.926 43.434 180)
    (descr "Resistor, Axial_Power series, Axial, Horizontal, pin pitch=22.4mm, 4W, length*diameter=20*6.4mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/5WAXIAL_9WAXIAL_11WAXIAL_17WAXIAL%23YAG.pdf")
    (tags "Resistor Axial_Power series Axial Horizontal pin pitch 22.4mm 4W length 20mm diameter 6.4mm")
    (path /5C5C9DD1)
@ -455,7 +369,7 @@
  )

  (module Connectors_Terminal_Blocks:TerminalBlock_Philmore_TB132_02x5mm_Straight (layer F.Cu) (tedit 59661312) (tstamp 5C5CAC1D)
-    (at 180.42 101.6)
+    (at 226.568 101.346)
    (descr "2-way 5.0mm pitch terminal block, http://www.philmore-datak.com/mc/Page%20197.pdf")
    (tags "screw terminal block")
    (path /5C5C9854)
@ -489,9 +403,9 @@
      (effects (font (size 1 1) (thickness 0.15)))
    )
    (pad 1 thru_hole rect (at 0 0) (size 2.4 2.4) (drill 1.47) (layers *.Cu *.Mask)
-      (net 5 "Net-(C3-Pad2)"))
+      (net 7 GND))
    (pad 2 thru_hole circle (at 5 0) (size 2.4 2.4) (drill 1.47) (layers *.Cu *.Mask)
-      (net 6 "Net-(J1-Pad2)"))
+      (net 5 "Net-(J1-Pad2)"))
    (model ${KISYS3DMOD}/Connectors_Terminal_Blocks.3dshapes/TerminalBlock_Philmore_TB132_02x5mm_Straight.wrl
      (at (xyz 0 0 0))
      (scale (xyz 1 1 1))
@ -500,7 +414,7 @@
  )

  (module Connectors_Terminal_Blocks:TerminalBlock_Philmore_TB132_02x5mm_Straight (layer F.Cu) (tedit 59661312) (tstamp 5C5CAC22)
-    (at 146.05 100.965)
+    (at 190.5 101.346)
    (descr "2-way 5.0mm pitch terminal block, http://www.philmore-datak.com/mc/Page%20197.pdf")
    (tags "screw terminal block")
    (path /5C5C98D7)
@ -534,7 +448,7 @@
      (effects (font (size 1 1) (thickness 0.15)))
    )
    (pad 1 thru_hole rect (at 0 0) (size 2.4 2.4) (drill 1.47) (layers *.Cu *.Mask)
-      (net 5 "Net-(C3-Pad2)"))
+      (net 7 GND))
    (pad 2 thru_hole circle (at 5 0) (size 2.4 2.4) (drill 1.47) (layers *.Cu *.Mask)
      (net 4 "Net-(C3-Pad1)"))
    (model ${KISYS3DMOD}/Connectors_Terminal_Blocks.3dshapes/TerminalBlock_Philmore_TB132_02x5mm_Straight.wrl
@ -545,7 +459,7 @@
  )

  (module Connectors_Terminal_Blocks:TerminalBlock_Philmore_TB132_02x5mm_Straight (layer F.Cu) (tedit 59661312) (tstamp 5C5CAC27)
-    (at 193.755 101.6)
+    (at 240.872 101.346)
    (descr "2-way 5.0mm pitch terminal block, http://www.philmore-datak.com/mc/Page%20197.pdf")
    (tags "screw terminal block")
    (path /5C5C99CE)
@ -579,7 +493,7 @@
      (effects (font (size 1 1) (thickness 0.15)))
    )
    (pad 1 thru_hole rect (at 0 0) (size 2.4 2.4) (drill 1.47) (layers *.Cu *.Mask)
-      (net 5 "Net-(C3-Pad2)"))
+      (net 7 GND))
    (pad 2 thru_hole circle (at 5 0) (size 2.4 2.4) (drill 1.47) (layers *.Cu *.Mask)
      (net 2 "Net-(C2-Pad1)"))
    (model ${KISYS3DMOD}/Connectors_Terminal_Blocks.3dshapes/TerminalBlock_Philmore_TB132_02x5mm_Straight.wrl
@ -589,17 +503,209 @@
    )
  )

-  (dimension 102.87 (width 0.3) (layer Dwgs.User)
-    (gr_text "102,870 mm" (at 172.085 42.469005) (layer Dwgs.User)
+  (module Connector_PinHeader_1.00mm:PinHeader_1x01_P1.00mm_Horizontal (layer F.Cu) (tedit 59FED737) (tstamp 5C6C8D63)
+    (at 214.122 67.564 90)
+    (descr "Through hole angled pin header, 1x01, 1.00mm pitch, 2.0mm pin length, single row")
+    (tags "Through hole angled pin header THT 1x01 1.00mm single row")
+    (path /5C5FF782)
+    (fp_text reference J4 (at 1.375 -1.5 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value Conn_01x01_Female (at 1.375 1.5 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0.75 0 180) (layer F.Fab)
+      (effects (font (size 0.6 0.6) (thickness 0.09)))
+    )
+    (fp_line (start 3.75 -1) (end -1 -1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 1) (end 3.75 -1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1 1) (end 3.75 1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1 -1) (end -1 1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.685 -0.685) (end 0 -0.685) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.685 0) (end -0.685 -0.685) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 0.09) (end 3.31 0.09) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 -0.03) (end 3.31 -0.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 -0.15) (end 3.31 -0.15) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.31 0.21) (end 1.31 0.21) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.31 -0.21) (end 3.31 0.21) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 -0.21) (end 3.31 -0.21) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 0.56) (end 0.685 0.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 -0.56) (end 1.31 0.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.685 -0.56) (end 1.31 -0.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.25 0.15) (end 3.25 0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.25 -0.15) (end 3.25 0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.25 -0.15) (end 3.25 -0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 0.15) (end 0.25 0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -0.15) (end -0.15 0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -0.15) (end 0.25 -0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.25 -0.25) (end 0.5 -0.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.25 0.5) (end 0.25 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.25 0.5) (end 0.25 0.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.25 -0.5) (end 1.25 0.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.5) (end 1.25 -0.5) (layer F.Fab) (width 0.1))
+    (pad 1 thru_hole rect (at 0 0 90) (size 0.85 0.85) (drill 0.5) (layers *.Cu *.Mask)
+      (net 5 "Net-(J1-Pad2)"))
+    (model ${KISYS3DMOD}/Connector_PinHeader_1.00mm.3dshapes/PinHeader_1x01_P1.00mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Connector_PinHeader_1.00mm:PinHeader_1x01_P1.00mm_Horizontal (layer F.Cu) (tedit 5C5FF7B6) (tstamp 5C6C93D2)
+    (at 173.482 67.818 90)
+    (descr "Through hole angled pin header, 1x01, 1.00mm pitch, 2.0mm pin length, single row")
+    (tags "Through hole angled pin header THT 1x01 1.00mm single row")
+    (path /5C5FF6F9)
+    (fp_text reference J5 (at 1.375 -1.5 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value Conn_01x01_Female (at 1.375 1.5 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0.5 -0.5) (end 1.25 -0.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.25 -0.5) (end 1.25 0.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.25 0.5) (end 0.25 0.5) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.25 0.5) (end 0.25 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.25 -0.25) (end 0.5 -0.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -0.15) (end 0.25 -0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 -0.15) (end -0.15 0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.15 0.15) (end 0.25 0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.25 -0.15) (end 3.25 -0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.25 -0.15) (end 3.25 0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.25 0.15) (end 3.25 0.15) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.685 -0.56) (end 1.31 -0.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 -0.56) (end 1.31 0.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 0.56) (end 0.685 0.56) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 -0.21) (end 3.31 -0.21) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.31 -0.21) (end 3.31 0.21) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.31 0.21) (end 1.31 0.21) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 -0.15) (end 3.31 -0.15) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 -0.03) (end 3.31 -0.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.31 0.09) (end 3.31 0.09) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.685 0) (end -0.685 -0.685) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.685 -0.685) (end 0 -0.685) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1 -1) (end -1 1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1 1) (end 3.75 1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 1) (end 3.75 -1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.75 -1) (end -1 -1) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0.75 0 180) (layer F.Fab)
+      (effects (font (size 0.6 0.6) (thickness 0.09)))
+    )
+    (pad 1 thru_hole rect (at 0 0 90) (size 0.85 0.85) (drill 0.5) (layers *.Cu *.Mask)
+      (net 6 "Net-(C1-Pad2)"))
+    (model ${KISYS3DMOD}/Connector_PinHeader_1.00mm.3dshapes/PinHeader_1x01_P1.00mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Inductor_THT:L_Toroid_Horizontal_D40.0mm_P48.26mm (layer F.Cu) (tedit 5AE59B06) (tstamp 5C6C8349)
+    (at 214.122 100.838 90)
+    (descr "L_Toroid, Horizontal series, Radial, pin pitch=48.26mm, , diameter=40mm")
+    (tags "L_Toroid Horizontal series Radial pin pitch 48.26mm  diameter 40mm")
+    (path /5C5C9B3A)
+    (fp_text reference L1 (at 24.13 -21.25 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 0.68mH (at 24.13 21.25 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_arc (start 24.13 0) (end 4.087126 -1.76) (angle 169.963258) (layer F.SilkS) (width 0.12))
+    (fp_arc (start 24.13 0) (end 4.087126 1.76) (angle -169.963258) (layer F.SilkS) (width 0.12))
+    (fp_circle (center 24.13 0) (end 44.13 0) (layer F.Fab) (width 0.1))
+    (fp_circle (center 24.13 0) (end 30.796667 0) (layer F.Fab) (width 0.1))
+    (fp_circle (center 24.13 0) (end 30.676667 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 43.8476 0) (end 30.58008 1.72824) (layer F.Fab) (width 0.1))
+    (fp_line (start 41.206095 9.858536) (end 28.851886 4.721667) (layer F.Fab) (width 0.1))
+    (fp_line (start 33.989327 17.075638) (end 25.858539 6.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 24.130913 19.7176) (end 22.402059 6.45016) (layer F.Fab) (width 0.1))
+    (fp_line (start 14.272255 17.076551) (end 19.408552 4.722104) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.054819 9.860118) (end 17.680081 1.728838) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.4124 0.001827) (end 17.67976 -1.727643) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.052992 -9.856954) (end 19.407677 -4.721229) (layer F.Fab) (width 0.1))
+    (fp_line (start 14.269091 -17.074724) (end 22.400863 -6.449839) (layer F.Fab) (width 0.1))
+    (fp_line (start 24.12726 -19.7176) (end 25.857344 -6.45032) (layer F.Fab) (width 0.1))
+    (fp_line (start 33.986163 -17.077465) (end 28.851011 -4.722542) (layer F.Fab) (width 0.1))
+    (fp_line (start 41.204268 -9.8617) (end 30.579759 -1.729435) (layer F.Fab) (width 0.1))
+    (fp_line (start 43.8476 -0.003654) (end 30.5804 1.727045) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.75 -20.25) (end -1.75 20.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 20.25) (end 50.01 20.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 50.01 20.25) (end 50.01 -20.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 50.01 -20.25) (end -1.75 -20.25) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 24.13 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0 90) (size 3 3) (drill 1.5) (layers *.Cu *.Mask)
+      (net 4 "Net-(C3-Pad1)"))
+    (pad 2 thru_hole circle (at 48.26 0 90) (size 3 3) (drill 1.5) (layers *.Cu *.Mask)
+      (net 5 "Net-(J1-Pad2)"))
+    (model ${KISYS3DMOD}/Inductor_THT.3dshapes/L_Toroid_Horizontal_D40.0mm_P48.26mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Inductor_THT:L_Toroid_Horizontal_D40.0mm_P48.26mm (layer F.Cu) (tedit 5AE59B06) (tstamp 5C6C8365)
+    (at 173.482 100.838 90)
+    (descr "L_Toroid, Horizontal series, Radial, pin pitch=48.26mm, , diameter=40mm")
+    (tags "L_Toroid Horizontal series Radial pin pitch 48.26mm  diameter 40mm")
+    (path /5C5C9C40)
+    (fp_text reference L2 (at 24.13 -21.25 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1mH (at 24.13 21.25 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 24.13 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 50.01 -20.25) (end -1.75 -20.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 50.01 20.25) (end 50.01 -20.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 20.25) (end 50.01 20.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.75 -20.25) (end -1.75 20.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 43.8476 -0.003654) (end 30.5804 1.727045) (layer F.Fab) (width 0.1))
+    (fp_line (start 41.204268 -9.8617) (end 30.579759 -1.729435) (layer F.Fab) (width 0.1))
+    (fp_line (start 33.986163 -17.077465) (end 28.851011 -4.722542) (layer F.Fab) (width 0.1))
+    (fp_line (start 24.12726 -19.7176) (end 25.857344 -6.45032) (layer F.Fab) (width 0.1))
+    (fp_line (start 14.269091 -17.074724) (end 22.400863 -6.449839) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.052992 -9.856954) (end 19.407677 -4.721229) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.4124 0.001827) (end 17.67976 -1.727643) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.054819 9.860118) (end 17.680081 1.728838) (layer F.Fab) (width 0.1))
+    (fp_line (start 14.272255 17.076551) (end 19.408552 4.722104) (layer F.Fab) (width 0.1))
+    (fp_line (start 24.130913 19.7176) (end 22.402059 6.45016) (layer F.Fab) (width 0.1))
+    (fp_line (start 33.989327 17.075638) (end 25.858539 6.45) (layer F.Fab) (width 0.1))
+    (fp_line (start 41.206095 9.858536) (end 28.851886 4.721667) (layer F.Fab) (width 0.1))
+    (fp_line (start 43.8476 0) (end 30.58008 1.72824) (layer F.Fab) (width 0.1))
+    (fp_circle (center 24.13 0) (end 30.676667 0) (layer F.SilkS) (width 0.12))
+    (fp_circle (center 24.13 0) (end 30.796667 0) (layer F.Fab) (width 0.1))
+    (fp_circle (center 24.13 0) (end 44.13 0) (layer F.Fab) (width 0.1))
+    (fp_arc (start 24.13 0) (end 4.087126 1.76) (angle -169.963258) (layer F.SilkS) (width 0.12))
+    (fp_arc (start 24.13 0) (end 4.087126 -1.76) (angle 169.963258) (layer F.SilkS) (width 0.12))
+    (pad 2 thru_hole circle (at 48.26 0 90) (size 3 3) (drill 1.5) (layers *.Cu *.Mask)
+      (net 6 "Net-(C1-Pad2)"))
+    (pad 1 thru_hole circle (at 0 0 90) (size 3 3) (drill 1.5) (layers *.Cu *.Mask)
+      (net 7 GND))
+    (model ${KISYS3DMOD}/Inductor_THT.3dshapes/L_Toroid_Horizontal_D40.0mm_P48.26mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (dimension 128.271006 (width 0.3) (layer Dwgs.User)
+    (gr_text "128,271 mm" (at 193.448001 25.440396 359.7730872) (layer Dwgs.User)
      (effects (font (size 1.5 1.5) (thickness 0.3)))
    )
-    (feature1 (pts (xy 223.52 48.26) (xy 223.52 41.119005)))
-    (feature2 (pts (xy 120.65 48.26) (xy 120.65 41.119005)))
-    (crossbar (pts (xy 120.65 43.819005) (xy 223.52 43.819005)))
-    (arrow1a (pts (xy 223.52 43.819005) (xy 222.393496 44.405426)))
-    (arrow1b (pts (xy 223.52 43.819005) (xy 222.393496 43.232584)))
-    (arrow2a (pts (xy 120.65 43.819005) (xy 121.776504 44.405426)))
-    (arrow2b (pts (xy 120.65 43.819005) (xy 121.776504 43.232584)))
+    (feature1 (pts (xy 257.556 32.512) (xy 257.577006 27.207964)))
+    (feature2 (pts (xy 129.286 32.004) (xy 129.307006 26.699964)))
+    (crossbar (pts (xy 129.304684 27.28638) (xy 257.574684 27.79438)))
+    (arrow1a (pts (xy 257.574684 27.79438) (xy 256.445867 28.376335)))
+    (arrow1b (pts (xy 257.574684 27.79438) (xy 256.450512 27.203502)))
+    (arrow2a (pts (xy 129.304684 27.28638) (xy 130.428856 27.877258)))
+    (arrow2b (pts (xy 129.304684 27.28638) (xy 130.433501 26.704425)))
  )
  (dimension 56.515 (width 0.3) (layer Dwgs.User)
    (gr_text "56,515 mm" (at 229.95 79.6925 90) (layer Dwgs.User)
@ -613,42 +719,44 @@
    (arrow2a (pts (xy 228.6 107.95) (xy 229.186421 106.823496)))
    (arrow2b (pts (xy 228.6 107.95) (xy 228.013579 106.823496)))
  )
-  (gr_line (start 120.65 107.95) (end 120.65 51.435) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 223.52 107.95) (end 120.65 107.95) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 223.52 51.435) (end 223.52 107.95) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 120.65 51.435) (end 223.52 51.435) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 129.54 107.95) (end 129.54 34.798) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 257.556 107.95) (end 129.54 107.95) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 257.556 34.798) (end 257.556 107.95) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 129.54 34.798) (end 257.556 34.798) (layer Edge.Cuts) (width 0.15))

-  (segment (start 145.415 55.88) (end 148.515 55.88) (width 4) (layer F.Cu) (net 1))
-  (segment (start 148.515 55.88) (end 152.325 59.69) (width 4) (layer F.Cu) (net 1))
-  (segment (start 198.755 101.6) (end 210.8 101.6) (width 4) (layer F.Cu) (net 2))
-  (segment (start 210.8 101.6) (end 212.725 99.675) (width 4) (layer F.Cu) (net 2))
-  (segment (start 220.98 59.69) (end 219.71 59.69) (width 4) (layer F.Cu) (net 3))
-  (segment (start 219.71 59.69) (end 212.725 66.675) (width 4) (layer F.Cu) (net 3))
-  (segment (start 151.05 100.965) (end 151.05 75.815) (width 4) (layer F.Cu) (net 4))
-  (segment (start 151.05 75.815) (end 137.28 62.045) (width 4) (layer F.Cu) (net 4))
-  (segment (start 137.28 62.045) (end 132.08 62.045) (width 4) (layer F.Cu) (net 4))
-  (segment (start 151.05 100.965) (end 169.545 100.965) (width 4) (layer F.Cu) (net 4))
-  (segment (start 169.545 100.965) (end 172.72 97.79) (width 4) (layer F.Cu) (net 4))
-  (segment (start 172.72 80.645) (end 172.72 97.79) (width 4) (layer F.Cu) (net 4))
-  (segment (start 132.08 62.045) (end 129.18 62.045) (width 4) (layer F.Cu) (net 4))
-  (segment (start 129.18 62.045) (end 123.015 55.88) (width 4) (layer F.Cu) (net 4))
-  (segment (start 193.04 80.645) (end 193.04 86.995) (width 4) (layer F.Cu) (net 6))
-  (segment (start 193.04 86.995) (end 185.42 94.615) (width 4) (layer F.Cu) (net 6))
-  (segment (start 193.04 59.69) (end 193.04 80.645) (width 4) (layer F.Cu) (net 6))
-  (segment (start 193.04 80.645) (end 199.39 80.645) (width 4) (layer F.Cu) (net 6))
-  (segment (start 185.42 101.6) (end 185.42 94.615) (width 4) (layer F.Cu) (net 6))
-  (segment (start 168.275 82.55) (end 162.56 82.55) (width 4) (layer F.Cu) (net 7))
-  (segment (start 162.56 82.55) (end 162.56 70.485) (width 4) (layer F.Cu) (net 7))
-  (segment (start 162.56 70.485) (end 173.355 59.69) (width 4) (layer F.Cu) (net 7))
-  (segment (start 173.355 59.69) (end 187.325 59.69) (width 4) (layer F.Cu) (net 7))
+  (segment (start 176.53 43.434) (end 176.784 43.688) (width 4) (layer F.Cu) (net 1))
+  (segment (start 169.926 43.434) (end 176.53 43.434) (width 4) (layer F.Cu) (net 1))
+  (segment (start 245.872 101.346) (end 245.872 93.98) (width 4) (layer F.Cu) (net 2))
+  (segment (start 245.872 45.212) (end 247.142 43.942) (width 4) (layer F.Cu) (net 3))
+  (segment (start 245.872 60.98) (end 245.872 45.212) (width 4) (layer F.Cu) (net 3))
+  (segment (start 213.614 101.346) (end 214.122 100.838) (width 4) (layer F.Cu) (net 4))
+  (segment (start 195.5 101.346) (end 213.614 101.346) (width 4) (layer F.Cu) (net 4))
+  (segment (start 195.5 99.648944) (end 195.58 99.568944) (width 4) (layer F.Cu) (net 4))
+  (segment (start 195.5 101.346) (end 195.5 99.648944) (width 4) (layer F.Cu) (net 4))
+  (segment (start 195.58 99.568944) (end 195.58 97.79) (width 4) (layer F.Cu) (net 4))
+  (segment (start 195.58 97.79) (end 190.246 92.456) (width 4) (layer F.Cu) (net 4))
+  (segment (start 190.246 92.456) (end 157.988 92.456) (width 4) (layer F.Cu) (net 4))
+  (segment (start 141.478 75.946) (end 141.478 51.562) (width 4) (layer F.Cu) (net 4))
+  (segment (start 157.988 92.456) (end 141.478 75.946) (width 4) (layer F.Cu) (net 4))
+  (segment (start 141.478 49.482) (end 147.526 43.434) (width 4) (layer F.Cu) (net 4))
+  (segment (start 141.478 51.562) (end 141.478 49.482) (width 4) (layer F.Cu) (net 4))
+  (segment (start 219.202 47.498) (end 214.122 52.578) (width 4) (layer F.Cu) (net 5))
+  (segment (start 219.202 43.942) (end 219.202 47.498) (width 4) (layer F.Cu) (net 5))
+  (segment (start 214.122 52.578) (end 214.122 67.564) (width 4) (layer F.Cu) (net 5))
+  (segment (start 231.568 101.346) (end 231.568 75.358) (width 4) (layer F.Cu) (net 5))
+  (segment (start 223.774 67.564) (end 214.122 67.564) (width 4) (layer F.Cu) (net 5))
+  (segment (start 231.568 75.358) (end 223.774 67.564) (width 4) (layer F.Cu) (net 5))
+  (segment (start 202.894 52.578) (end 211.784 43.688) (width 4) (layer F.Cu) (net 6))
+  (segment (start 173.482 52.578) (end 202.894 52.578) (width 4) (layer F.Cu) (net 6))
+  (segment (start 173.482 67.818) (end 173.482 52.578) (width 4) (layer F.Cu) (net 6))

-  (zone (net 5) (net_name "Net-(C3-Pad2)") (layer F.Cu) (tstamp 0) (hatch edge 0.508)
+  (zone (net 7) (net_name GND) (layer F.Cu) (tstamp 5C6C9517) (hatch edge 0.508)
    (connect_pads yes (clearance 0.508))
    (min_thickness 0.254)
    (fill (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508))
    (polygon
      (pts
-        (xy 223.52 51.435) (xy 223.52 107.95) (xy 120.65 107.95) (xy 120.65 51.435)
+        (xy 257.556 34.798) (xy 257.556 107.696) (xy 129.794 107.95) (xy 129.794 34.798)
      )
    )
  )
--- a/flt/flt.net
+++ b/flt/flt.net
@ -1,8 +1,8 @@
 (export (version D)
  (design
-    (source /home/lauri/flt/flt.sch)
-    (date "R 08 veebr 2019 00:06:38 EET")
-    (tool "Eeschema 4.0.7")
+    (source /home/lauri/amt-box/flt/flt.sch)
+    (date "P 10 veebr 2019 11:58:18 EET")
+    (tool "Eeschema 5.0.2-bee76a0~70~ubuntu18.04.1")
    (sheet (number 1) (name /) (tstamps /)
      (title_block
        (title)
@ -17,67 +17,90 @@
  (components
    (comp (ref J1)
      (value Terminal)
-      (footprint Connectors_Terminal_Blocks:TerminalBlock_Philmore_TB132_02x5mm_Straight)
-      (libsource (lib conn) (part Conn_01x02))
+      (footprint Connectors_Phoenix:PhoenixContact_MC-GF_02x5.08mm_Angled_ThreadedFlange_MountHole)
+      (libsource (lib flt-rescue) (part Conn_01x02) (description ""))
      (sheetpath (names /) (tstamps /))
      (tstamp 5C5C9854))
    (comp (ref J2)
      (value Woofer)
-      (footprint Connectors_Terminal_Blocks:TerminalBlock_Philmore_TB132_02x5mm_Straight)
-      (libsource (lib conn) (part Conn_01x02))
+      (footprint Connectors_Phoenix:PhoenixContact_MC-GF_02x5.08mm_Angled_ThreadedFlange_MountHole)
+      (libsource (lib flt-rescue) (part Conn_01x02) (description ""))
      (sheetpath (names /) (tstamps /))
      (tstamp 5C5C98D7))
    (comp (ref J3)
      (value Tweeter)
-      (footprint Connectors_Terminal_Blocks:TerminalBlock_Philmore_TB132_02x5mm_Straight)
-      (libsource (lib conn) (part Conn_01x02))
+      (footprint Connectors_Phoenix:PhoenixContact_MC-GF_02x5.08mm_Angled_ThreadedFlange_MountHole)
+      (libsource (lib flt-rescue) (part Conn_01x02) (description ""))
      (sheetpath (names /) (tstamps /))
      (tstamp 5C5C99CE))
    (comp (ref L1)
      (value 0.68mH)
-      (footprint Inductors_THT:L_Toroid_Horizontal_D28.0mm_P26.67mm_Bourns_2200)
-      (libsource (lib device) (part L))
+      (footprint Inductor_THT:L_Toroid_Horizontal_D40.0mm_P48.26mm)
+      (libsource (lib flt-rescue) (part L) (description ""))
      (sheetpath (names /) (tstamps /))
      (tstamp 5C5C9B3A))
    (comp (ref L2)
      (value 1mH)
-      (footprint Inductors_THT:L_Toroid_Horizontal_D25.4mm_P22.90mm_Vishay_TJ5_BigPads)
-      (libsource (lib device) (part L))
+      (footprint Inductor_THT:L_Toroid_Horizontal_D40.0mm_P48.26mm)
+      (libsource (lib flt-rescue) (part L) (description ""))
      (sheetpath (names /) (tstamps /))
      (tstamp 5C5C9C40))
    (comp (ref C1)
      (value 33uF)
      (footprint Capacitors_THT:CP_Axial_L29.0mm_D13.0mm_P35.00mm_Horizontal)
-      (libsource (lib device) (part C))
+      (libsource (lib flt-rescue) (part C) (description ""))
      (sheetpath (names /) (tstamps /))
      (tstamp 5C5C9D1E))
    (comp (ref R2)
      (value 8.2)
      (footprint Resistors_THT:R_Axial_Power_L20.0mm_W6.4mm_P22.40mm)
-      (libsource (lib device) (part R))
+      (libsource (lib flt-rescue) (part R) (description ""))
      (sheetpath (names /) (tstamps /))
      (tstamp 5C5C9DD1))
    (comp (ref C3)
      (value 12uF)
      (footprint Capacitors_THT:CP_Axial_L38.0mm_D21.0mm_P44.00mm_Horizontal)
-      (libsource (lib device) (part C))
+      (libsource (lib flt-rescue) (part C) (description ""))
      (sheetpath (names /) (tstamps /))
      (tstamp 5C5C9EED))
    (comp (ref R1)
      (value 10R)
      (footprint Resistors_THT:R_Axial_Power_L25.0mm_W9.0mm_P27.94mm)
-      (libsource (lib device) (part R))
+      (libsource (lib flt-rescue) (part R) (description ""))
      (sheetpath (names /) (tstamps /))
      (tstamp 5C5CA03C))
    (comp (ref C2)
      (value 6.8uF)
      (footprint Capacitors_THT:CP_Axial_L26.5mm_D20.0mm_P33.00mm_Horizontal)
-      (libsource (lib device) (part C))
+      (libsource (lib flt-rescue) (part C) (description ""))
      (sheetpath (names /) (tstamps /))
-      (tstamp 5C5CA0B5)))
+      (tstamp 5C5CA0B5))
+    (comp (ref J5)
+      (value Conn_01x01_Female)
+      (footprint Connector_PinHeader_1.00mm:PinHeader_1x01_P1.00mm_Horizontal)
+      (datasheet ~)
+      (libsource (lib Connector) (part Conn_01x01_Female) (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5C5FF6F9))
+    (comp (ref J4)
+      (value Conn_01x01_Female)
+      (footprint Connector_PinHeader_1.00mm:PinHeader_1x01_P1.00mm_Horizontal)
+      (datasheet ~)
+      (libsource (lib Connector) (part Conn_01x01_Female) (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5C5FF782)))
  (libparts
-    (libpart (lib device) (part C)
-      (description "Unpolarized capacitor")
+    (libpart (lib Connector) (part Conn_01x01_Female)
+      (description "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)")
+      (docs ~)
+      (footprints
+        (fp Connector*:*))
+      (fields
+        (field (name Reference) J)
+        (field (name Value) Conn_01x01_Female))
+      (pins
+        (pin (num 1) (name Pin_1) (type passive))))
+    (libpart (lib flt-rescue) (part C)
      (footprints
        (fp C_*))
      (fields
@ -86,9 +109,7 @@
      (pins
        (pin (num 1) (name ~) (type passive))
        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib conn) (part Conn_01x02)
-      (description "Generic connector, single row, 01x02")
-      (docs ~)
+    (libpart (lib flt-rescue) (part Conn_01x02)
      (footprints
        (fp Connector*:*_??x*mm*)
        (fp Connector*:*1x??x*mm*)
@ -102,8 +123,7 @@
      (pins
        (pin (num 1) (name Pin_1) (type passive))
        (pin (num 2) (name Pin_2) (type passive))))
-    (libpart (lib device) (part L)
-      (description Inductor)
+    (libpart (lib flt-rescue) (part L)
      (footprints
        (fp Choke_*)
        (fp *Coil*)
@ -115,8 +135,7 @@
      (pins
        (pin (num 1) (name 1) (type passive))
        (pin (num 2) (name 2) (type passive))))
-    (libpart (lib device) (part R)
-      (description Resistor)
+    (libpart (lib flt-rescue) (part R)
      (footprints
        (fp R_*)
        (fp R_*))
@ -127,35 +146,37 @@
        (pin (num 1) (name ~) (type passive))
        (pin (num 2) (name ~) (type passive)))))
  (libraries
-    (library (logical device)
-      (uri /usr/share/kicad/library/device.lib))
-    (library (logical conn)
-      (uri /usr/share/kicad/library/conn.lib)))
+    (library (logical Connector)
+      (uri /usr/share/kicad/library/Connector.lib))
+    (library (logical flt-rescue)
+      (uri /home/lauri/amt-box/flt/flt-rescue.lib)))
  (nets
    (net (code 1) (name "Net-(C2-Pad2)")
-      (node (ref C2) (pin 2))
-      (node (ref R1) (pin 1)))
+      (node (ref R1) (pin 1))
+      (node (ref C2) (pin 2)))
    (net (code 2) (name "Net-(C2-Pad1)")
      (node (ref C2) (pin 1))
      (node (ref J3) (pin 2)))
    (net (code 3) (name "Net-(J1-Pad2)")
-      (node (ref J1) (pin 2))
      (node (ref L1) (pin 2))
+      (node (ref J1) (pin 2))
+      (node (ref J4) (pin 1))
      (node (ref R1) (pin 2)))
    (net (code 4) (name "Net-(C1-Pad2)")
+      (node (ref C1) (pin 2))
      (node (ref L2) (pin 2))
-      (node (ref C1) (pin 2)))
-    (net (code 5) (name "Net-(C3-Pad1)")
+      (node (ref J5) (pin 1)))
+    (net (code 5) (name "Net-(C1-Pad1)")
+      (node (ref C1) (pin 1))
+      (node (ref R2) (pin 1)))
+    (net (code 6) (name "Net-(C3-Pad1)")
      (node (ref L1) (pin 1))
-      (node (ref J2) (pin 2))
      (node (ref R2) (pin 2))
+      (node (ref J2) (pin 2))
      (node (ref C3) (pin 1)))
-    (net (code 6) (name "Net-(C3-Pad2)")
-      (node (ref C3) (pin 2))
+    (net (code 7) (name GND)
      (node (ref J1) (pin 1))
+      (node (ref C3) (pin 2))
      (node (ref L2) (pin 1))
      (node (ref J3) (pin 1))
-      (node (ref J2) (pin 1)))
-    (net (code 7) (name "Net-(C1-Pad1)")
-      (node (ref C1) (pin 1))
-      (node (ref R2) (pin 1)))))
+      (node (ref J2) (pin 1)))))
--- a/flt/flt.pro
+++ b/flt/flt.pro
@ -1,4 +1,4 @@
-update=N 07 veebr 2019 22:25:09 EET
+update=P 10 veebr 2019 11:48:04 EET
 version=1
 last_client=kicad
 [pcbnew]
@ -23,41 +23,8 @@ ModuleOutlineThickness=0.150000000000
 [cvpcb]
 version=1
 NetIExt=net
+[general]
+version=1
 [eeschema]
 version=1
 LibDir=
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=switches
-LibName4=relays
-LibName5=motors
-LibName6=transistors
-LibName7=conn
-LibName8=linear
-LibName9=regul
-LibName10=74xx
-LibName11=cmos4000
-LibName12=adc-dac
-LibName13=memory
-LibName14=xilinx
-LibName15=microcontrollers
-LibName16=dsp
-LibName17=microchip
-LibName18=analog_switches
-LibName19=motorola
-LibName20=texas
-LibName21=intel
-LibName22=audio
-LibName23=interface
-LibName24=digital-audio
-LibName25=philips
-LibName26=display
-LibName27=cypress
-LibName28=siliconi
-LibName29=opto
-LibName30=atmel
-LibName31=contrib
-LibName32=valves
-[general]
-version=1
--- a/flt/flt.sch
+++ b/flt/flt.sch
@ -1,37 +1,6 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:switches
-LIBS:relays
-LIBS:motors
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 25 0
+EESchema Schematic File Version 4
+LIBS:flt-cache
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@ -46,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Conn_01x02 J1
+L flt-rescue:Conn_01x02 J1
 U 1 1 5C5C9854
 P 2500 4700
 F 0 "J1" H 2500 4800 50  0000 C CNN
@ -57,7 +26,7 @@ F 3 "" H 2500 4700 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Conn_01x02 J2
+L flt-rescue:Conn_01x02 J2
 U 1 1 5C5C98D7
 P 3550 4800
 F 0 "J2" H 3550 4900 50  0000 C CNN
@ -68,7 +37,7 @@ F 3 "" H 3550 4800 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Conn_01x02 J3
+L flt-rescue:Conn_01x02 J3
 U 1 1 5C5C99CE
 P 4600 4900
 F 0 "J3" H 4600 5000 50  0000 C CNN
@ -79,29 +48,29 @@ F 3 "" H 4600 4900 50  0001 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L L L1
+L flt-rescue:L L1
 U 1 1 5C5C9B3A
 P 3750 3900
 F 0 "L1" H 3700 3900 50  0000 C CNN
 F 1 "0.68mH" V 3825 3900 50  0000 C CNN
-F 2 "Inductors_THT:L_Toroid_Horizontal_D28.0mm_P26.67mm_Bourns_2200" H 3750 3900 50  0001 C CNN
+F 2 "Inductor_THT:L_Toroid_Horizontal_D40.0mm_P48.26mm" H 3750 3900 50  0001 C CNN
 F 3 "" H 3750 3900 50  0001 C CNN
 	1    3750 3900
 	-1   0    0    1   
 $EndComp
 $Comp
-L L L2
+L flt-rescue:L L2
 U 1 1 5C5C9C40
 P 4100 4850
 F 0 "L2" H 4050 4850 50  0000 C CNN
 F 1 "1mH" V 4175 4850 50  0000 C CNN
-F 2 "Inductors_THT:L_Toroid_Horizontal_D25.4mm_P22.90mm_Vishay_TJ5_BigPads" H 4100 4850 50  0001 C CNN
+F 2 "Inductor_THT:L_Toroid_Horizontal_D40.0mm_P48.26mm" H 4100 4850 50  0001 C CNN
 F 3 "" H 4100 4850 50  0001 C CNN
 	1    4100 4850
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C1
+L flt-rescue:C C1
 U 1 1 5C5C9D1E
 P 4100 4550
 F 0 "C1" H 4125 4650 50  0000 L CNN
@ -112,7 +81,7 @@ F 3 "" H 4100 4550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R2
+L flt-rescue:R R2
 U 1 1 5C5C9DD1
 P 4100 4250
 F 0 "R2" V 4180 4250 50  0000 C CNN
@ -123,16 +92,16 @@ F 3 "" H 4100 4250 50  0001 C CNN
 	1    0    0    1   
 $EndComp
 Wire Wire Line
-	3750 4050 3750 4700
+	3750 4050 3750 4100
 Wire Wire Line
 	3750 4800 3750 5000
 Wire Wire Line
-	2700 5000 4400 5000
+	2700 5000 3200 5000
 Wire Wire Line
 	4400 5000 4400 4900
 Connection ~ 4100 5000
 $Comp
-L C C3
+L flt-rescue:C C3
 U 1 1 5C5C9EED
 P 3200 4700
 F 0 "C3" H 3000 4800 50  0000 L CNN
@ -148,7 +117,7 @@ Wire Wire Line
 	3200 5000 3200 4850
 Connection ~ 3750 5000
 $Comp
-L R R1
+L flt-rescue:R R1
 U 1 1 5C5CA03C
 P 3900 3750
 F 0 "R1" V 3980 3750 50  0000 C CNN
@ -159,7 +128,7 @@ F 3 "" H 3900 3750 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L C C2
+L flt-rescue:C C2
 U 1 1 5C5CA0B5
 P 4200 3750
 F 0 "C2" H 4225 3850 50  0000 L CNN
@ -181,6 +150,51 @@ Wire Wire Line
 Wire Wire Line
 	2700 3750 3750 3750
 Wire Wire Line
-	3200 4100 4100 4100
+	3200 4100 3750 4100
 Connection ~ 3750 4100
+Wire Wire Line
+	4100 5000 4400 5000
+Wire Wire Line
+	3750 5000 4100 5000
+Wire Wire Line
+	3200 5000 3750 5000
+Wire Wire Line
+	3750 4100 3750 4700
+Wire Wire Line
+	3750 4100 4100 4100
+$Comp
+L power:GND #PWR0101
+U 1 1 5C5FF5B0
+P 3200 5000
+F 0 "#PWR0101" H 3200 4750 50  0001 C CNN
+F 1 "GND" H 3205 4827 50  0000 C CNN
+F 2 "" H 3200 5000 50  0001 C CNN
+F 3 "" H 3200 5000 50  0001 C CNN
+	1    3200 5000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Conn_01x01_Female J5
+U 1 1 5C5FF6F9
+P 4300 4700
+F 0 "J5" H 4327 4726 50  0000 L CNN
+F 1 "Conn_01x01_Female" H 4327 4635 50  0000 L CNN
+F 2 "Connector_PinHeader_1.00mm:PinHeader_1x01_P1.00mm_Horizontal" H 4300 4700 50  0001 C CNN
+F 3 "~" H 4300 4700 50  0001 C CNN
+	1    4300 4700
+	1    0    0    -1  
+$EndComp
+Connection ~ 4100 4700
+$Comp
+L Connector:Conn_01x01_Female J4
+U 1 1 5C5FF782
+P 3750 3550
+F 0 "J4" V 3690 3462 50  0000 R CNN
+F 1 "Conn_01x01_Female" V 3599 3462 50  0000 R CNN
+F 2 "Connector_PinHeader_1.00mm:PinHeader_1x01_P1.00mm_Horizontal" H 3750 3550 50  0001 C CNN
+F 3 "~" H 3750 3550 50  0001 C CNN
+	1    3750 3550
+	0    -1   -1   0   
+$EndComp
+Connection ~ 3750 3750
 $EndSCHEMATC