replace another JFET with NPN transistor

2 files changed, 98 insertions, 103 deletions

diff --git a/gschem/board.pcb b/gschem/board.pcb
index 0c856ee..109d20e 100644
--- a/gschem/board.pcb
+++ b/gschem/board.pcb
@@ -6,7 +6,7 @@ FileVersion[20070407]
 PCB["" 330000 330000]
 
 Grid[2500.0 0 0 0]
-Cursor[180000 270000 0.000000]
+Cursor[65000 100000 0.000000]
 PolyArea[3100.006200]
 Thermal[0.500000]
 DRC[1000 1000 1000 1000 1500 1000]
@@ -1236,7 +1236,7 @@ Element["" "R025" "R310" "22k" 257500 22500 -12000 2000 2 100 ""]
 
 Element["" "RCY100P" "C301" "1u" 252500 107500 -10000 -15000 1 100 ""]
 (
-	Pin[0 0 6000 3000 6600 3000 "+" "1" "square"]
+	Pin[0 0 6000 3000 6600 3000 "+" "1" "found,square"]
 	Pin[0 -10000 6000 3000 6600 3000 "-" "2" ""]
 	ElementLine [0 7000 0 11000 1000]
 	ElementLine [-2000 9000 2000 9000 1000]
@@ -1712,7 +1712,7 @@ Element["" "R025" "R430" "1M" 217500 202500 -12000 2000 2 100 ""]
 
 Element["" "R025" "R515" "1M" 217500 187500 -12000 2000 2 100 ""]
 (
-	Pin[0 0 6800 3000 7400 3800 "1" "1" "found,square,edge2"]
+	Pin[0 0 6800 3000 7400 3800 "1" "1" "square,edge2"]
 	Pin[-40000 0 6800 3000 7400 3800 "2" "2" "edge2"]
 	ElementLine [-30000 5000 -10000 5000 2000]
 	ElementLine [-30000 -5000 -30000 5000 2000]
@@ -1778,7 +1778,7 @@ Element["" "R025" "R507" "3k3" 262500 195000 12000 -2000 0 100 ""]
 
 Element["" "R025" "R506" "100k" 262500 180000 12000 -2000 0 100 ""]
 (
-	Pin[0 0 6800 3000 7400 3800 "1" "1" "found,square,edge2"]
+	Pin[0 0 6800 3000 7400 3800 "1" "1" "square,edge2"]
 	Pin[40000 0 6800 3000 7400 3800 "2" "2" "edge2"]
 	ElementLine [10000 -5000 30000 -5000 2000]
 	ElementLine [30000 -5000 30000 5000 2000]
@@ -1802,10 +1802,10 @@ Element["" "R025" "R431" "3k3" 262500 210000 12000 -2000 0 100 ""]
 
 	)
 
-Element["" "R025" "R307" "4k7" 280000 127500 -12000 2000 2 100 ""]
+Element["" "R025" "R307" "3k3" 280000 127500 -12000 2000 2 100 ""]
 (
 	Pin[0 0 6800 3000 7400 3800 "1" "1" "square,edge2,thermal(1X)"]
-	Pin[-40000 0 6800 3000 7400 3800 "2" "2" "edge2"]
+	Pin[-40000 0 6800 3000 7400 3800 "2" "2" "found,edge2"]
 	ElementLine [-30000 5000 -10000 5000 2000]
 	ElementLine [-30000 -5000 -30000 5000 2000]
 	ElementLine [-30000 -5000 -10000 -5000 2000]
@@ -1828,16 +1828,6 @@ Element["" "R025" "R520" "100" 275000 262500 -12000 2000 2 100 ""]
 
 	)
 
-Element["" "TO92" "Q302" "unknown" 230000 155000 1000 -13000 0 100 ""]
-(
-	Pin[20000 0 7200 3000 7800 4200 "D" "1" "square,edge2"]
-	Pin[10000 0 7200 3000 7800 4200 "S" "2" "edge2"]
-	Pin[0 0 7200 3000 7800 4200 "G" "3" "edge2"]
-	ElementLine [3000 -7000 17000 -7000 1000]
-	ElementArc [10000 0 10000 10000 315 270 1000]
-
-	)
-
 Element["" "TO92_CBE" "Q401" "unknown" 250000 215000 -1000 13000 2 100 ""]
 (
 	Pin[-20000 0 7200 3000 7800 4200 "C" "1" "square,edge2"]
@@ -1905,6 +1895,16 @@ Element["" "R025" "R508" "100k" 262500 165000 12000 -2000 0 100 ""]
 	ElementLine [30000 0 40000 0 2000]
 
 	)
+
+Element["" "TO92_CBE" "Q302" "unknown" 230000 155000 1000 -13000 0 100 ""]
+(
+	Pin[20000 0 7200 3000 7800 4200 "1" "1" "square,edge2"]
+	Pin[10000 0 7200 3000 7800 4200 "2" "2" "edge2"]
+	Pin[0 0 7200 3000 7800 4200 "3" "3" "found,edge2"]
+	ElementLine [3000 -7000 17000 -7000 1000]
+	ElementArc [10000 0 10000 10000 315 270 1000]
+
+	)
 Layer(1 "component")
 (
 	Line[177500 217500 217500 217500 2000 2000 "clearline"]
@@ -2130,15 +2130,11 @@ Layer(2 "solder")
 	Line[310000 155000 310000 220000 2000 2000 "clearline"]
 	Line[310000 220000 300000 230000 2000 2000 "clearline"]
 	Line[172500 270000 202500 240000 2000 2000 "clearline,rubberend"]
-	Line[202500 172500 217500 172500 2000 2000 "clearline"]
 	Line[207500 180000 235000 180000 2000 2000 "clearline"]
 	Line[177500 187500 157500 187500 2000 2000 "clearline"]
 	Line[157500 187500 155000 185000 2000 2000 "clearline"]
 	Line[250000 155000 250000 165000 2000 2000 "clearline"]
 	Line[235000 180000 250000 165000 2000 2000 "clearline"]
-	Line[230000 155000 230000 160000 2000 2000 "clearline"]
-	Line[230000 160000 217500 172500 2000 2000 "clearline"]
-	Line[240000 145000 240000 155000 2000 2000 "clearline"]
 	Line[217500 202500 235000 202500 2000 2000 "clearline"]
 	Line[240000 207500 235000 202500 2000 2000 "clearline"]
 	Line[177500 217500 185000 217500 2000 2000 "clearline"]
@@ -2157,8 +2153,6 @@ Layer(2 "solder")
 	Line[255000 210000 270000 210000 2000 2000 "clearline"]
 	Line[205000 217500 227500 217500 2000 2000 "clearline"]
 	Line[227500 217500 230000 215000 2000 2000 "clearline"]
-	Line[240000 145000 240000 120000 2000 2000 "clearline"]
-	Line[240000 120000 252500 107500 2000 2000 "clearline"]
 	Line[217500 187500 237500 187500 2000 2000 "clearline"]
 	Line[237500 187500 240000 185000 2000 2000 "clearline"]
 	Line[262500 165000 262500 180000 2000 2000 "clearline"]
@@ -2173,7 +2167,12 @@ Layer(2 "solder")
 	Line[235000 262500 235000 252500 2000 2000 "clearline"]
 	Line[235000 252500 240000 247500 2000 2000 "clearline"]
 	Line[212500 262500 196250 246250 2000 2000 "clearline"]
-	Line[212500 302500 212500 282500 2000 2000 "clearline,selected"]
+	Line[212500 302500 212500 282500 2000 2000 "clearline"]
+	Line[202500 172500 222500 172500 2000 2000 "clearline"]
+	Line[222500 172500 240000 155000 2000 2000 "clearline"]
+	Line[230000 155000 230000 137500 2000 2000 "clearline"]
+	Line[252500 107500 252500 115000 2000 2000 "clearline"]
+	Line[230000 137500 252500 115000 2000 2000 "clearline"]
 	Polygon("clearpoly")
 	(
 		[0 0] [330000 0] [330000 330000] [0 330000] 
@@ -2373,7 +2372,7 @@ NetList()
 	Net("unnamed_net9" "(unknown)")
 	(
 		Connect("C303-2")
-		Connect("Q302-3")
+		Connect("Q302-2")
 		Connect("R303-1")
 		Connect("R305-2")
 	)
@@ -2385,7 +2384,7 @@ NetList()
 	Net("unnamed_net11" "(unknown)")
 	(
 		Connect("C301-1")
-		Connect("Q302-2")
+		Connect("Q302-3")
 		Connect("R307-2")
 	)
 	Net("unnamed_net12" "(unknown)")
diff --git a/gschem/tuner.sch b/gschem/tuner.sch
index a35b5fc..0391cce 100644
--- a/gschem/tuner.sch
+++ b/gschem/tuner.sch
@@ -62,62 +62,51 @@ footprint=R025
 N 44300 43100 43700 43100 4
 N 45600 43100 45600 44700 4
 N 45600 43100 45200 43100 4
-C 45400 48200 1 0 0 JFET_N-Channel-1.sym
+C 44700 46000 1 90 0 resistor-2.sym
 {
-T 45750 49000 5 10 1 1 0 6 1
-model=J201
-T 45400 50250 5 10 0 0 0 0 1
-device=JFET N-Channel
-T 45400 48200 5 10 1 1 0 0 1
-refdes=Q302
-T 45400 48200 5 10 0 1 0 0 1
-footprint=TO92
-}
-C 44700 47100 1 90 0 resistor-2.sym
-{
-T 44350 47500 5 10 0 0 90 0 1
+T 44350 46400 5 10 0 0 90 0 1
 device=RESISTOR
-T 44800 47600 5 10 1 1 0 0 1
+T 44800 46500 5 10 1 1 0 0 1
 refdes=R305
-T 44800 47400 5 10 1 1 0 0 1
+T 44800 46300 5 10 1 1 0 0 1
 value=1M
-T 44700 47100 5 10 0 1 0 0 1
+T 44700 46000 5 10 0 1 0 0 1
 footprint=R025
 }
 N 44000 44700 44000 48400 4
-N 44600 48000 44600 48400 4
-C 45600 49500 1 0 0 vcc-2.sym
-N 45800 49500 45800 49000 4
-C 45900 47100 1 90 0 resistor-2.sym
+N 44600 46900 44600 48400 4
+C 45600 49300 1 0 0 vcc-2.sym
+N 45800 49300 45800 48900 4
+C 45900 46000 1 90 0 resistor-2.sym
 {
-T 45550 47500 5 10 0 0 90 0 1
+T 45550 46400 5 10 0 0 90 0 1
 device=RESISTOR
-T 46000 47600 5 10 1 1 0 0 1
+T 46000 46500 5 10 1 1 0 0 1
 refdes=R307
-T 46000 47400 5 10 1 1 0 0 1
-value=4k7
-T 45900 47100 5 10 0 1 0 0 1
+T 46000 46300 5 10 1 1 0 0 1
+value=3k3
+T 45900 46000 5 10 0 1 0 0 1
 footprint=R025
 }
-C 45500 46400 1 0 0 vcc-minus-1.sym
-N 45800 48200 45800 48000 4
-N 44000 48400 45400 48400 4
-N 45800 47100 45800 47000 4
+C 45500 45300 1 0 0 vcc-minus-1.sym
+N 45800 47900 45800 46900 4
+N 44000 48400 45300 48400 4
+N 45800 46000 45800 45900 4
 C 37200 36900 0 0 0 title-A2.sym
-C 46100 47900 1 0 0 capacitor-4.sym
+C 46100 47600 1 0 0 capacitor-4.sym
 {
-T 46300 49000 5 10 0 0 0 0 1
+T 46300 48700 5 10 0 0 0 0 1
 device=POLARIZED_CAPACITOR
-T 46300 48400 5 10 1 1 0 0 1
+T 46300 48100 5 10 1 1 0 0 1
 refdes=C301
-T 46300 48600 5 10 0 0 0 0 1
+T 46300 48300 5 10 0 0 0 0 1
 symversion=0.1
-T 46100 47900 5 10 1 1 0 0 1
+T 46100 47600 5 10 1 1 0 0 1
 value=1u
-T 46100 47900 5 10 0 1 0 0 1
+T 46100 47600 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-N 46100 48100 45800 48100 4
+N 46100 47800 45800 47800 4
 C 42800 44500 1 0 0 capacitor-4.sym
 {
 T 43000 45600 5 10 0 0 0 0 1
@@ -144,65 +133,65 @@ value=1u
 T 42800 42900 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-C 48200 48200 1 180 0 resistor-variable-2.sym
+C 48200 47900 1 180 0 resistor-variable-2.sym
 {
-T 47850 48700 5 10 1 1 180 0 1
+T 47850 48400 5 10 1 1 180 0 1
 refdes=R309
-T 47400 47300 5 10 0 1 180 0 1
+T 47400 47000 5 10 0 1 180 0 1
 device=VARIABLE_RESISTOR
-T 47500 48300 5 10 1 1 0 0 1
+T 47500 48000 5 10 1 1 0 0 1
 value=100k?
-T 48200 48200 5 10 0 1 0 0 1
+T 48200 47900 5 10 0 1 0 0 1
 footprint=BOURNS_3296w
 }
-C 47600 47200 1 270 0 resistor-2.sym
+C 47600 46900 1 270 0 resistor-2.sym
 {
-T 47950 46800 5 10 0 0 270 0 1
+T 47950 46500 5 10 0 0 270 0 1
 device=RESISTOR
-T 47900 46700 5 10 1 1 0 0 1
+T 47900 46400 5 10 1 1 0 0 1
 refdes=R310
-T 47900 46500 5 10 1 1 0 0 1
+T 47900 46200 5 10 1 1 0 0 1
 value=22k
-T 47600 47200 5 10 0 1 0 0 1
+T 47600 46900 5 10 0 1 0 0 1
 footprint=R025
 }
-C 47400 45500 1 0 0 vcc-minus-1.sym
-N 47700 47200 47700 47600 4
-N 47700 46100 47700 46300 4
-N 47300 48100 47000 48100 4
-C 48200 45500 1 0 0 vcc-minus-1.sym
-N 48200 48100 48500 48100 4
-N 48500 48100 48500 46100 4
-N 47700 47400 50000 47400 4
+C 47400 45200 1 0 0 vcc-minus-1.sym
+N 47700 46900 47700 47300 4
+N 47700 45800 47700 46000 4
+N 47300 47800 47000 47800 4
+C 48200 45200 1 0 0 vcc-minus-1.sym
+N 48200 47800 48500 47800 4
+N 48500 47800 48500 45800 4
+N 47700 47100 50000 47100 4
 T 47900 46200 9 10 1 0 0 0 1
 taper resistor
 T 47000 49000 9 10 1 0 0 0 1
 trim pot to control send level
 N 45200 44700 45600 44700 4
-C 51400 48100 1 90 0 stereo_jack-1.sym
+C 51400 47800 1 90 0 stereo_jack-1.sym
 {
-T 49700 48395 5 10 1 1 90 0 1
+T 49700 48095 5 10 1 1 90 0 1
 refdes=K301
-T 49100 48395 5 10 0 0 90 0 1
+T 49100 48095 5 10 0 0 90 0 1
 device=CONNECTOR
-T 51400 48100 5 10 0 0 0 0 1
+T 51400 47800 5 10 0 0 0 0 1
 graphical=1
 }
-C 50900 47200 1 0 0 vcc-minus-1.sym
-N 51200 47800 51200 48100 4
-N 50300 48100 50600 48100 4
-N 50000 47000 50000 48100 4
-C 53500 46700 1 180 0 input-2.sym
+C 50900 46900 1 0 0 vcc-minus-1.sym
+N 51200 47500 51200 47800 4
+N 50300 47800 50600 47800 4
+N 50000 46700 50000 47800 4
+C 53500 46400 1 180 0 input-2.sym
 {
-T 53600 46400 5 10 1 0 180 0 1
+T 53600 46100 5 10 1 0 180 0 1
 net=MELODY:1
-T 52900 46000 5 10 0 0 180 0 1
+T 52900 45700 5 10 0 0 180 0 1
 device=none
-T 53000 46600 5 10 1 1 180 7 1
+T 53000 46300 5 10 1 1 180 7 1
 value=MELODY RETURN
 }
-N 50900 48100 50900 46600 4
-N 50900 46600 52100 46600 4
+N 50900 47800 50900 46300 4
+N 50900 46300 52100 46300 4
 C 53100 42700 1 180 0 connector2-1.sym
 {
 T 52900 41700 5 10 0 0 180 0 1
@@ -217,22 +206,22 @@ N 50900 40700 50900 42200 4
 N 50900 42200 51400 42200 4
 T 52200 41500 9 10 1 0 0 0 1
 Tuner OUT (mono)
-C 50500 45300 1 90 0 connector2-1.sym
+C 50500 45000 1 90 0 connector2-1.sym
 {
-T 49500 45500 5 10 0 0 90 0 1
+T 49500 45200 5 10 0 0 90 0 1
 device=CONNECTOR_2
-T 49700 45300 5 10 1 1 90 0 1
+T 49700 45000 5 10 1 1 90 0 1
 refdes=CONN302
-T 50500 45300 5 10 0 0 270 0 1
+T 50500 45000 5 10 0 0 270 0 1
 footprint=CONNECTOR 1 2
 }
-N 50300 47000 50900 47000 4
-T 49800 44700 9 10 1 0 0 0 3
+N 50300 46700 50900 46700 4
+T 49800 44400 9 10 1 0 0 0 3
 This connector is used
 because I only need two pins
 on the board.
-C 44500 46400 1 0 0 gnd-1.sym
-N 44600 46700 44600 47100 4
+C 44500 45300 1 0 0 gnd-1.sym
+N 44600 45600 44600 46000 4
 C 47700 43200 1 0 0 bc550.sym
 {
 T 48300 43700 5 10 0 0 0 0 1
@@ -275,5 +264,12 @@ N 46800 42000 46800 43700 4
 N 45600 43700 47700 43700 4
 T 42400 42000 9 10 1 0 0 0 1
 TODO: do we need a cap after the resistors?
-T 45000 50400 9 10 1 0 0 0 1
-TODO: replace JFET with bipolar NPN trannie
+C 45300 47900 1 0 0 bc550.sym
+{
+T 45900 48400 5 10 0 0 0 0 1
+device=NPN_TRANSISTOR
+T 45900 48400 5 10 1 1 0 0 1
+refdes=Q302
+T 45300 47900 5 10 0 0 0 0 1
+footprint=TO92_CBE
+}