From ef301b716b54c65f905d217bd44cc4f53226e211 Mon Sep 17 00:00:00 2001
From: Matthew Stephenson <github@mainmast.org.uk>
Date: Sun, 22 Oct 2017 13:02:05 +0100
Subject: [PATCH] Removed Antenna.lib, added Antenna_Chip to device.lib

---
 library/Antenna.dcm |  9 -------
 library/Antenna.lib | 24 -----------------
 library/device.dcm  |  5 ++++
 library/device.lib  | 66 ++++++++++++++++++++++++++++-----------------
 4 files changed, 47 insertions(+), 57 deletions(-)
 delete mode 100644 library/Antenna.dcm
 delete mode 100644 library/Antenna.lib

diff --git a/library/Antenna.dcm b/library/Antenna.dcm
deleted file mode 100644
index 56628ba6..00000000
--- a/library/Antenna.dcm
+++ /dev/null
@@ -1,9 +0,0 @@
-EESchema-DOCLIB  Version 2.0
-#
-$CMP ANT_JOHANSEN_CHIP
-D Miniature RF ceramic chip antenna
-K RF ceramic chip antenna
-F https://www.johansontechnology.com/antennas
-$ENDCMP
-#
-#End Doc Library
diff --git a/library/Antenna.lib b/library/Antenna.lib
deleted file mode 100644
index 2efb5eba..00000000
--- a/library/Antenna.lib
+++ /dev/null
@@ -1,24 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# ANT_JOHANSEN_CHIP
-#
-DEF ANT_JOHANSEN_CHIP AE 0 40 Y Y 1 F N
-F0 "AE" -200 150 50 H V C CNN
-F1 "ANT_JOHANSEN_CHIP" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- ANT*JOHANSEN*
-$ENDFPLIST
-DRAW
-S -300 100 300 -100 0 1 10 f
-P 2 0 1 10 0 100 0 350 N
-P 2 0 1 10 0 200 -100 300 N
-P 2 0 1 10 0 200 100 300 N
-X FEED 1 -400 0 100 R 50 50 1 1 I
-X TAIL 2 400 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/library/device.dcm b/library/device.dcm
index aa45b268..6cbb26e3 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -15,6 +15,11 @@ D Antenna symbol
 K antenna
 $ENDCMP
 #
+$CMP Antenna_Chip
+D Ceramic Chip Antenna symbol with pin for PCB trace
+K antenna
+$ENDCMP
+#
 $CMP Antenna_Dipole
 D Dipole Antenna symbol
 K dipole antenna
diff --git a/library/device.lib b/library/device.lib
index f205d5ef..1d70faf9 100644
--- a/library/device.lib
+++ b/library/device.lib
@@ -9,13 +9,13 @@ F1 "Amperemeter_AC" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
-A -20 -54 21 -1633 -167 0 1 0 N -40 -60 0 -60
-A 20 -65 21 140 1660 0 1 0 N 40 -60 0 -60
-C 0 0 100 0 1 10 N
 T 0 0 25 100 0 0 0 A Normal 0 C C
 P 2 0 0 0 -125 -125 -75 -75 N
 P 2 0 0 0 75 75 125 125 N
 P 3 0 0 0 75 125 125 125 125 75 N
+A -20 -54 21 -1633 -167 0 1 0 N -40 -60 0 -60
+A 20 -65 21 140 1660 0 1 0 N 40 -60 0 -60
+C 0 0 100 0 1 10 N
 X ~ 1 0 -200 100 U 50 50 1 1 P
 X ~ 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
@@ -29,11 +29,11 @@ F1 "Amperemeter_DC" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
-C 0 0 100 0 1 10 N
 T 0 0 0 100 0 0 0 A Normal 0 C C
 P 2 0 0 0 -125 -125 -75 -75 N
 P 2 0 0 0 75 75 125 125 N
 P 3 0 0 0 75 125 125 125 125 75 N
+C 0 0 100 0 1 10 N
 P 2 0 1 0 10 150 30 150 N
 P 2 0 1 0 20 160 20 140 N
 X - 1 0 -200 100 U 50 50 1 1 P
@@ -55,6 +55,24 @@ X A 1 0 -200 100 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# Antenna_Chip
+#
+DEF Antenna_Chip AE 0 40 N N 1 F N
+F0 "AE" -75 175 50 H V R CNN
+F1 "Antenna_Chip" -75 100 50 H V R CNN
+F2 "" 0 100 50 H I C CNN
+F3 "" 0 100 50 H I C CNN
+DRAW
+P 2 0 1 0 0 -100 0 0 N
+P 2 0 1 10 0 200 0 -150 N
+P 2 0 1 0 100 -100 100 -75 N
+P 2 0 1 10 100 -75 0 -75 N
+P 3 0 1 10 50 200 0 0 -50 200 N
+X A 1 0 -200 100 U 50 50 1 1 I
+X PCB_Trace 2 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Antenna_Dipole
 #
 DEF Antenna_Dipole AE 0 40 N N 1 F N
@@ -2395,11 +2413,11 @@ F1 "Frequency_Counter" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
-C 0 0 100 0 1 10 N
 T 0 0 0 80 0 0 0 Hz Normal 0 C C
 P 2 0 0 0 -125 -125 -75 -75 N
 P 2 0 0 0 75 75 125 125 N
 P 3 0 0 0 75 125 125 125 125 75 N
+C 0 0 100 0 1 10 N
 X - 1 0 -200 100 U 50 50 1 1 P
 X + 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
@@ -2487,9 +2505,9 @@ F1 "Galvanometer" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
-C 0 0 100 0 1 10 N
 P 2 0 0 0 -125 -125 125 125 N
 P 3 0 0 0 75 125 125 125 125 75 N
+C 0 0 100 0 1 10 N
 P 2 0 1 0 10 150 30 150 N
 P 2 0 1 0 20 160 20 140 N
 X - 1 0 -200 100 U 50 50 1 1 P
@@ -2674,10 +2692,10 @@ F1 "LED_ARGB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 DRAW
-C 80 0 10 0 1 0 F
 T 0 -75 -250 50 0 0 0 B Normal 0 C C
 T 0 -75 -50 50 0 0 0 G Normal 0 C C
 T 0 -75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
 P 2 0 1 0 -100 -200 50 -200 N
@@ -2711,10 +2729,10 @@ F1 "LED_CRGB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 DRAW
-C -85 0 10 0 1 0 F
 T 0 75 -250 50 0 0 0 B Normal 0 C C
 T 0 75 -50 50 0 0 0 G Normal 0 C C
 T 0 75 150 50 0 0 0 R Normal 0 C C
+C -85 0 10 0 1 0 F
 S 110 330 -110 -300 0 1 10 f
 P 2 0 1 8 -50 -150 -50 -250 N
 P 2 0 1 8 -50 50 -50 -50 N
@@ -2956,10 +2974,10 @@ F1 "LED_RABG" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 DRAW
-C 80 0 10 0 1 0 F
 T 0 -75 -250 50 0 0 0 B Normal 0 C C
 T 0 -75 -50 50 0 0 0 G Normal 0 C C
 T 0 -75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
@@ -3003,10 +3021,10 @@ F1 "LED_RAGB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 DRAW
-C 80 0 10 0 1 0 F
 T 0 -75 -250 50 0 0 0 B Normal 0 C C
 T 0 -75 -50 50 0 0 0 G Normal 0 C C
 T 0 -75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
@@ -3050,10 +3068,10 @@ F1 "LED_RCBG" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 DRAW
-C -85 0 10 0 1 0 F
 T 0 75 -250 50 0 0 0 B Normal 0 C C
 T 0 75 -50 50 0 0 0 G Normal 0 C C
 T 0 75 150 50 0 0 0 R Normal 0 C C
+C -85 0 10 0 1 0 F
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
@@ -3097,10 +3115,10 @@ F1 "LED_RCGB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 DRAW
-C -85 0 10 0 1 0 F
 T 0 75 -250 50 0 0 0 B Normal 0 C C
 T 0 75 -50 50 0 0 0 G Normal 0 C C
 T 0 75 150 50 0 0 0 R Normal 0 C C
+C -85 0 10 0 1 0 F
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
@@ -3193,10 +3211,10 @@ F1 "LED_RGB_EP" 0 370 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 DRAW
-C 0 -300 14 0 1 10 F
 T 0 -75 -250 50 0 0 0 B Normal 0 C C
 T 0 -75 -50 50 0 0 0 G Normal 0 C C
 T 0 -75 150 50 0 0 0 R Normal 0 C C
+C 0 -300 14 0 1 10 F
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
@@ -3537,11 +3555,11 @@ F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
 A 0 0 117 310 -310 0 0 10 N 100 60 100 -60
-C 0 0 100 0 1 0 N
-C 40 -50 10 0 1 0 F
 S -30 -70 30 -80 0 0 10 F
 S -30 80 30 70 0 0 10 F
 P 2 0 0 10 120 0 150 0 N
+C 0 0 100 0 1 0 N
+C 40 -50 10 0 1 0 F
 P 2 0 1 0 0 -100 0 -80 N
 P 2 0 1 0 0 100 0 80 N
 X ~ 1 0 -200 100 U 50 50 1 1 P
@@ -3855,11 +3873,11 @@ F1 "Ohmmeter" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
-C 0 0 100 0 1 10 N
 T 0 0 0 100 0 0 0 Ω Normal 0 C C
 P 2 0 0 0 -125 -125 -75 -75 N
 P 2 0 0 0 75 75 125 125 N
 P 3 0 0 0 75 125 125 125 125 75 N
+C 0 0 100 0 1 10 N
 X - 1 0 -200 100 U 50 50 1 1 P
 X + 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
@@ -3877,12 +3895,12 @@ A -55 20 15 1 1799 0 0 10 N -40 20 -70 20
 A -15 -20 15 -1799 -1 0 0 10 N -30 -20 0 -20
 A 25 20 15 1 1799 0 0 10 N 40 20 10 20
 A 65 -20 15 -1799 -1 0 0 10 N 50 -20 80 -20
-C 0 0 100 0 1 10 N
 P 2 0 0 10 -70 20 -75 0 N
 P 2 0 0 10 -40 20 -30 -20 N
 P 2 0 0 10 0 -20 10 20 N
 P 2 0 0 10 40 20 50 -20 N
 P 2 0 0 10 80 -20 85 0 N
+C 0 0 100 0 1 10 N
 P 2 0 1 0 10 150 30 150 N
 P 2 0 1 0 20 160 20 140 N
 X - 1 0 -200 100 U 50 50 1 1 P
@@ -4137,13 +4155,13 @@ P 2 1 1 0 25 25 100 100 N
 P 3 1 1 0 25 -25 100 -100 100 -100 N
 P 3 1 1 20 25 75 25 -75 25 -75 N
 P 5 1 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+X E1 1 100 -200 100 U 50 50 1 1 P
+X B1 2 -200 0 100 R 50 50 1 1 I
+X C1 6 100 200 100 D 50 50 1 1 P
 P 2 2 1 0 25 25 100 100 N
 P 3 2 1 0 25 -25 100 -100 100 -100 N
 P 3 2 1 20 25 75 25 -75 25 -75 N
 P 5 2 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-X E1 1 100 -200 100 U 50 50 1 1 P
-X B1 2 -200 0 100 R 50 50 1 1 I
-X C1 6 100 200 100 D 50 50 1 1 P
 X C2 3 100 200 100 D 50 50 2 1 P
 X E2 4 100 -200 100 U 50 50 2 1 P
 X B2 5 -200 0 100 R 50 50 2 1 I
@@ -9227,13 +9245,13 @@ F1 "Voltmeter_AC" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
-A -20 -54 21 -1633 -167 0 1 0 N -40 -60 0 -60
-A 20 -65 21 140 1660 0 1 0 N 40 -60 0 -60
-C 0 0 100 0 1 10 N
 T 0 0 20 100 0 0 0 V Normal 0 C C
 P 2 0 0 0 -125 -125 -75 -75 N
 P 2 0 0 0 75 75 125 125 N
 P 3 0 0 0 75 125 125 125 125 75 N
+A -20 -54 21 -1633 -167 0 1 0 N -40 -60 0 -60
+A 20 -65 21 140 1660 0 1 0 N 40 -60 0 -60
+C 0 0 100 0 1 10 N
 X ~ 1 0 -200 100 U 50 50 1 1 P
 X ~ 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
@@ -9247,11 +9265,11 @@ F1 "Voltmeter_DC" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
-C 0 0 100 0 1 10 N
 T 0 0 0 100 0 0 0 V Normal 0 C C
 P 2 0 0 0 -125 -125 -75 -75 N
 P 2 0 0 0 75 75 125 125 N
 P 3 0 0 0 75 125 125 125 125 75 N
+C 0 0 100 0 1 10 N
 P 2 0 1 0 10 150 30 150 N
 P 2 0 1 0 20 160 20 140 N
 X - 1 0 -200 100 U 50 50 1 1 P