add coupling caps to return; remove from mixer

1 files changed, 190 insertions, 148 deletions

diff --git a/gschem/crossover.sch b/gschem/crossover.sch
index ac3a690..8672d2f 100644
--- a/gschem/crossover.sch
+++ b/gschem/crossover.sch
@@ -103,7 +103,7 @@ C 48800 37500 1 180 0 capacitor-1.sym
 {
 T 48600 36800 5 10 0 0 180 0 1
 device=CAPACITOR
-T 48200 37600 5 10 1 1 180 0 1
+T 48800 37800 5 10 1 1 180 0 1
 refdes=C406
 T 48600 36600 5 10 0 0 180 0 1
 symversion=0.1
@@ -149,9 +149,9 @@ C 47900 41300 1 0 0 resistor-2.sym
 {
 T 48300 41650 5 10 0 0 0 0 1
 device=RESISTOR
-T 48000 41600 5 10 1 1 0 0 1
+T 48200 41900 5 10 1 1 0 0 1
 refdes=R404
-T 48400 41600 5 10 1 1 0 0 1
+T 48300 41700 5 10 1 1 0 0 1
 value=6k8
 T 47900 41300 5 10 0 1 0 0 1
 footprint=R025
@@ -160,9 +160,9 @@ C 47900 40900 1 0 0 resistor-2.sym
 {
 T 48300 41250 5 10 0 0 0 0 1
 device=RESISTOR
-T 48000 40700 5 10 1 1 0 0 1
+T 48200 40700 5 10 1 1 0 0 1
 refdes=R405
-T 48400 40700 5 10 1 1 0 0 1
+T 48300 40500 5 10 1 1 0 0 1
 value=10k
 T 47900 40900 5 10 0 1 0 0 1
 footprint=R025
@@ -173,7 +173,7 @@ T 48300 37150 5 10 0 0 0 0 1
 device=RESISTOR
 T 48000 36600 5 10 1 1 0 0 1
 refdes=R406
-T 48500 36600 5 10 1 1 0 0 1
+T 48000 36400 5 10 1 1 0 0 1
 value=10k
 T 47900 36800 5 10 0 1 0 0 1
 footprint=R025
@@ -258,11 +258,11 @@ C 45600 41500 1 0 0 capacitor-1.sym
 {
 T 45800 42200 5 10 0 0 0 0 1
 device=CAPACITOR
-T 45700 41900 5 10 1 1 0 0 1
+T 45900 42200 5 10 1 1 0 0 1
 refdes=C407
 T 45800 42400 5 10 0 0 0 0 1
 symversion=0.1
-T 46100 41900 5 10 1 1 0 0 1
+T 45900 42000 5 10 1 1 0 0 1
 value=100n
 T 45600 41500 5 10 0 1 0 0 1
 footprint=CK06_type_capacitor
@@ -323,225 +323,225 @@ N 45000 42500 45200 42500 4
 N 45200 42500 45200 41200 4
 N 45000 37900 45200 37900 4
 N 45200 37900 45200 37100 4
-N 55200 46700 55800 46700 4
-N 55400 42800 55800 42800 4
-C 52300 44900 1 0 0 input-2.sym
+N 53000 47000 53600 47000 4
+N 53200 43100 53600 43100 4
+C 50100 45200 1 0 0 input-2.sym
 {
-T 52300 44600 5 10 1 0 0 0 1
+T 50100 44900 5 10 1 0 0 0 1
 net=XOVER_OUT_2:1
-T 52900 45600 5 10 0 0 0 0 1
+T 50700 45900 5 10 0 0 0 0 1
 device=none
-T 52800 45000 5 10 1 1 0 7 1
+T 50600 45300 5 10 1 1 0 7 1
 value=HIGH
 }
-C 52300 46000 1 0 0 input-2.sym
+C 50100 46300 1 0 0 input-2.sym
 {
-T 52300 45800 5 10 1 0 0 0 1
+T 50100 46100 5 10 1 0 0 0 1
 net=XOVER_OUT_1:1
-T 52900 46700 5 10 0 0 0 0 1
+T 50700 47000 5 10 0 0 0 0 1
 device=none
-T 52800 46100 5 10 1 1 0 7 1
+T 50600 46400 5 10 1 1 0 7 1
 value=LOW
 }
 T 41900 33200 9 10 1 0 0 0 1
-maybe reduce to 1k6 ~ 2k
+TODO: maybe reduce to 1k6 ~ 2k
 T 55800 33400 9 16 1 0 0 0 1
 Crossover and Bypass
 T 45000 34300 9 10 1 0 0 0 1
 f = 1 / (2pi * RC) =~ 417Hz
-C 57300 42100 1 270 0 resistor-2.sym
+C 55100 42400 1 270 0 resistor-2.sym
 {
-T 57650 41700 5 10 0 0 270 0 1
+T 55450 42000 5 10 0 0 270 0 1
 device=RESISTOR
-T 57600 41600 5 10 1 1 0 0 1
+T 55400 41900 5 10 1 1 0 0 1
 refdes=R418
-T 57600 41400 5 10 1 1 0 0 1
+T 55400 41700 5 10 1 1 0 0 1
 value=22k
-T 57300 42100 5 10 0 1 0 0 1
+T 55100 42400 5 10 0 1 0 0 1
 footprint=R025
 }
-N 57400 42300 57400 42100 4
-C 57800 40200 1 0 0 vcc-minus-1.sym
-C 57100 40200 1 0 0 vcc-minus-1.sym
-N 57400 40800 57400 41200 4
-C 57900 42900 1 180 0 resistor-variable-2.sym
+N 55200 42600 55200 42400 4
+C 55600 40500 1 0 0 vcc-minus-1.sym
+C 54900 40500 1 0 0 vcc-minus-1.sym
+N 55200 41100 55200 41500 4
+C 55700 43200 1 180 0 resistor-variable-2.sym
 {
-T 57550 43400 5 10 1 1 180 0 1
+T 55350 43700 5 10 1 1 180 0 1
 refdes=R419
-T 57100 42000 5 10 0 1 180 0 1
+T 54900 42300 5 10 0 1 180 0 1
 device=VARIABLE_RESISTOR
-T 57200 43000 5 10 1 1 0 0 1
+T 55000 43300 5 10 1 1 0 0 1
 value=100k?
-T 57900 42900 5 10 0 1 0 0 1
+T 55700 43200 5 10 0 1 0 0 1
 footprint=BOURNS_3296w
 }
-N 57900 42800 58100 42800 4
-N 58100 42800 58100 40800 4
-N 57400 42200 59300 42200 4
-T 57600 41100 9 10 1 0 0 0 1
+N 55700 43100 55900 43100 4
+N 55900 43100 55900 41100 4
+N 55200 42500 56800 42500 4
+T 53800 41700 9 10 1 0 0 0 1
 taper resistor
-C 57300 46000 1 270 0 resistor-2.sym
+C 55100 46300 1 270 0 resistor-2.sym
 {
-T 57650 45600 5 10 0 0 270 0 1
+T 55450 45900 5 10 0 0 270 0 1
 device=RESISTOR
-T 57600 45500 5 10 1 1 0 0 1
+T 55400 45800 5 10 1 1 0 0 1
 refdes=R420
-T 57600 45300 5 10 1 1 0 0 1
+T 55400 45600 5 10 1 1 0 0 1
 value=22k
-T 57300 46000 5 10 0 1 0 0 1
+T 55100 46300 5 10 0 1 0 0 1
 footprint=R025
 }
-N 57400 46200 57400 46000 4
-C 57800 44100 1 0 0 vcc-minus-1.sym
-C 57100 44100 1 0 0 vcc-minus-1.sym
-N 57400 44700 57400 45100 4
-C 57900 46800 1 180 0 resistor-variable-2.sym
+N 55200 46500 55200 46300 4
+C 55600 44400 1 0 0 vcc-minus-1.sym
+C 54900 44400 1 0 0 vcc-minus-1.sym
+N 55200 45000 55200 45400 4
+C 55700 47100 1 180 0 resistor-variable-2.sym
 {
-T 57550 47300 5 10 1 1 180 0 1
+T 55350 47600 5 10 1 1 180 0 1
 refdes=R421
-T 57100 45900 5 10 0 1 180 0 1
+T 54900 46200 5 10 0 1 180 0 1
 device=VARIABLE_RESISTOR
-T 57200 46900 5 10 1 1 0 0 1
+T 55000 47200 5 10 1 1 0 0 1
 value=100k?
-T 57900 46800 5 10 0 1 0 0 1
+T 55700 47100 5 10 0 1 0 0 1
 footprint=BOURNS_3296w
 }
-N 57900 46700 58100 46700 4
-N 58100 46700 58100 44700 4
-N 57400 46100 59300 46100 4
-C 61900 46200 1 180 0 input-2.sym
+N 55700 47000 55900 47000 4
+N 55900 47000 55900 45000 4
+N 55200 46400 56800 46400 4
+C 60900 46500 1 180 0 input-2.sym
 {
-T 62300 45900 5 10 1 0 180 0 1
+T 61300 46200 5 10 1 0 180 0 1
 net=RETURN_HIGH:1
-T 61300 45500 5 10 0 0 180 0 1
+T 60300 45800 5 10 0 0 180 0 1
 device=none
-T 60500 46400 5 10 1 1 180 7 1
+T 59500 46700 5 10 1 1 180 7 1
 value=Return HIGH / Full
 }
-T 57600 45000 9 10 1 0 0 0 1
+T 53900 45700 9 10 1 0 0 0 1
 taper resistor
-C 55800 42600 1 0 0 capacitor-4.sym
+C 53600 42900 1 0 0 capacitor-4.sym
 {
-T 56000 43700 5 10 0 0 0 0 1
+T 53800 44000 5 10 0 0 0 0 1
 device=POLARIZED_CAPACITOR
-T 56000 43100 5 10 1 1 0 0 1
+T 53800 43400 5 10 1 1 0 0 1
 refdes=C409
-T 56000 43300 5 10 0 0 0 0 1
+T 53800 43600 5 10 0 0 0 0 1
 symversion=0.1
-T 55800 42600 5 10 1 1 0 0 1
+T 53600 42900 5 10 1 1 0 0 1
 value=10u
-T 55800 42600 5 10 0 1 0 0 1
+T 53600 42900 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-N 56700 42800 57000 42800 4
-C 55800 46500 1 0 0 capacitor-4.sym
+N 54500 43100 54800 43100 4
+C 53600 46800 1 0 0 capacitor-4.sym
 {
-T 56000 47600 5 10 0 0 0 0 1
+T 53800 47900 5 10 0 0 0 0 1
 device=POLARIZED_CAPACITOR
-T 56000 47000 5 10 1 1 0 0 1
+T 53800 47300 5 10 1 1 0 0 1
 refdes=C410
-T 56000 47200 5 10 0 0 0 0 1
+T 53800 47500 5 10 0 0 0 0 1
 symversion=0.1
-T 55800 46500 5 10 1 1 0 0 1
+T 53600 46800 5 10 1 1 0 0 1
 value=10u
-T 55800 46500 5 10 0 1 0 0 1
+T 53600 46800 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-N 56700 46700 57000 46700 4
-T 50800 43200 9 10 1 0 0 0 4
+N 54500 47000 54800 47000 4
+T 48600 43500 9 10 1 0 0 0 4
 When the cross-over is disabled, the two
 send outputs each carry the full signal.
 S401, S402, S403 are all part of the same
 triple-pole, double throw stomp switch.
-C 47600 45800 1 0 0 input-2.sym
+C 45400 46100 1 0 0 input-2.sym
 {
-T 47500 45500 5 10 1 0 0 0 1
+T 45300 45800 5 10 1 0 0 0 1
 net=PREAMP_2:1
-T 48200 46500 5 10 0 0 0 0 1
+T 46000 46800 5 10 0 0 0 0 1
 device=none
-T 48100 45900 5 10 1 1 0 7 1
+T 45900 46200 5 10 1 1 0 7 1
 value=BASS
 }
-C 51900 45800 1 180 0 input-2.sym
+C 49700 46100 1 180 0 input-2.sym
 {
-T 51900 45200 5 10 1 0 180 0 1
+T 49700 45500 5 10 1 0 180 0 1
 net=XOVER:1
-T 51300 45100 5 10 0 0 180 0 1
+T 49100 45400 5 10 0 0 180 0 1
 device=none
-T 50700 45400 5 10 1 1 180 7 1
+T 48500 45700 5 10 1 1 180 7 1
 value=XOVER
 }
-C 49400 45700 1 0 0 switch-spdt-1.sym
+C 47200 46000 1 0 0 switch-spdt-1.sym
 {
-T 49800 46500 5 10 0 0 0 0 1
+T 47600 46800 5 10 0 0 0 0 1
 device=SPDT
-T 49800 46300 5 10 1 1 0 0 1
+T 47600 46600 5 10 1 1 0 0 1
 refdes=S401
-T 49400 45700 5 10 0 0 0 0 1
+T 47200 46000 5 10 0 0 0 0 1
 footprint=CONNECTOR 3 1
 }
-N 49400 45900 49000 45900 4
-N 50300 46100 52000 46100 4
-N 50300 45700 50500 45700 4
+N 47200 46200 46800 46200 4
+N 48100 46400 49800 46400 4
+N 48100 46000 48300 46000 4
 T 51900 35000 9 10 1 0 0 0 3
 This dual pot is wired to blend the two signals.
 As the resistance of one pot increases, the other
 pot's resistance decreases. 
-C 60400 46400 1 90 0 stereo_jack-1.sym
+C 57900 46700 1 90 0 stereo_jack-1.sym
 {
-T 58700 46695 5 10 1 1 90 0 1
+T 56200 46995 5 10 1 1 90 0 1
 refdes=K402
-T 58100 46695 5 10 0 2 90 0 1
+T 55600 46995 5 10 0 2 90 0 1
 device=CONNECTOR
-T 60400 46400 5 10 0 0 0 0 1
+T 57900 46700 5 10 0 0 0 0 1
 graphical=1
 }
-C 60400 42400 1 90 0 stereo_jack-1.sym
+C 57900 42700 1 90 0 stereo_jack-1.sym
 {
-T 58700 42695 5 10 1 1 90 0 1
+T 56200 42995 5 10 1 1 90 0 1
 refdes=K401
-T 58100 42695 5 10 0 0 90 0 1
+T 55600 42995 5 10 0 0 90 0 1
 device=CONNECTOR
-T 60400 42400 5 10 0 0 0 0 1
+T 57900 42700 5 10 0 0 0 0 1
 graphical=1
 }
-N 59000 42200 59000 42400 4
-N 59300 42400 59600 42400 4
-N 59900 42400 59900 42200 4
-N 59600 42200 60500 42200 4
-C 61900 42300 1 180 0 input-2.sym
+N 56500 42500 56500 42700 4
+N 56800 42700 57100 42700 4
+N 57400 42700 57400 42500 4
+N 57100 42500 58100 42500 4
+C 61000 42600 1 180 0 input-2.sym
 {
-T 62300 42000 5 10 1 0 180 0 1
+T 61400 42300 5 10 1 0 180 0 1
 net=RETURN_LOW:1
-T 61300 41600 5 10 0 0 180 0 1
+T 60400 41900 5 10 0 0 180 0 1
 device=none
-T 60500 42500 5 10 1 1 180 7 1
+T 59600 42800 5 10 1 1 180 7 1
 value=Return LOW / Full
 }
-C 59900 41100 1 0 0 vcc-minus-1.sym
-N 60200 41700 60200 42400 4
-C 59900 45300 1 0 0 vcc-minus-1.sym
-N 60200 45900 60200 46400 4
-N 59900 46400 59900 46100 4
-N 59600 46100 60500 46100 4
-N 59000 46100 59000 46400 4
-N 59300 46400 59600 46400 4
-C 59800 44400 1 90 0 connector2-1.sym
-{
-T 58800 44600 5 10 0 0 90 0 1
+C 57400 41400 1 0 0 vcc-minus-1.sym
+N 57700 42000 57700 42700 4
+C 57400 45600 1 0 0 vcc-minus-1.sym
+N 57700 46200 57700 46700 4
+N 57400 46700 57400 46400 4
+N 57100 46400 58200 46400 4
+N 56500 46400 56500 46700 4
+N 56800 46700 57100 46700 4
+C 57300 44700 1 90 0 connector2-1.sym
+{
+T 56300 44900 5 10 0 0 90 0 1
 device=CONNECTOR_2
-T 59000 44400 5 10 1 1 90 0 1
+T 56500 44700 5 10 1 1 90 0 1
 refdes=CONN402
-T 59800 44400 5 10 0 0 0 0 1
+T 57300 44700 5 10 0 0 0 0 1
 footprint=CONNECTOR 2 1
 }
-C 59800 40500 1 90 0 connector2-1.sym
+C 57300 40800 1 90 0 connector2-1.sym
 {
-T 58800 40700 5 10 0 0 90 0 1
+T 56300 41000 5 10 0 0 90 0 1
 device=CONNECTOR_2
-T 59000 40500 5 10 1 1 90 0 1
+T 56500 40800 5 10 1 1 90 0 1
 refdes=CONN401
-T 59800 40500 5 10 0 0 0 0 1
+T 57300 40800 5 10 0 0 0 0 1
 footprint=CONNECTOR 2 1
 }
 C 51100 37300 1 0 0 input-2.sym
@@ -621,7 +621,7 @@ N 52500 37400 55400 37400 4
 N 54000 38300 54000 38700 4
 N 54000 38700 54200 38700 4
 N 55100 38700 55400 38700 4
-N 55700 37400 56500 37400 4
+N 55700 37400 58400 37400 4
 C 60900 36800 1 180 0 input-2.sym
 {
 T 61300 36500 5 10 1 0 180 0 1
@@ -631,33 +631,33 @@ device=none
 T 60400 36700 5 10 1 1 180 7 1
 value=Blended bass signal
 }
-C 55200 46500 1 0 1 switch-spdt-1.sym
+C 53000 46800 1 0 1 switch-spdt-1.sym
 {
-T 54800 47300 5 10 0 0 0 6 1
+T 52600 47600 5 10 0 0 0 6 1
 device=SPDT
-T 54800 47100 5 10 1 1 0 6 1
+T 52600 47400 5 10 1 1 0 6 1
 refdes=S402
-T 55200 46500 5 10 0 0 0 6 1
+T 53000 46800 5 10 0 0 0 6 1
 footprint=CONNECTOR 3 1
 }
-C 55200 45000 1 0 1 switch-spdt-1.sym
+C 53000 45300 1 0 1 switch-spdt-1.sym
 {
-T 54800 45800 5 10 0 0 0 6 1
+T 52600 46100 5 10 0 0 0 6 1
 device=SPDT
-T 54800 45600 5 10 1 1 0 6 1
+T 52600 45900 5 10 1 1 0 6 1
 refdes=S403
-T 55200 45000 5 10 0 0 0 6 1
+T 53000 45300 5 10 0 0 0 6 1
 footprint=CONNECTOR 3 1
 }
-N 53700 45000 54300 45000 4
-N 52000 45400 52000 46900 4
-N 52000 45400 54300 45400 4
-N 52000 46900 54300 46900 4
-N 53700 46100 54200 46100 4
-N 54300 46500 54200 46500 4
-N 54200 46500 54200 46100 4
-N 55200 45200 55400 45200 4
-N 55400 45200 55400 42800 4
+N 51500 45300 52100 45300 4
+N 49800 45700 49800 47200 4
+N 49800 45700 52100 45700 4
+N 49800 47200 52100 47200 4
+N 51500 46400 52000 46400 4
+N 52100 46800 52000 46800 4
+N 52000 46800 52000 46400 4
+N 53000 45500 53200 45500 4
+N 53200 45500 53200 43100 4
 C 56900 35500 1 0 0 connector1-2.sym
 {
 T 57600 36400 5 10 1 1 0 6 1
@@ -670,20 +670,19 @@ footprint=CONNECTOR 1 1
 N 56900 35900 56300 35900 4
 N 56300 35900 56300 37400 4
 B 50000 34600 12200 5000 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
-C 56500 37200 1 0 0 capacitor-4.sym
+C 58100 42300 1 0 0 capacitor-4.sym
 {
-T 56700 38300 5 10 0 0 0 0 1
+T 58300 43400 5 10 0 0 0 0 1
 device=POLARIZED_CAPACITOR
-T 56700 37700 5 10 1 1 0 0 1
+T 58300 42800 5 10 1 1 0 0 1
 refdes=C411
-T 56700 37900 5 10 0 0 0 0 1
+T 58300 43000 5 10 0 0 0 0 1
 symversion=0.1
-T 56500 37200 5 10 1 1 0 0 1
+T 58100 42300 5 10 1 1 0 0 1
 value=10u
-T 56500 37200 5 10 0 1 0 0 1
+T 58100 42300 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-N 57400 37400 58400 37400 4
 C 57800 35600 1 0 0 gnd-1.sym
 C 58700 38400 1 0 0 vcc-2.sym
 N 58900 38400 58900 37900 4
@@ -708,7 +707,7 @@ device=RESISTOR
 T 59100 36100 5 10 1 1 0 0 1
 refdes=R431
 T 59100 35900 5 10 1 1 0 0 1
-value=3k3
+value=4k7
 T 58800 36600 5 10 0 1 0 0 1
 footprint=R025
 }
@@ -724,3 +723,46 @@ refdes=Q401
 T 58400 36900 5 10 0 0 0 0 1
 footprint=TO92_CBE
 }
+N 59600 42500 59000 42500 4
+C 58200 46200 1 0 0 capacitor-4.sym
+{
+T 58400 47300 5 10 0 0 0 0 1
+device=POLARIZED_CAPACITOR
+T 58400 46700 5 10 1 1 0 0 1
+refdes=C412
+T 58400 46900 5 10 0 0 0 0 1
+symversion=0.1
+T 58200 46200 5 10 1 1 0 0 1
+value=10u
+T 58200 46200 5 10 0 1 0 0 1
+footprint=RCY100P
+}
+N 59500 46400 59100 46400 4
+C 59200 42300 1 270 0 resistor-2.sym
+{
+T 59550 41900 5 10 0 0 270 0 1
+device=RESISTOR
+T 59500 41800 5 10 1 1 0 0 1
+refdes=R425
+T 59500 41600 5 10 1 1 0 0 1
+value=100k
+T 59200 42300 5 10 0 1 0 0 1
+footprint=R025
+}
+N 59300 42500 59300 42300 4
+C 59000 40500 1 0 0 vcc-minus-1.sym
+N 59300 41100 59300 41400 4
+C 59200 46100 1 270 0 resistor-2.sym
+{
+T 59550 45700 5 10 0 0 270 0 1
+device=RESISTOR
+T 59500 45600 5 10 1 1 0 0 1
+refdes=R426
+T 59500 45400 5 10 1 1 0 0 1
+value=100k
+T 59200 46100 5 10 0 1 0 0 1
+footprint=R025
+}
+C 59000 44300 1 0 0 vcc-minus-1.sym
+N 59300 44900 59300 45200 4
+N 59300 46400 59300 46100 4