update to use altusmetrum shared repo

diff --git a/README.panel b/README.panel
deleted file mode 100644 (file)
index 75d4bcf..0000000
--- a/README.panel
+++ /dev/null
@@ -1,4 +0,0 @@
-$ ./pcb2panel board1.pcb board2.pcb board3.pcb > boards.pcb
-$ pcb boards.pcb
-$ ./panel2pcb boards.pcb
-$ pcb boards.panel.pcb

diff --git a/gafrc b/gafrc
new file mode 100644 (file)
index 0000000..9e10ee9
--- /dev/null
+++ b/gafrc
@@ -0,0 +1,3 @@
+; empty the library path and populate it with only our own symbols
+(reset-component-library)
+(load "../altusmetrum/gafrc")

diff --git a/gattribrc b/gattribrc
deleted file mode 120000 (symlink)
index 441e62e..0000000
--- a/gattribrc
+++ /dev/null
@@ -1 +0,0 @@
-gschemrc
\ No newline at end of file

diff --git a/gnetlistrc b/gnetlistrc
deleted file mode 120000 (symlink)
index 441e62e..0000000
--- a/gnetlistrc
+++ /dev/null
@@ -1 +0,0 @@
-gschemrc
\ No newline at end of file

diff --git a/gschemrc b/gschemrc
deleted file mode 100644 (file)
index 55565aa..0000000
--- a/gschemrc
+++ /dev/null
@@ -1,2 +0,0 @@
-;; list libraries here.  order matters as this sets the search order
-(component-library "../bdale/sym")

diff --git a/panel.pl b/panel.pl
deleted file mode 100644 (file)
index fc482b2..0000000
--- a/panel.pl
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/perl
-# -*- perl -*-
-
-# Copyright 2006 DJ Delorie <dj@delorie.com>
-# Released under the terms of the GNU General Public License, version 2
-
-sub baseboard {
-    my ($file, $width, $height, $nbase) = @_;
-    if (! $nbase) {
-       $base = $file;
-       $base =~ s@.*/@@;
-    } else {
-       $base = $nbase;
-    }
-
-    $pscript = "$base.pscript";
-    open(PS, ">$pscript");
-    push(@files_to_remove, "$base.pscript");
-
-    open(S, $file) || die("$file: $!");
-    $outname = "$base.panel.pcb";
-    $outname =~ s/pnl\.panel\.pcb/pcb/;
-    open(O, ">$outname");
-    while (<S>) {
-       if (/PCB\[.* (\d+) (\d+)\]/) {
-           s/ (\d+) (\d+)\]/ $width $height\]/;
-       }
-       s/Cursor\[.*\]/Cursor[0 0 0.0]/;
-       next if /\b(Via|Pin|Pad|ElementLine|Line|Arc|ElementArc|Text)/;
-       if (/Polygon|Element/) {
-           while (<S>) {
-               last if /^\s*\)\s*$/;
-           }
-           next;
-       }
-       if (/Layer/) {
-           if (@panelvias) {
-               print O @panelvias;
-               @panelvias = ();
-           }
-       }
-       print O;
-       if (/Layer/) {
-           print O scalar <S>;
-           print O @panelcopper;
-       }
-    }
-    close O;
-    close S;
-
-    print PS "LoadFrom(Layout,$outname)\n";
-
-    $ox = $oy = 0;
-}
-
-sub loadboard {
-    my ($file) = @_;
-    $seq = 1 + $seq;
-
-    open(S, $file);
-    open(O, ">temp-panel.$seq");
-    while (<S>) {
-       if (/PCB\[.* (\d+) (\d+)\]/) {
-           $width = $1;
-           $height = $2;
-       }
-       s/Cursor\[.*\]/Cursor[0 0 0.0]/;
-       print O;
-    }
-    close O;
-    close S;
-    print PS "LoadFrom(LayoutToBuffer,temp-panel.$seq)\n";
-    push(@files_to_remove, "temp-panel.$seq");
-}
-
-sub opaste {
-    $vx = $ox;
-    $vy = $oy + $height;
-    print PS "PasteBuffer(ToLayout,$ox,$oy)\n";
-    $ox += $width;
-    $oy = 0;
-}
-
-sub vpaste {
-    print PS "PasteBuffer(ToLayout,$vx,$vy)\n";
-    $vy += $height;
-}
-
-sub done {
-    print PS "SaveTo(LayoutAs,$outname)\n";
-    print PS "Quit()\n";
-
-    close PS;
-
-    system "set -x; pcb --action-script $pscript";
-    #system "pcb -x ps $base.panel.pcb";
-    #unlink @files_to_remove;
-}
-
-1;

diff --git a/panel2pcb b/panel2pcb
deleted file mode 100755 (executable)
index 565230c..0000000
--- a/panel2pcb
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/perl
-# -*- perl -*-
-
-# Copyright 2006 DJ Delorie <dj@delorie.com>
-# Released under the terms of the GNU General Public License, version 2
-
-if (! @ARGV) {
-    print "Usage: pcb2panel board1.pcb board2.pcb board3.pcb > boards.pcb";
-    print "Then edit boards.pcb, putting each outline where you want it\n";
-    print "and sizing the board.  Then:\n";
-    print "panel2pcb boards.pcb\n";
-    print "and edit/print boards.panel.pcb\n";
-    exit 0;
-}
-
-$mydir = $0;
-if ($mydir =~ m@/@) {
-    $mydir =~ s@[^/]*$@@;
-} else {
-    $mydir = ".";
-}
-    require "$mydir/panel.pl";
-
-$panel = shift;
-
-open(P, $panel);
-while (<P>) {
-    if (/PCB\[.* (\d+) (\d+)\]/) {
-       $panel_width = $1;
-       $panel_height = $2;
-    }
-    if (/Element\[\"[^\"]*\" \"([^\"]*)\" \"([^\"]*)\" \"([^\"]*)\" (\d+) (\d+)/) {
-       $pcb = $1;
-       $base = $2;
-       $value = $3;
-       $mx = $4;
-       $my = $5;
-       %pinx = ();
-       %piny = ();
-    }
-    if (/Pin\[([\d-]+) ([\d-]+) \d+ \d+ \d+ \d+ \"(\d)\"/) {
-       $pinx{$3} = $1;
-       $piny{$3} = $2;
-    }
-    if ($pcb && /\)/) {
-       if ($pinx{'1'} < $pinx{'2'}) {
-           $rot = 0;
-       } elsif ($pinx{'1'} > $pinx{'2'}) {
-           $rot = 2;
-       } elsif ($piny{'1'} < $piny{'2'}) {
-           $rot = 3;
-       } elsif ($piny{'1'} > $piny{'2'}) {
-           $rot = 1;
-       }
-       push (@paste, "$pcb\0$rot\0$mx\0$my");
-       $pcb = undef;
-    }
-    if (/Via/) {
-       push (@panelvias, $_);
-    }
-    if (/^Layer\([^)]*\)$/) {
-       $junk = <P>; # The opening '('
-       while ($junk = <P>) {
-           last if $junk =~ /^\)/;
-           push (@panelcopper, $junk);
-       }
-    }
-}
-
-$tmp = "/tmp/panel$$.pcb";
-
-$start = $paste[0];
-$start =~ s/\0.*//;
-
-$panel =~ s/\.pcb$//;
-&baseboard($start, $panel_width, $panel_height, $panel);
-
-$lastboard = undef;
-for $paste (sort @paste) {
-    ($pcb, $rot, $mx, $my) = split(/\0/, $paste);
-    if ($lastboard ne $pcb) {
-       &loadboard ($pcb);
-       $lastboard = $pcb;
-       $lastrot = 0;
-    }
-    while ($lastrot != $rot) {
-       print PS "PasteBuffer(Rotate,1)\n";
-       $lastrot = ($lastrot+1) % 4;
-    }
-    print PS "PasteBuffer(ToLayout,$mx,$my)\n";
-}
-
-&done();

diff --git a/pcb2panel b/pcb2panel
deleted file mode 100755 (executable)
index 63206dc..0000000
--- a/pcb2panel
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/perl
-# -*- perl -*-
-
-# Copyright 2006 DJ Delorie <dj@delorie.com>
-# Released under the terms of the GNU General Public License, version 2
-
-if (! @ARGV) {
-    print "Usage: pcb2panel board1.pcb board2.pcb board3.pcb > boards.pcb\n";
-    print "Then edit boards.pcb, putting each outline where you want it\n";
-    print "and sizing the board.  Then:\n";
-    print "panel2pcb boards.pcb\n";
-    print "and edit/print boards.panel.pcb\n";
-    exit 0;
-}
-
-for $pcb (@ARGV) {
-    $base = $pcb;
-    $base =~ s@.*/@@;
-    $base =~ s@\.pcb$@@;
-    $base{$pcb} = $base;
-    push (@pcbs, $pcb);
-    open(PCB, $pcb);
-    while (<PCB>) {
-       if (/^PCB\[".*" (\d+) (\d+)\]/) {
-           $width{$pcb} = $1;
-           $height{$pcb} = $2;
-           break;
-       }
-    }
-    close PCB;
-}
-
-$pw = 10000;
-$ph = 0;
-for $pcb (@pcbs) {
-    $pw += 10000;
-    $pw += $width{$pcb};
-    $ph = $height{$pcb} if $ph < $height{$pcb};
-}
-$ph += 20000;
-
-print "PCB[\"\" $pw $ph]\n";
-print "Grid[10000.0 0 0 1]\n";
-print "Groups(\"1,c:2,s\")\n";
-
-$x = 10000;
-$y = 10000;
-for $pcb (@pcbs) {
-    $desc = $pcb;
-    $name = $base{$pcb};
-    $value = "$width{$pcb} x $height{$pcb}";
-    $w = $width{$pcb};
-    $h = $height{$pcb};
-    print "Element[\"\" \"$desc\" \"$name\" \"$value\" $x $y 2000 2000 0 50 \"\"] (\n";
-    print "  Pin[0 0 300 0 0 100 \"1\" \"1\" \"\"]\n";
-    print "  Pin[$w 0 300 0 0 100 \"2\" \"2\" \"\"]\n";
-    print "  ElementLine[0 0 $w 0 100]\n";
-    print "  ElementLine[0 0 0 $h 100]\n";
-    print "  ElementLine[$w 0 $w $h 100]\n";
-    print "  ElementLine[0 $h $w $h 100]\n";
-    print ")\n";
-    $x += $w + 10000;
-}
-
-print "Layer(1 \"component\")()\n";
-print "Layer(2 \"solder\")()\n";
-print "Layer(3 \"silk\")()\n";
-print "Layer(4 \"silk\")()\n";
-
-exit 0;

diff --git a/project b/project
index b6eb30c0ffcc4ac93f94cfca72eca20d3fcb7778..fdbcff4147fcd55b638eae783ce775c3a9882995 100644 (file)
--- a/project
+++ b/project
@@ -6,8 +6,7 @@ schematics      teledongle.sch
 # are derived from the first listed schematic...
 output-name    teledongle
 
-elements-dir ../bdale/pkg
-elements-dir /usr/share/pcb
+elements-dir ../altusmetrum/packages
 
 # stick to newlib elements, don't use the older/odder m4 stuff
 skip-m4

diff --git a/scheme/gnet-partslistgag.scm b/scheme/gnet-partslistgag.scm
deleted file mode 100644 (file)
index 01b71e3..0000000
--- a/scheme/gnet-partslistgag.scm
+++ /dev/null
@@ -1,140 +0,0 @@
-; Copyright 2009 by Bdale Garbee <bdale@gag.com>
-; gnet-partslistgag.scm
-;
-; derived from gnet-partslist3.scm 
-; Copyright (C) 2001 MIYAMOTO Takanori
-; 
-; This program is free software; you can redistribute it and/or modify
-; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation; either version 2 of the License, or
-; (at your option) any later version.
-; 
-; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
-; 
-; You should have received a copy of the GNU General Public License
-; along with this program; if not, write to the Free Software
-; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
-
-; The /'s may not work on win32
-
-; Copyright (C) 2001 MIYAMOTO Takanori
-; gnet-partslist-common.scm
-; 
-; This program is free software; you can redistribute it and/or modify
-; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation; either version 2 of the License, or
-; (at your option) any later version.
-; 
-; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
-; 
-; You should have received a copy of the GNU General Public License
-; along with this program; if not, write to the Free Software
-; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
-
-(define (get-parts-table packages)
-  (if (null? packages)
-      '()
-      (let ((package (car packages)))
-       (if (string=? "1" (gnetlist:get-package-attribute package "nobom"))
-           (get-parts-table (cdr packages))
-           (cons (list (gnetlist:get-package-attribute package "refdes")
-                       (get-device package)
-                       (get-value package)  
-                       (gnetlist:get-package-attribute package "footprint")
-                       (gnetlist:get-package-attribute package "loadstatus")
-                       (gnetlist:get-package-attribute package "vendor")
-                       (gnetlist:get-package-attribute package "vendor_part_number")) ;; sdb change
-                 (get-parts-table (cdr packages)))))))
-
-(define (write-one-row ls separator end-char port)
-  (if (null? ls)
-      '()
-      (begin (display "\"" port)
-            (display (car ls) port)
-            (for-each (lambda (st) (display separator port)(display st port)) (cdr ls))
-            (display end-char port))))
-
-(define (get-sortkey-value ls key-column)
-  (list-ref (car ls) key-column))
-
-(define (marge-sort-sub ls1 ls2 key-column)
-  (if (or (null? ls1) (null? ls2))
-      (append ls1 ls2)
-      (if (string-ci<=? (get-sortkey-value ls1  key-column) (get-sortkey-value ls2 key-column))
-         (cons (car ls1) (marge-sort-sub (cdr ls1) ls2 key-column))
-         (cons (car ls2) (marge-sort-sub ls1 (cdr ls2) key-column)))))
-
-(define (marge-sort ls key-column)
-  (let ((midpoint (inexact->exact (floor (/ (length ls) 2)))))
-    (if (<= (length ls) 1)
-       (append ls)
-       (let ((top-half (reverse (list-tail (reverse ls) midpoint)))
-             (bottom-half (list-tail ls (- (length ls) midpoint))))
-         (set! top-half (marge-sort top-half key-column))
-         (set! bottom-half (marge-sort bottom-half key-column))
-         (marge-sort-sub top-half bottom-half key-column)))))
-
-(define (marge-sort-with-multikey ls key-columns)
-  (if (or (<= (length ls) 1) (null? key-columns))
-      (append ls)
-      (let* ((key-column (car key-columns))
-            (sorted-ls (marge-sort ls key-column))
-            (key-column-only-ls 
-             ((lambda (ls) (let loop ((l ls))
-                             (if (null? l)
-                                 '()
-                                 (cons (get-sortkey-value l key-column) (loop (cdr l))))))
-              sorted-ls))
-            (first-value (get-sortkey-value sorted-ls key-column))
-            (match-length (length (member first-value (reverse key-column-only-ls))))
-            (first-ls (list-tail (reverse sorted-ls) (- (length sorted-ls) match-length)))
-            (rest-ls (list-tail sorted-ls match-length)))
-       (append (marge-sort-with-multikey first-ls (cdr key-columns))
-               (marge-sort-with-multikey rest-ls key-columns)))))
-
-(define partslistgag:write-top-header
-  (lambda (port)
-    (display "\"device\",\"value\",\"footprint\",\"loadstatus\",\"vendor\",\"vendor_part_number\",\"quantity\",\"refdes\"\n" port)))
-
-(define (partslistgag:write-partslist ls port)
-  (if (null? ls)
-      '()
-      (begin (write-one-row (cdar ls) "\",\"" "\"," port)
-            (write-one-row (caar ls) " " "\"\n" port)
-            (partslistgag:write-partslist (cdr ls) port))))
-
-(define partslistgag:write-bottom-footer
-  (lambda (port)
-      '()
-    ))
-
-(define (count-same-parts ls)
-  (if (null? ls)
-      (append ls)
-      (let* ((parts-table-no-uref (let ((result '()))
-                                   (for-each (lambda (l) (set! result (cons (cdr l) result))) (reverse ls))
-                                   (append result)))
-            (first-ls (car parts-table-no-uref))
-            (match-length (length (member first-ls (reverse parts-table-no-uref))))
-            (rest-ls (list-tail ls match-length))
-            (match-ls (list-tail (reverse ls) (- (length ls) match-length)))
-            (uref-ls (let ((result '()))
-                       (for-each (lambda (l) (set! result (cons (car l) result))) match-ls)
-                       (append result))))
-       (cons (cons uref-ls (append first-ls  (list match-length))) (count-same-parts rest-ls)))))
-
-(define partslistgag
-  (lambda (output-filename)
-    (let ((port (open-output-file output-filename))
-         (parts-table (marge-sort-with-multikey (get-parts-table packages) '(1 2 3 0))))
-      (set! parts-table (count-same-parts parts-table))
-      (partslistgag:write-top-header port)
-      (partslistgag:write-partslist parts-table port)
-      (partslistgag:write-bottom-footer port)
-      (close-output-port port))))

diff --git a/teledongle.sch b/teledongle.sch
index 44ab8ff6f87dfdd67aba8ab44bec7408c78a8432..d6ebccc3004bb90888f94471830145abecd81c4f 100644 (file)
--- a/teledongle.sch
+++ b/teledongle.sch
@@ -1,4 +1,4 @@
-v 20100214 2
+v 20130925 2
 C 40000 40000 0 0 0 title-D-bdale.sym
 C 47200 57600 1 0 0 miniUSB.sym
 {
@@ -22,53 +22,53 @@ N 46700 58400 47200 58400 4
 N 47200 58000 46700 58000 4
 N 46400 60400 46400 59600 4
 N 46400 59600 47200 59600 4
-N 46400 60400 51900 60400 4
+N 46400 60400 51200 60400 4
 {
 T 46600 59700 5 10 1 1 0 0 1
 netname=v_usb
 }
-C 52900 58600 1 0 0 gnd-1.sym
+C 52200 58600 1 0 0 gnd.sym
 T 40000 40000 8 10 1 1 0 0 1
 value=270
-C 51400 59100 1 90 0 capacitor-1.sym
+C 50700 59100 1 90 0 capacitor.sym
 {
-T 50700 59300 5 10 0 0 90 0 1
+T 50000 59300 5 10 0 0 90 0 1
 device=CAPACITOR
-T 51700 59900 5 10 1 1 180 0 1
+T 50900 59900 5 10 1 1 180 0 1
 refdes=C5
-T 50500 59300 5 10 0 0 90 0 1
+T 49800 59300 5 10 0 0 90 0 1
 symversion=0.1
-T 51300 59200 5 10 1 1 0 0 1
+T 50600 59200 5 10 1 1 0 0 1
 value=1uF
-T 51400 59100 5 10 0 0 0 0 1
+T 50700 59100 5 10 0 0 0 0 1
 vendor_part_number=490-1320-1-ND
-T 51400 59100 5 10 0 0 0 0 1
+T 50700 59100 5 10 0 0 0 0 1
 footprint=0402
-T 51400 59100 5 10 0 0 0 0 1
+T 50700 59100 5 10 0 0 0 0 1
 vendor=digikey
-T 51400 59100 5 10 0 1 0 0 1
+T 50700 59100 5 10 0 1 0 0 1
 loadstatus=smt
 }
-N 51200 60400 51200 60000 4
-N 51200 59100 51200 58900 4
-C 51900 59500 1 0 0 LP2980.sym
+N 50500 60400 50500 60000 4
+N 50500 59100 50500 58900 4
+C 51200 59500 1 0 0 TC2185.sym
 {
-T 52295 60695 5 10 1 1 0 0 1
+T 51595 60695 5 10 1 1 0 0 1
 refdes=U1
-T 52495 60195 5 10 0 1 0 0 1
+T 51795 60195 5 10 0 1 0 0 1
 device=IC
-T 51895 59495 5 10 0 1 0 0 1
+T 51195 59495 5 10 0 1 0 0 1
 footprint=SOT23-5
-T 51900 59500 5 10 0 0 0 0 1
+T 51200 59500 5 10 0 0 0 0 1
 vendor_part_number=TC10553.3VCT713CT-ND
-T 51900 59500 5 10 0 0 0 0 1
+T 51200 59500 5 10 0 0 0 0 1
 vendor=digikey
-T 51900 59500 5 10 1 1 0 0 1
+T 52000 60700 5 10 1 1 0 0 1
 value=TC1055-3.3
-T 51900 59500 5 10 0 1 0 0 1
+T 51200 59500 5 10 0 1 0 0 1
 loadstatus=smt
 }
-N 53000 58900 53000 59500 4
+N 52300 58900 52300 59500 4
 T 40000 40000 8 10 1 1 0 0 1
 netname=3.3V
 C 50600 45500 1 0 0 CC1111.sym
@@ -97,7 +97,7 @@ N 55500 57200 55900 57200 4
 N 50600 57300 50200 57300 4
 N 50600 56900 50200 56900 4
 N 50600 56500 50200 56500 4
-C 48900 55500 1 0 0 capacitor-1.sym
+C 48900 55500 1 0 0 capacitor.sym
 {
 T 49100 56200 5 10 0 0 0 0 1
 device=CAPACITOR
@@ -116,7 +116,7 @@ vendor=digikey
 T 48900 55500 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 48900 56300 1 0 0 capacitor-1.sym
+C 48900 56300 1 0 0 capacitor.sym
 {
 T 49100 57000 5 10 0 0 0 0 1
 device=CAPACITOR
@@ -135,7 +135,7 @@ vendor=digikey
 T 48900 56300 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 48900 57100 1 0 0 capacitor-1.sym
+C 48900 57100 1 0 0 capacitor.sym
 {
 T 49100 57800 5 10 0 0 0 0 1
 device=CAPACITOR
@@ -161,8 +161,8 @@ N 48900 57300 48700 57300 4
 N 48700 57300 48700 55400 4
 N 48900 55700 48700 55700 4
 N 48900 56500 48700 56500 4
-C 48600 55100 1 0 0 gnd-1.sym
-C 56100 56000 1 270 0 capacitor-1.sym
+C 48600 55100 1 0 0 gnd.sym
+C 56100 56000 1 270 0 capacitor.sym
 {
 T 56800 55800 5 10 0 0 270 0 1
 device=CAPACITOR
@@ -181,7 +181,7 @@ vendor=digikey
 T 56100 56000 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 57100 56000 1 270 0 capacitor-1.sym
+C 57100 56000 1 270 0 capacitor.sym
 {
 T 57800 55800 5 10 0 0 270 0 1
 device=CAPACITOR
@@ -200,7 +200,7 @@ vendor=digikey
 T 57100 56000 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 58100 56000 1 270 0 capacitor-1.sym
+C 58100 56000 1 270 0 capacitor.sym
 {
 T 58800 55800 5 10 0 0 270 0 1
 device=CAPACITOR
@@ -219,7 +219,7 @@ vendor=digikey
 T 58100 56000 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 59100 56000 1 270 0 capacitor-1.sym
+C 59100 56000 1 270 0 capacitor.sym
 {
 T 59800 55800 5 10 0 0 270 0 1
 device=CAPACITOR
@@ -245,11 +245,11 @@ N 55900 56800 58300 56800 4
 N 58300 56000 58300 56800 4
 N 59300 56000 59300 57200 4
 N 59300 57200 55900 57200 4
-C 59200 54800 1 0 0 gnd-1.sym
-C 58200 54800 1 0 0 gnd-1.sym
-C 57200 54800 1 0 0 gnd-1.sym
-C 56200 54800 1 0 0 gnd-1.sym
-C 59500 52800 1 270 0 capacitor-1.sym
+C 59200 54800 1 0 0 gnd.sym
+C 58200 54800 1 0 0 gnd.sym
+C 57200 54800 1 0 0 gnd.sym
+C 56200 54800 1 0 0 gnd.sym
+C 59500 52800 1 270 0 capacitor.sym
 {
 T 60200 52600 5 10 0 0 270 0 1
 device=CAPACITOR
@@ -268,7 +268,7 @@ vendor=digikey
 T 59500 52800 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 61000 52700 1 0 0 inductor-1.sym
+C 61000 52700 1 0 0 inductor.sym
 {
 T 61200 53200 5 10 0 0 0 0 1
 device=INDUCTOR
@@ -287,7 +287,7 @@ vendor=digikey
 T 61000 52700 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 62300 53500 1 0 0 inductor-1.sym
+C 62300 53500 1 0 0 inductor.sym
 {
 T 62500 54000 5 10 0 0 0 0 1
 device=INDUCTOR
@@ -306,7 +306,7 @@ vendor=digikey
 T 62300 53500 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 59600 54500 1 270 0 inductor-1.sym
+C 59600 54500 1 270 0 inductor.sym
 {
 T 60100 54300 5 10 0 0 270 0 1
 device=INDUCTOR
@@ -325,7 +325,7 @@ vendor=digikey
 T 59600 54500 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 61000 54300 1 0 0 capacitor-1.sym
+C 61000 54300 1 0 0 capacitor.sym
 {
 T 61200 55000 5 10 0 0 0 0 1
 device=CAPACITOR
@@ -344,10 +344,10 @@ vendor=digikey
 T 61000 54300 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 61800 54200 1 0 0 gnd-1.sym
+C 61800 54200 1 0 0 gnd.sym
 N 61000 54500 59700 54500 4
 N 55500 53600 61000 53600 4
-C 61000 53400 1 0 0 capacitor-1.sym
+C 61000 53400 1 0 0 capacitor.sym
 {
 T 61200 54100 5 10 0 0 0 0 1
 device=CAPACITOR
@@ -370,8 +370,8 @@ N 61900 53600 62300 53600 4
 N 61900 52800 62100 52800 4
 N 62100 52800 62100 53600 4
 N 61000 52800 55500 52800 4
-C 59600 51600 1 0 0 gnd-1.sym
-C 65200 53400 1 0 0 capacitor-1.sym
+C 59600 51600 1 0 0 gnd.sym
+C 65200 53400 1 0 0 capacitor.sym
 {
 T 65400 54100 5 10 0 0 0 0 1
 device=CAPACITOR
@@ -390,7 +390,7 @@ vendor=digikey
 T 65200 53400 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 63300 53200 1 270 0 capacitor-1.sym
+C 63300 53200 1 270 0 capacitor.sym
 {
 T 64000 53000 5 10 0 0 270 0 1
 device=CAPACITOR
@@ -410,8 +410,8 @@ T 63300 53200 5 10 0 1 0 0 1
 loadstatus=smt
 }
 N 63500 53200 63500 53600 4
-C 63400 52000 1 0 0 gnd-1.sym
-C 64800 53200 1 270 0 capacitor-1.sym
+C 63400 52000 1 0 0 gnd.sym
+C 64800 53200 1 270 0 capacitor.sym
 {
 T 65200 52900 5 10 1 1 0 0 1
 refdes=C24
@@ -430,8 +430,8 @@ vendor=digikey
 T 64800 53200 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 64900 52000 1 0 0 gnd-1.sym
-C 63800 53500 1 0 0 inductor-1.sym
+C 64900 52000 1 0 0 gnd.sym
+C 63800 53500 1 0 0 inductor.sym
 {
 T 64000 54000 5 10 0 0 0 0 1
 device=INDUCTOR
@@ -473,13 +473,13 @@ T 66700 53100 5 10 0 1 0 0 1
 device=CONNECTOR
 }
 N 66100 53600 66700 53600 4
-C 66500 52800 1 0 0 gnd-1.sym
+C 66500 52800 1 0 0 gnd.sym
 N 66700 53200 66600 53200 4
 N 66600 53200 66600 53100 4
-C 55600 45300 1 0 0 gnd-1.sym
+C 55600 45300 1 0 0 gnd.sym
 N 55500 46000 55700 46000 4
 N 55700 46000 55700 45600 4
-C 56200 46600 1 270 0 resistor-1.sym
+C 56200 46600 1 270 0 resistor.sym
 {
 T 56600 46300 5 10 0 0 270 0 1
 device=RESISTOR
@@ -502,7 +502,7 @@ N 56300 46800 55500 46800 4
 N 55500 47600 58300 47600 4
 N 55500 48000 59300 48000 4
 N 59300 47600 59000 47600 4
-C 59100 46600 1 270 0 capacitor-1.sym
+C 59100 46600 1 270 0 capacitor.sym
 {
 T 59800 46400 5 10 0 0 270 0 1
 device=CAPACITOR
@@ -521,7 +521,7 @@ vendor=digikey
 T 59100 46600 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 57800 46600 1 270 0 capacitor-1.sym
+C 57800 46600 1 270 0 capacitor.sym
 {
 T 58500 46400 5 10 0 0 270 0 1
 device=CAPACITOR
@@ -540,13 +540,13 @@ vendor=digikey
 T 57800 46600 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 59200 45400 1 0 0 gnd-1.sym
-C 57900 45400 1 0 0 gnd-1.sym
+C 59200 45400 1 0 0 gnd.sym
+C 57900 45400 1 0 0 gnd.sym
 N 58000 46600 58000 47600 4
 N 59300 46600 59300 48000 4
 T 67700 53300 9 10 1 0 0 0 1
 70CM Antenna
-C 48000 45500 1 90 0 capacitor-1.sym
+C 48000 45500 1 90 0 capacitor.sym
 {
 T 47300 45700 5 10 0 0 90 0 1
 device=CAPACITOR
@@ -565,7 +565,7 @@ vendor=digikey
 T 48000 45500 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 48800 45500 1 90 0 capacitor-1.sym
+C 48800 45500 1 90 0 capacitor.sym
 {
 T 48100 45700 5 10 0 0 90 0 1
 device=CAPACITOR
@@ -584,7 +584,7 @@ vendor=digikey
 T 48800 45500 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 46300 46800 1 0 0 resistor-1.sym
+C 46300 46800 1 0 0 resistor.sym
 {
 T 46600 47200 5 10 0 0 0 0 1
 device=RESISTOR
@@ -601,7 +601,7 @@ vendor=digikey
 T 46300 46800 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 46300 46400 1 0 0 resistor-1.sym
+C 46300 46400 1 0 0 resistor.sym
 {
 T 46600 46800 5 10 0 0 0 0 1
 device=RESISTOR
@@ -633,12 +633,12 @@ netname=padp
 }
 N 47800 46400 47800 46900 4
 N 46100 58800 47200 58800 4
-C 48100 44900 1 0 0 gnd-1.sym
+C 48100 44900 1 0 0 gnd.sym
 N 47800 45500 47800 45300 4
 N 47800 45300 48600 45300 4
 N 48600 45300 48600 45500 4
 N 48200 45200 48200 45300 4
-C 47400 56100 1 90 0 resistor-1.sym
+C 47400 56100 1 90 0 resistor.sym
 {
 T 47000 56400 5 10 0 0 90 0 1
 device=RESISTOR
@@ -655,7 +655,7 @@ vendor=digikey
 T 47400 56100 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 46600 57500 1 0 0 gnd-1.sym
+C 46600 57500 1 0 0 gnd.sym
 T 68800 41800 9 30 1 0 0 0 1
 TeleDongle
 N 46100 46900 46300 46900 4
@@ -697,8 +697,8 @@ N 50600 54100 49300 54100 4
 T 49300 54200 5 10 1 1 0 0 1
 netname=debug_clock
 }
-N 51900 60000 51900 60400 4
-C 63800 49700 1 0 0 gnd-1.sym
+N 51200 60000 51200 60400 4
+C 63800 49700 1 0 0 gnd.sym
 N 64100 49600 62100 49600 4
 {
 T 62100 49700 5 10 1 1 0 0 1
@@ -719,10 +719,10 @@ N 49300 52500 50600 52500 4
 T 49300 52600 5 10 1 1 0 0 1
 netname=cs1
 }
-C 47100 57000 1 0 0 3.3V-plus-1.sym
+C 47100 57000 1 0 0 3.3V-plus.sym
 N 47300 56100 47300 55900 4
 N 47300 55900 46100 55900 4
-C 47200 53000 1 270 0 resistor-1.sym
+C 47200 53000 1 270 0 resistor.sym
 {
 T 47600 52700 5 10 0 0 270 0 1
 device=RESISTOR
@@ -739,7 +739,7 @@ vendor=digikey
 T 47200 53000 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 47200 51200 1 0 0 gnd-1.sym
+C 47200 51200 1 0 0 gnd.sym
 N 50600 53300 47300 53300 4
 {
 T 49300 53400 5 10 1 1 0 0 1
@@ -811,8 +811,8 @@ loadstatus=noload
 T 67200 48700 5 10 0 1 0 0 1
 vendor=none
 }
-C 54900 60400 1 0 0 3.3V-plus-1.sym
-C 56200 45300 1 0 0 gnd-1.sym
+C 54900 60400 1 0 0 3.3V-plus.sym
+C 56200 45300 1 0 0 gnd.sym
 C 58300 47200 1 0 0 ABM8.sym
 {
 T 58500 47700 5 10 0 0 0 0 1
@@ -832,11 +832,11 @@ vendor=digikey
 T 58300 47200 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 58900 46900 1 0 0 gnd-1.sym
-C 58200 46900 1 0 0 gnd-1.sym
+C 58900 46900 1 0 0 gnd.sym
+C 58200 46900 1 0 0 gnd.sym
 N 50600 45700 49800 45700 4
 N 49800 43100 49800 45700 4
-C 65000 46800 1 0 0 gnd-1.sym
+C 65000 46800 1 0 0 gnd.sym
 N 65400 45500 63700 45500 4
 {
 T 63700 45600 5 10 1 1 0 0 1
@@ -879,13 +879,13 @@ vendor_part_number=571-215079-4
 T 64300 48400 5 10 1 1 0 0 1
 value=Debug
 T 64100 48700 5 10 0 0 0 0 1
-loadstatus=throughhole
+loadstatus=noload
 T 64100 48700 5 10 0 0 0 0 1
 vendor=mouser
 T 64100 48700 5 10 0 1 0 0 1
 device=CONNECTOR
 }
-N 54000 60400 55100 60400 4
+N 53300 60400 55100 60400 4
 C 47000 43300 1 90 0 resistor.sym
 {
 T 46600 43600 5 10 0 0 90 0 1
@@ -914,13 +914,13 @@ footprint=0-215079-8
 T 65400 44200 5 10 0 0 0 0 1
 vendor_part_number=571-215079-8
 T 65400 44200 5 10 0 0 0 0 1
-loadstatus=throughhole
+loadstatus=noload
 T 65400 44200 5 10 0 0 0 0 1
 vendor=mouser
 T 65400 44200 5 10 0 1 0 0 1
 device=CONNECTOR
 }
-C 62800 44900 1 0 0 3.3V-plus-1.sym
+C 62800 44900 1 0 0 3.3V-plus.sym
 N 65400 44700 63000 44700 4
 N 63000 44700 63000 44900 4
 C 47200 51900 1 270 0 led.sym
@@ -944,8 +944,8 @@ N 47300 51900 47300 52100 4
 T 66400 54300 9 10 1 0 0 0 2
   SMA is optional
 default is wire whip
-C 46700 44200 1 0 0 3.3V-plus-1.sym
-C 47100 41800 1 90 0 capacitor-1.sym
+C 46700 44200 1 0 0 3.3V-plus.sym
+C 47100 41800 1 90 0 capacitor.sym
 {
 T 46400 42000 5 10 0 0 90 0 1
 device=CAPACITOR
@@ -964,7 +964,7 @@ vendor=digikey
 T 47100 41800 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 46800 41200 1 0 0 gnd-1.sym
+C 46800 41200 1 0 0 gnd.sym
 N 46900 41500 46900 41800 4
 N 46900 43100 49800 43100 4
 {
@@ -972,7 +972,7 @@ T 49800 45800 5 10 1 1 0 0 1
 netname=rstn
 }
 N 46900 42700 46900 43300 4
-C 54400 59400 1 90 0 capacitor-1.sym
+C 54400 59400 1 90 0 capacitor.sym
 {
 T 53700 59600 5 10 0 0 90 0 1
 device=CAPACITOR
@@ -993,9 +993,9 @@ loadstatus=smt
 }
 N 54200 60300 54200 60400 4
 N 46000 43100 46900 43100 4
-N 51200 58900 54200 58900 4
+N 50500 58900 54200 58900 4
 N 54200 58900 54200 59400 4
-C 48100 52700 1 270 0 resistor-1.sym
+C 48100 52700 1 270 0 resistor.sym
 {
 T 48500 52400 5 10 0 0 270 0 1
 device=RESISTOR
@@ -1012,7 +1012,7 @@ vendor=digikey
 T 48100 52700 5 10 0 1 0 0 1
 loadstatus=smt
 }
-C 48100 50900 1 0 0 gnd-1.sym
+C 48100 50900 1 0 0 gnd.sym
 C 48100 51600 1 270 0 led.sym
 {
 T 48400 51550 5 10 1 1 0 0 1
@@ -1037,3 +1037,10 @@ T 49300 53000 5 10 1 1 0 0 1
 netname=led_green
 }
 N 48200 52700 48200 52900 4
+C 53300 59900 1 0 0 nc-right.sym
+{
+T 53400 60400 5 10 0 0 0 0 1
+value=NoConnection
+T 53400 60600 5 10 0 0 0 0 1
+device=DRC_Directive
+}