roughly align both preamp sections

1 files changed, 118 insertions, 125 deletions

diff --git a/gschem/board.pcb b/gschem/board.pcb
index d663e9b..1a60adf 100644
--- a/gschem/board.pcb
+++ b/gschem/board.pcb
@@ -6,7 +6,7 @@ FileVersion[20070407]
 PCB["" 600000 500000]
 
 Grid[2500.0 0 0 0]
-Cursor[237500 440000 0.000000]
+Cursor[350000 92500 0.000000]
 PolyArea[3100.006200]
 Thermal[0.500000]
 DRC[1000 1000 1000 1000 1500 1000]
@@ -841,7 +841,7 @@ Element["" "R025" "R512" "100k" 186500 15000 -12000 2000 2 100 ""]
 Element["" "CK06_type_capacitor" "C507" "100n" 226500 15000 -37000 -14400 0 150 ""]
 (
 	Pin[0 0 8000 3000 11000 3500 "1" "1" "edge2,thermal(5)"]
-	Pin[-20000 0 8000 3000 11000 3500 "2" "2" "warn,edge2,thermal(4)"]
+	Pin[-20000 0 8000 3000 11000 3500 "2" "2" "edge2,thermal(4)"]
 	ElementLine [5000 -5000 5000 5000 1000]
 	ElementLine [-25000 -5000 5000 -5000 1000]
 	ElementLine [-25000 -5000 -25000 5000 1000]
@@ -1689,7 +1689,7 @@ Element["" "CK06_type_capacitor" "C103" "0.47u" 170000 467500 -37000 -14400 0 15
 
 Element["" "TO92" "Q103" "unknown" 150000 447500 -13000 -1000 1 100 ""]
 (
-	Pin[0 -20000 7200 3000 7800 4200 "D" "1" "found,square"]
+	Pin[0 -20000 7200 3000 7800 4200 "D" "1" "square"]
 	Pin[0 -10000 7200 3000 7800 4200 "S" "2" ""]
 	Pin[0 0 7200 3000 7800 4200 "G" "3" ""]
 	ElementLine [-7000 -17000 -7000 -3000 1000]
@@ -1699,7 +1699,7 @@ Element["" "TO92" "Q103" "unknown" 150000 447500 -13000 -1000 1 100 ""]
 
 Element["" "TO92" "Q101" "unknown" 117500 427500 1000 -13000 0 100 ""]
 (
-	Pin[20000 0 7200 3000 7800 4200 "D" "1" "found,square,edge2"]
+	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]
@@ -1723,7 +1723,7 @@ Element["" "R025" "R102" "10k" 47500 392500 12000 -2000 0 100 ""]
 Element["" "R025" "R104" "100" 165000 387500 2000 12000 3 100 ""]
 (
 	Pin[0 0 6800 3000 7400 3800 "1" "1" "square"]
-	Pin[0 40000 6800 3000 7400 3800 "2" "2" "found"]
+	Pin[0 40000 6800 3000 7400 3800 "2" "2" ""]
 	ElementLine [5000 10000 5000 30000 2000]
 	ElementLine [-5000 30000 5000 30000 2000]
 	ElementLine [-5000 10000 -5000 30000 2000]
@@ -1799,7 +1799,7 @@ Element["" "R025" "R307" "4k7" 70000 277500 -2000 -12000 1 100 ""]
 Element["" "R025" "R306" "5M1" 135000 240000 -12000 2000 2 100 ""]
 (
 	Pin[0 0 6800 3000 7400 3800 "1" "1" "square,edge2"]
-	Pin[-40000 0 6800 3000 7400 3800 "2" "2" "warn,edge2"]
+	Pin[-40000 0 6800 3000 7400 3800 "2" "2" "edge2"]
 	ElementLine [-30000 5000 -10000 5000 2000]
 	ElementLine [-30000 -5000 -30000 5000 2000]
 	ElementLine [-30000 -5000 -10000 -5000 2000]
@@ -1983,7 +1983,7 @@ Element["" "R025" "R101" "10k" 87500 377500 -12000 2000 2 100 ""]
 
 Element["" "RCY150P" "C105" "100u" 127500 395000 -15000 -22500 1 100 ""]
 (
-	Pin[0 0 6000 3000 6600 3000 "+" "1" "found,square"]
+	Pin[0 0 6000 3000 6600 3000 "+" "1" "square"]
 	Pin[0 -15000 6000 3000 6600 3000 "-" "2" ""]
 	ElementLine [0 9500 0 13500 1000]
 	ElementLine [-2000 11500 2000 11500 1000]
@@ -2016,19 +2016,6 @@ Element["" "RCY100P" "C202" "3.3u" 330000 447500 -10000 -15000 1 100 ""]
 
 	)
 
-Element["" "R025" "R206" "6k8" 347500 452500 12000 -2000 0 100 ""]
-(
-	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]
-	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["" "R025" "R205" "10k" 240000 427500 -2000 -12000 1 100 ""]
 (
 	Pin[0 0 6800 3000 7400 3800 "1" "1" "square"]
@@ -2042,32 +2029,6 @@ Element["" "R025" "R205" "10k" 240000 427500 -2000 -12000 1 100 ""]
 
 	)
 
-Element["" "R025" "R201" "10k" 462500 417500 -12000 2000 2 100 ""]
-(
-	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]
-	ElementLine [-30000 -5000 -10000 -5000 2000]
-	ElementLine [-10000 -5000 -10000 5000 2000]
-	ElementLine [-10000 0 0 0 2000]
-	ElementLine [-40000 0 -30000 0 2000]
-
-	)
-
-Element["" "R025" "R209" "220k" 387500 422500 -12000 2000 2 100 ""]
-(
-	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]
-	ElementLine [-30000 -5000 -10000 -5000 2000]
-	ElementLine [-10000 -5000 -10000 5000 2000]
-	ElementLine [-10000 0 0 0 2000]
-	ElementLine [-40000 0 -30000 0 2000]
-
-	)
-
 Element["" "TO92" "Q202" "unknown" 300000 467500 -13000 -1000 1 100 ""]
 (
 	Pin[0 -20000 7200 3000 7800 4200 "D" "1" "square"]
@@ -2104,7 +2065,7 @@ Element["" "ACY100" "C204" "10p" 315000 477500 2800 -9500 1 100 ""]
 
 Element["" "TO92" "Q203" "unknown" 272500 447500 -13000 -1000 1 100 ""]
 (
-	Pin[0 -20000 7200 3000 7800 4200 "D" "1" "square"]
+	Pin[0 -20000 7200 3000 7800 4200 "D" "1" "found,square"]
 	Pin[0 -10000 7200 3000 7800 4200 "S" "2" ""]
 	Pin[0 0 7200 3000 7800 4200 "G" "3" ""]
 	ElementLine [-7000 -17000 -7000 -3000 1000]
@@ -2114,7 +2075,7 @@ Element["" "TO92" "Q203" "unknown" 272500 447500 -13000 -1000 1 100 ""]
 
 Element["" "TO92" "Q201" "unknown" 310000 427500 -1000 13000 2 100 ""]
 (
-	Pin[-20000 0 7200 3000 7800 4200 "D" "1" "square,edge2"]
+	Pin[-20000 0 7200 3000 7800 4200 "D" "1" "found,square,edge2"]
 	Pin[-10000 0 7200 3000 7800 4200 "S" "2" "edge2"]
 	Pin[0 0 7200 3000 7800 4200 "G" "3" "edge2"]
 	ElementLine [-17000 7000 -3000 7000 1000]
@@ -2122,49 +2083,10 @@ Element["" "TO92" "Q201" "unknown" 310000 427500 -1000 13000 2 100 ""]
 
 	)
 
-Element["" "R025" "R207" "220k" 347500 437500 12000 -2000 0 100 ""]
-(
-	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]
-	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["" "R025" "R208" "10M" 347500 467500 12000 -2000 0 100 ""]
-(
-	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]
-	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["" "R025" "R203" "5.1M" 437500 405000 -2000 -12000 1 100 ""]
-(
-	Pin[0 0 6800 3000 7400 3800 "1" "1" "square"]
-	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["" "R025" "R204" "100" 255000 387500 2000 12000 3 100 ""]
 (
 	Pin[0 0 6800 3000 7400 3800 "1" "1" "square"]
-	Pin[0 40000 6800 3000 7400 3800 "2" "2" ""]
+	Pin[0 40000 6800 3000 7400 3800 "2" "2" "found"]
 	ElementLine [5000 10000 5000 30000 2000]
 	ElementLine [-5000 30000 5000 30000 2000]
 	ElementLine [-5000 10000 -5000 30000 2000]
@@ -2196,22 +2118,9 @@ Element["" "RCY100P" "C201" "10u" 235000 457500 -10000 -15000 1 100 ""]
 
 	)
 
-Element["" "R025" "R202" "10k" 422500 365000 2000 12000 3 100 ""]
-(
-	Pin[0 0 6800 3000 7400 3800 "1" "1" "square"]
-	Pin[0 40000 6800 3000 7400 3800 "2" "2" ""]
-	ElementLine [5000 10000 5000 30000 2000]
-	ElementLine [-5000 30000 5000 30000 2000]
-	ElementLine [-5000 10000 -5000 30000 2000]
-	ElementLine [-5000 10000 5000 10000 2000]
-	ElementLine [0 0 0 10000 2000]
-	ElementLine [0 30000 0 40000 2000]
-
-	)
-
 Element["" "RCY150P" "C205" "100u" 300000 395000 -15000 -22500 1 100 ""]
 (
-	Pin[0 0 6000 3000 6600 3000 "+" "1" "square"]
+	Pin[0 0 6000 3000 6600 3000 "+" "1" "found,square"]
 	Pin[0 -15000 6000 3000 6600 3000 "-" "2" ""]
 	ElementLine [0 9500 0 13500 1000]
 	ElementLine [-2000 11500 2000 11500 1000]
@@ -2219,6 +2128,97 @@ Element["" "RCY150P" "C205" "100u" 300000 395000 -15000 -22500 1 100 ""]
 	ElementArc [0 -7500 15000 15000 90 360 1000]
 
 	)
+
+Element["" "R025" "R203" "5.1M" 330000 407500 12000 -2000 0 100 ""]
+(
+	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]
+	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["" "R025" "R206" "6k8" 350000 452500 12000 -2000 0 100 ""]
+(
+	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]
+	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["" "R025" "R209" "220k" 390000 422500 -12000 2000 2 100 ""]
+(
+	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]
+	ElementLine [-30000 -5000 -10000 -5000 2000]
+	ElementLine [-10000 -5000 -10000 5000 2000]
+	ElementLine [-10000 0 0 0 2000]
+	ElementLine [-40000 0 -30000 0 2000]
+
+	)
+
+Element["" "R025" "R207" "220k" 350000 437500 12000 -2000 0 100 ""]
+(
+	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]
+	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["" "R025" "R208" "10M" 350000 467500 12000 -2000 0 100 ""]
+(
+	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]
+	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["" "R025" "R202" "10k" 390000 392500 -12000 2000 2 100 ""]
+(
+	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]
+	ElementLine [-30000 -5000 -10000 -5000 2000]
+	ElementLine [-10000 -5000 -10000 5000 2000]
+	ElementLine [-10000 0 0 0 2000]
+	ElementLine [-40000 0 -30000 0 2000]
+
+	)
+
+Element["" "R025" "R201" "10k" 350000 377500 12000 -2000 0 100 ""]
+(
+	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]
+	ElementLine [10000 5000 30000 5000 2000]
+	ElementLine [10000 -5000 10000 5000 2000]
+	ElementLine [0 0 10000 0 2000]
+	ElementLine [30000 0 40000 0 2000]
+
+	)
 Rat[190000 447500 5 235000 447500 5  ""]
 Rat[235000 447500 5 240000 387500 5  ""]
 Rat[240000 387500 5 180000 387500 5  ""]
@@ -2231,9 +2231,6 @@ Rat[47500 452500 5 47500 467500 5  ""]
 Rat[47500 467500 5 107500 477500 5  ""]
 Rat[235000 447500 5 315000 477500 5  ""]
 Rat[315000 477500 5 387500 467500 5  ""]
-Rat[387500 467500 5 387500 452500 5  ""]
-Rat[387500 452500 5 387500 437500 5  ""]
-Rat[387500 437500 5 422500 365000 5  ""]
 Rat[47500 392500 5 70000 277500 5  ""]
 Rat[70000 277500 5 55000 237500 5  ""]
 Rat[55000 237500 5 85000 237500 5  ""]
@@ -2245,18 +2242,18 @@ Rat[100000 237500 5 155000 257500 5  ""]
 Rat[155000 257500 5 203500 225000 5  ""]
 Rat[203500 225000 5 173100 182100 5  ""]
 Rat[60000 142500 5 41500 52500 5  ""]
-Rat[422500 365000 5 402500 232500 5  ""]
-Rat[402500 232500 5 397500 182500 5  ""]
-Rat[397500 182500 5 365000 122500 5  ""]
-Rat[365000 122500 5 395000 70000 5  ""]
-Rat[395000 70000 5 405000 57500 5  ""]
-Rat[405000 57500 5 380000 42500 5  ""]
+Rat[173100 182100 5 186500 45000 5  ""]
+Rat[186500 45000 5 206500 15000 5  ""]
+Rat[206500 15000 5 226500 30000 5  ""]
+Rat[226500 30000 5 255000 60000 5  ""]
+Rat[255000 60000 5 380000 42500 5  ""]
+Rat[380000 42500 5 405000 57500 5  ""]
+Rat[405000 57500 5 395000 70000 5  ""]
+Rat[395000 70000 5 365000 122500 5  ""]
 Rat[405000 57500 5 465000 31000 5  ""]
 Rat[465000 31000 5 507500 51500 5  ""]
-Rat[380000 42500 5 255000 60000 5  ""]
-Rat[255000 60000 5 226500 30000 5  ""]
-Rat[226500 30000 5 206500 15000 5  ""]
-Rat[206500 15000 5 186500 45000 5  ""]
+Rat[365000 122500 5 397500 182500 5  ""]
+Rat[397500 182500 5 402500 232500 5  ""]
 Rat[127500 185000 5 115000 257500 5  ""]
 Rat[127500 185000 5 41500 72500 5  ""]
 Rat[510000 75000 5 420000 95000 5  ""]
@@ -2302,22 +2299,19 @@ Rat[127500 395000 5 137500 427500 5  ""]
 Rat[137500 427500 5 150000 427500 5  ""]
 Rat[150000 427500 5 165000 427500 5  ""]
 Rat[127500 457500 5 87500 452500 5  ""]
-Rat[235000 457500 5 422500 405000 5  ""]
-Rat[422500 405000 5 462500 417500 5  ""]
-Rat[422500 405000 5 437500 365000 5  ""]
+Rat[235000 457500 5 347500 392500 5  ""]
 Rat[330000 447500 5 347500 437500 5  ""]
-Rat[347500 437500 5 347500 422500 5  ""]
 Rat[330000 447500 5 300000 447500 5  ""]
 Rat[300000 447500 5 300000 427500 5  ""]
 Rat[300000 447500 5 272500 447500 5  ""]
 Rat[330000 437500 5 310000 427500 5  ""]
-Rat[330000 437500 5 437500 405000 5  ""]
+Rat[310000 427500 5 330000 407500 5  ""]
 Rat[275000 467500 5 300000 467500 5  ""]
 Rat[300000 467500 5 315000 467500 5  ""]
 Rat[315000 467500 5 347500 467500 5  ""]
-Rat[300000 395000 5 290000 427500 5  ""]
-Rat[290000 427500 5 272500 427500 5  ""]
-Rat[272500 427500 5 255000 427500 5  ""]
+Rat[300000 395000 5 290000 427500 5  "found"]
+Rat[290000 427500 5 272500 427500 5  "found"]
+Rat[272500 427500 5 255000 427500 5  "found"]
 Rat[300000 457500 5 347500 452500 5  ""]
 Rat[105000 182500 5 173100 204000 5  ""]
 Rat[95000 182500 5 72500 210000 5  ""]
@@ -2404,8 +2398,7 @@ Rat[95000 240000 5 47500 377500 5  ""]
 Rat[47500 377500 5 47500 422500 5  ""]
 Rat[47500 377500 5 165000 387500 5  ""]
 Rat[165000 387500 5 255000 387500 5  ""]
-Rat[255000 387500 5 387500 422500 5  ""]
-Rat[387500 422500 5 422500 417500 5  ""]
+Rat[255000 387500 5 387500 377500 5  ""]
 Rat[532500 232500 5 420000 105000 5  ""]
 Rat[417500 105000 5 305000 215000 5  ""]
 Rat[305000 215000 5 290000 215000 5  ""]