merge preamp circuits

1 files changed, 146 insertions, 105 deletions

diff --git a/gschem/board.pcb b/gschem/board.pcb
index 3dc9838..63b1d35 100644
--- a/gschem/board.pcb
+++ b/gschem/board.pcb
@@ -6,7 +6,7 @@ FileVersion[20070407]
 PCB["" 354331 425197]
 
 Grid[2500.0 0 0 0]
-Cursor[317500 177500 0.000000]
+Cursor[210000 85000 0.000000]
 PolyArea[3100.006200]
 Thermal[0.500000]
 DRC[1000 1000 1000 1000 1500 1000]
@@ -1268,29 +1268,6 @@ Element["" "R025" "R305" "5M1" 310000 345000 2000 12000 3 100 ""]
 
 	)
 
-Element["" "TO92" "Q301" "unknown" 267500 330000 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["" "R025" "R308" "4k7" 235000 310000 12000 -2000 0 100 ""]
-(
-	Pin[0 0 6800 3000 7400 3800 "1" "1" "square,edge2,thermal(1X)"]
-	Pin[40000 0 6800 3000 7400 3800 "2" "2" "edge2"]
-	ElementLine [10000 -5000 30000 -5000 2000]
-	ElementLine [30000 -5000 30000 5000 2000]
-	ElementLine [10000 5000 30000 5000 2000]
-	ElementLine [10000 -5000 10000 5000 2000]
-	ElementLine [0 0 10000 0 2000]
-	ElementLine [30000 0 40000 0 2000]
-
-	)
-
 Element["" "TO92" "Q302" "unknown" 305000 335000 -13000 -1000 1 100 ""]
 (
 	Pin[0 -20000 7200 3000 7800 4200 "D" "1" "square"]
@@ -1338,30 +1315,6 @@ Element["" "RCY100P" "C301" "1u" 325000 282500 -15000 10000 2 100 ""]
 
 	)
 
-Element["" "R025" "R311" "100k" 235000 297500 -2000 -12000 1 100 ""]
-(
-	Pin[0 0 6800 3000 7400 3800 "1" "1" "square,thermal(1X)"]
-	Pin[0 -40000 6800 3000 7400 3800 "2" "2" ""]
-	ElementLine [-5000 -30000 -5000 -10000 2000]
-	ElementLine [-5000 -30000 5000 -30000 2000]
-	ElementLine [5000 -30000 5000 -10000 2000]
-	ElementLine [-5000 -10000 5000 -10000 2000]
-	ElementLine [0 -10000 0 0 2000]
-	ElementLine [0 -40000 0 -30000 2000]
-
-	)
-
-Element["" "RCY100P" "C302" "1u" 255000 292500 -10000 -15000 1 100 ""]
-(
-	Pin[0 0 6000 3000 6600 3000 "+" "1" "square"]
-	Pin[0 -10000 6000 3000 6600 3000 "-" "2" ""]
-	ElementLine [0 7000 0 11000 1000]
-	ElementLine [-2000 9000 2000 9000 1000]
-	ElementLine [0 -21000 0 -17000 1000]
-	ElementArc [0 -5000 10000 10000 90 360 1000]
-
-	)
-
 Element["" "R025" "R310" "22k" 272500 297500 -2000 -12000 1 100 ""]
 (
 	Pin[0 0 6800 3000 7400 3800 "1" "1" "square"]
@@ -2199,16 +2152,86 @@ Element["" "RCY100P" "C503" "1u" 294000 190000 15000 -10000 0 100 ""]
 
 	)
 
-Element["selected" "RCY100P" "C502" "1u" 329000 187500 -15000 10000 2 100 "selected"]
+Element["" "RCY100P" "C502" "1u" 329000 187500 -15000 10000 2 100 ""]
 (
-	Pin[0 0 6000 3000 6600 3000 "+" "1" "selected,square,edge2"]
-	Pin[-10000 0 6000 3000 6600 3000 "-" "2" "selected,edge2"]
+	Pin[0 0 6000 3000 6600 3000 "+" "1" "square,edge2"]
+	Pin[-10000 0 6000 3000 6600 3000 "-" "2" "edge2"]
 	ElementLine [7000 0 11000 0 1000]
 	ElementLine [9000 -2000 9000 2000 1000]
 	ElementLine [-21000 0 -17000 0 1000]
 	ElementArc [-5000 0 10000 10000 180 360 1000]
 
 	)
+
+Element["" "CONNECTOR-1-2" "CONN302" "unknown" 200000 15000 21000 -5000 3 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3800 "1" "1" "square,edge2"]
+	Pin[10000 0 6000 3000 6600 3800 "2" "2" "edge2"]
+	ElementLine [-5000 -5000 -5000 5000 1000]
+	ElementLine [-5000 5000 15000 5000 1000]
+	ElementLine [15000 5000 15000 -5000 1000]
+	ElementLine [15000 -5000 -5000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 5000 5000 -5000 1000]
+
+	)
+
+Element["" "CONNECTOR-1-2" "CONN301" "unknown" 197500 30000 21000 -5000 3 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3800 "1" "1" "square,edge2"]
+	Pin[10000 0 6000 3000 6600 3800 "2" "2" "edge2"]
+	ElementLine [-5000 -5000 -5000 5000 1000]
+	ElementLine [-5000 5000 15000 5000 1000]
+	ElementLine [15000 5000 15000 -5000 1000]
+	ElementLine [15000 -5000 -5000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 5000 5000 -5000 1000]
+
+	)
+Rat[197500 30000 1 0 0 1  "via"]
+Rat[142500 210000 1 215000 157500 1  ""]
+Rat[215000 157500 1 245000 167500 1  ""]
+Rat[122500 200000 1 97500 112500 1  ""]
+Rat[97500 112500 1 92500 62500 1  ""]
+Rat[245000 167500 1 295000 65000 1  ""]
+Rat[274000 192500 1 294000 127500 1  ""]
+Rat[304000 190000 1 326500 170000 1  ""]
+Rat[207500 30000 1 295000 345000 1  ""]
+Rat[200000 15000 1 285000 285000 1  ""]
+Rat[245000 157500 1 243500 195000 1  ""]
+Rat[245000 157500 1 281500 167500 1  ""]
+Rat[243500 195000 1 291500 232500 1  ""]
+Rat[274000 182500 1 245000 147500 1  ""]
+Rat[245000 147500 1 281500 127500 1  ""]
+Rat[215000 147500 1 258500 195000 1  ""]
+Rat[258500 195000 1 334000 220000 1  ""]
+Rat[334000 220000 1 326500 130000 1  ""]
+Rat[329000 187500 1 294000 220000 1  ""]
+Rat[294000 220000 1 215000 137500 1  ""]
+Rat[291500 207500 1 262500 140000 1  ""]
+Rat[262500 140000 1 246500 93500 1  ""]
+Rat[319000 187500 1 262500 150000 1  ""]
+Rat[255000 247500 1 258500 235000 1  ""]
+Rat[258500 235000 1 243500 235000 1  ""]
+Rat[265000 55000 1 246500 53500 1  ""]
+Rat[235000 45000 1 225000 60500 1  ""]
+Rat[235000 45000 1 265000 45000 1  ""]
+Rat[265000 45000 1 265000 35000 1  ""]
+Rat[265000 45000 1 272500 95000 1  ""]
+Rat[295000 55000 1 312500 84500 1  ""]
+Rat[312500 84500 1 312500 95000 1  ""]
+Rat[325000 44500 1 312500 44500 1  ""]
+Rat[325000 44500 1 325000 60000 1  ""]
+Rat[312500 44500 1 295000 45000 1  ""]
+Rat[225000 45000 1 230000 19500 1  ""]
+Rat[335000 44500 1 330000 19500 1  ""]
+Rat[215000 360000 1 287500 330000 1  ""]
+Rat[127500 185000 1 62500 97500 1  ""]
+Rat[152500 207500 1 235000 127500 1  ""]
+Rat[235000 122500 1 225000 90500 1  ""]
+Rat[225000 90500 1 286500 78500 1  ""]
+Rat[286500 78500 1 325000 90000 1  ""]
+Rat[286500 78500 1 295000 35000 1  ""]
 Layer(1 "component")
 (
 )
@@ -2506,10 +2529,13 @@ NetList()
 		Connect("C408-2")
 		Connect("C501-2")
 		Connect("C507-2")
+		Connect("CONN301-1")
 		Connect("IC401-4")
 		Connect("IC402-4")
 		Connect("IC501-4")
 		Connect("IC502-4")
+		Connect("K101-5")
+		Connect("K301-5")
 		Connect("R102-1")
 		Connect("R105-2")
 		Connect("R106-2")
@@ -2524,10 +2550,8 @@ NetList()
 		Connect("R302-1")
 		Connect("R305-1")
 		Connect("R307-1")
-		Connect("R308-1")
 		Connect("R309-1")
 		Connect("R310-2")
-		Connect("R311-1")
 		Connect("R418-2")
 		Connect("R419-1")
 		Connect("R420-2")
@@ -2538,9 +2562,7 @@ NetList()
 	)
 	Net("BLEND_1" "(unknown)")
 	(
-		Connect("C302-2")
 		Connect("C504-1")
-		Connect("R311-2")
 	)
 	Net("BLEND_2" "(unknown)")
 	(
@@ -2572,15 +2594,24 @@ NetList()
 	Net("INPUT_1" "(unknown)")
 	(
 		Connect("C203-1")
+		Connect("S101-1")
+		Connect("S101-6")
 	)
 	Net("INPUT_2" "(unknown)")
 	(
 		Connect("C103-1")
+		Connect("S101-3")
+		Connect("S101-4")
 	)
 	Net("JACKSWITCH_B" "(unknown)")
 	(
 		Connect("R508-2")
 	)
+	Net("MELODY_RETURN" "(unknown)")
+	(
+		Connect("CONN302-2")
+		Connect("K301-1")
+	)
 	Net("OUT_A" "(unknown)")
 	(
 		Connect("C508-2")
@@ -2612,11 +2643,6 @@ NetList()
 		Connect("R105-1")
 		Connect("S401-1")
 	)
-	Net("SEND" "(unknown)")
-	(
-		Connect("R309-3")
-		Connect("R310-1")
-	)
 	Net("SEND_HIGH" "(unknown)")
 	(
 		Connect("R420-1")
@@ -2627,11 +2653,6 @@ NetList()
 		Connect("R418-1")
 		Connect("R419-3")
 	)
-	Net("TUNER" "(unknown)")
-	(
-		Connect("R301-1")
-		Connect("R302-3")
-	)
 	Net("unnamed_net1" "(unknown)")
 	(
 		Connect("C101-1")
@@ -2716,179 +2737,200 @@ NetList()
 	)
 	Net("unnamed_net13" "(unknown)")
 	(
+		Connect("K101-4")
+		Connect("S101-2")
+	)
+	Net("unnamed_net14" "(unknown)")
+	(
+		Connect("K101-1")
+		Connect("S101-5")
+	)
+	Net("unnamed_net15" "(unknown)")
+	(
+		Connect("CONN301-2")
+		Connect("R301-1")
+		Connect("R302-3")
+	)
+	Net("unnamed_net16" "(unknown)")
+	(
 		Connect("C305-2")
 		Connect("R302-2")
 	)
-	Net("unnamed_net14" "(unknown)")
+	Net("unnamed_net17" "(unknown)")
 	(
 		Connect("C305-1")
 		Connect("R303-2")
 		Connect("R304-2")
 	)
-	Net("unnamed_net15" "(unknown)")
+	Net("unnamed_net18" "(unknown)")
 	(
 		Connect("C303-2")
-		Connect("Q301-3")
 		Connect("Q302-3")
 		Connect("R303-1")
 		Connect("R305-2")
 		Connect("R306-1")
 	)
-	Net("unnamed_net16" "(unknown)")
+	Net("unnamed_net19" "(unknown)")
 	(
 		Connect("C304-2")
 		Connect("R304-1")
 	)
-	Net("unnamed_net17" "(unknown)")
-	(
-		Connect("C302-1")
-		Connect("Q301-2")
-		Connect("R308-2")
-	)
-	Net("unnamed_net18" "(unknown)")
+	Net("unnamed_net20" "(unknown)")
 	(
 		Connect("C301-1")
 		Connect("Q302-2")
 		Connect("R307-2")
 	)
-	Net("unnamed_net19" "(unknown)")
+	Net("unnamed_net21" "(unknown)")
 	(
 		Connect("C301-2")
 		Connect("R309-2")
 	)
-	Net("unnamed_net20" "(unknown)")
+	Net("unnamed_net22" "(unknown)")
+	(
+		Connect("CONN302-1")
+		Connect("K301-4")
+		Connect("R309-3")
+		Connect("R310-1")
+	)
+	Net("unnamed_net23" "(unknown)")
+	(
+		Connect("K301-2")
+		Connect("K301-3")
+	)
+	Net("unnamed_net24" "(unknown)")
 	(
 		Connect("C403-1")
 		Connect("IC401-3")
 		Connect("R404-1")
 	)
-	Net("unnamed_net21" "(unknown)")
+	Net("unnamed_net25" "(unknown)")
 	(
 		Connect("IC401-2")
 		Connect("R405-1")
 		Connect("R407-2")
 	)
-	Net("unnamed_net22" "(unknown)")
+	Net("unnamed_net26" "(unknown)")
 	(
 		Connect("C406-2")
 		Connect("IC401-5")
 		Connect("R402-2")
 	)
-	Net("unnamed_net23" "(unknown)")
+	Net("unnamed_net27" "(unknown)")
 	(
 		Connect("IC401-6")
 		Connect("R406-1")
 		Connect("R408-2")
 	)
-	Net("unnamed_net24" "(unknown)")
+	Net("unnamed_net28" "(unknown)")
 	(
 		Connect("IC402-2")
 		Connect("R412-1")
 		Connect("R413-1")
 		Connect("R416-2")
 	)
-	Net("unnamed_net25" "(unknown)")
+	Net("unnamed_net29" "(unknown)")
 	(
 		Connect("C410-1")
 		Connect("IC402-1")
 		Connect("R416-1")
 	)
-	Net("unnamed_net26" "(unknown)")
+	Net("unnamed_net30" "(unknown)")
 	(
 		Connect("IC402-6")
 		Connect("R414-1")
 		Connect("R415-1")
 		Connect("R417-2")
 	)
-	Net("unnamed_net27" "(unknown)")
+	Net("unnamed_net31" "(unknown)")
 	(
 		Connect("C409-1")
 		Connect("IC402-7")
 		Connect("R417-1")
 	)
-	Net("unnamed_net28" "(unknown)")
+	Net("unnamed_net32" "(unknown)")
 	(
 		Connect("C401-1")
 		Connect("C402-1")
 		Connect("R401-1")
 	)
-	Net("unnamed_net29" "(unknown)")
+	Net("unnamed_net33" "(unknown)")
 	(
 		Connect("C402-2")
 		Connect("C403-2")
 		Connect("R403-1")
 	)
-	Net("unnamed_net30" "(unknown)")
+	Net("unnamed_net34" "(unknown)")
 	(
 		Connect("C404-2")
 		Connect("R402-1")
 		Connect("R409-2")
 	)
-	Net("unnamed_net31" "(unknown)")
+	Net("unnamed_net35" "(unknown)")
 	(
 		Connect("C405-2")
 		Connect("R409-1")
 		Connect("R410-1")
 	)
-	Net("unnamed_net32" "(unknown)")
+	Net("unnamed_net36" "(unknown)")
 	(
 		Connect("C409-2")
 		Connect("R419-2")
 	)
-	Net("unnamed_net33" "(unknown)")
+	Net("unnamed_net37" "(unknown)")
 	(
 		Connect("C410-2")
 		Connect("R421-2")
 	)
-	Net("unnamed_net34" "(unknown)")
+	Net("unnamed_net38" "(unknown)")
 	(
 		Connect("IC501-6")
 		Connect("R506-1")
 		Connect("R507-2")
 		Connect("R508-1")
 	)
-	Net("unnamed_net35" "(unknown)")
+	Net("unnamed_net39" "(unknown)")
 	(
 		Connect("C508-1")
 		Connect("IC501-7")
 		Connect("R507-1")
 	)
-	Net("unnamed_net36" "(unknown)")
+	Net("unnamed_net40" "(unknown)")
 	(
 		Connect("IC501-2")
 		Connect("R503-1")
 		Connect("R504-1")
 		Connect("R505-2")
 	)
-	Net("unnamed_net37" "(unknown)")
+	Net("unnamed_net41" "(unknown)")
 	(
 		Connect("C502-1")
 		Connect("IC501-1")
 		Connect("R505-1")
 	)
-	Net("unnamed_net38" "(unknown)")
+	Net("unnamed_net42" "(unknown)")
 	(
 		Connect("R501-1")
 		Connect("R502-3")
 		Connect("R511-2")
 	)
-	Net("unnamed_net39" "(unknown)")
+	Net("unnamed_net43" "(unknown)")
 	(
 		Connect("C502-2")
 		Connect("R502-2")
 	)
-	Net("unnamed_net40" "(unknown)")
+	Net("unnamed_net44" "(unknown)")
 	(
 		Connect("C504-2")
 		Connect("R504-2")
 		Connect("R506-2")
 	)
-	Net("unnamed_net41" "(unknown)")
+	Net("unnamed_net45" "(unknown)")
 	(
 		Connect("IC502-3")
 		Connect("R511-1")
 	)
-	Net("unnamed_net42" "(unknown)")
+	Net("unnamed_net46" "(unknown)")
 	(
 		Connect("C505-1")
 		Connect("IC502-1")
@@ -2896,25 +2938,25 @@ NetList()
 		Connect("R513-1")
 		Connect("Z502-1")
 	)
-	Net("unnamed_net43" "(unknown)")
+	Net("unnamed_net47" "(unknown)")
 	(
 		Connect("IC502-6")
 		Connect("R512-2")
 		Connect("R513-2")
 	)
-	Net("unnamed_net44" "(unknown)")
+	Net("unnamed_net48" "(unknown)")
 	(
 		Connect("C506-1")
 		Connect("IC502-7")
 		Connect("R512-1")
 		Connect("Z501-1")
 	)
-	Net("unnamed_net45" "(unknown)")
+	Net("unnamed_net49" "(unknown)")
 	(
 		Connect("C505-2")
 		Connect("R509-2")
 	)
-	Net("unnamed_net46" "(unknown)")
+	Net("unnamed_net50" "(unknown)")
 	(
 		Connect("C506-2")
 		Connect("R510-2")
@@ -2929,7 +2971,6 @@ NetList()
 		Connect("IC402-8")
 		Connect("IC501-8")
 		Connect("IC502-8")
-		Connect("Q301-1")
 		Connect("Q302-1")
 		Connect("R101-2")
 		Connect("R104-1")