move power rails filtering to power supply

2 files changed, 135 insertions, 180 deletions

diff --git a/gschem/outputs.sch b/gschem/outputs.sch
index 0d7b63a..3df421a 100644
--- a/gschem/outputs.sch
+++ b/gschem/outputs.sch
@@ -194,7 +194,7 @@ symversion=0.1
 T 61500 45400 5 10 0 0 0 0 1
 footprint=RCY150P
 T 61900 44500 5 10 1 1 0 0 1
-value=100uF
+value=220uF
 }
 C 64500 45400 1 270 0 capacitor-4.sym
 {
@@ -207,7 +207,7 @@ symversion=0.1
 T 64500 45400 5 10 0 0 0 0 1
 footprint=RCY150P
 T 64900 44500 5 10 1 1 0 0 1
-value=100uF
+value=220uF
 }
 N 64700 45700 64700 45400 4
 C 61400 43800 1 0 0 vcc-minus-1.sym
@@ -272,16 +272,28 @@ value=47nF
 C 62400 43800 1 0 0 vcc-minus-1.sym
 N 62700 44400 62700 44500 4
 N 62700 45400 62700 45700 4
-C 60700 46300 1 180 0 connector2-2.sym
+C 60600 46300 1 180 0 connector2-2.sym
 {
-T 60000 45000 5 10 1 1 180 6 1
+T 59900 45000 5 10 1 1 180 6 1
 refdes=CONN503
-T 60400 45050 5 10 0 0 180 0 1
+T 60300 45050 5 10 0 0 180 0 1
 device=CONNECTOR_2
-T 60400 44850 5 10 0 0 180 0 1
+T 60300 44850 5 10 0 0 180 0 1
 footprint=CONNECTOR 2 1
 }
-N 60700 45900 61700 45900 4
 C 60700 44400 1 0 0 vcc-minus-1.sym
-N 60700 45500 61000 45500 4
+N 60600 45500 61000 45500 4
 N 61000 45500 61000 45000 4
+C 60700 45800 1 0 0 resistor-2.sym
+{
+T 61100 46150 5 10 0 0 0 0 1
+device=RESISTOR
+T 61400 46500 5 10 1 1 180 0 1
+refdes=R520
+T 61400 46300 5 10 1 1 180 0 1
+value=100
+T 60700 45800 5 10 0 1 90 0 1
+footprint=R025
+}
+N 60600 45900 60700 45900 4
+N 61600 45900 61700 45900 4
diff --git a/gschem/preamps.sch b/gschem/preamps.sch
index c59e523..b2eaf01 100644
--- a/gschem/preamps.sch
+++ b/gschem/preamps.sch
@@ -1,15 +1,15 @@
 v 20110115 2
-C 44300 49800 1 90 0 capacitor-4.sym
+C 44300 49500 1 90 0 capacitor-4.sym
 {
-T 43200 50000 5 10 0 0 90 0 1
+T 43200 49700 5 10 0 0 90 0 1
 device=POLARIZED_CAPACITOR
-T 43800 50500 5 10 1 1 180 0 1
+T 43800 50200 5 10 1 1 180 0 1
 refdes=C102
-T 43600 50000 5 10 0 0 90 0 1
+T 43600 49700 5 10 0 0 90 0 1
 symversion=0.1
-T 43400 50100 5 10 1 1 0 0 1
+T 43400 49800 5 10 1 1 0 0 1
 value=3.3u
-T 44300 49800 5 10 0 1 0 0 1
+T 44300 49500 5 10 0 1 0 0 1
 footprint=RCY100P
 }
 C 41600 48000 1 0 0 capacitor-1.sym
@@ -38,19 +38,19 @@ value=10p
 T 44100 46800 5 10 0 0 0 0 1
 footprint=ACY100
 }
-C 44400 51000 1 0 0 JFET_N-Channel-1.sym
+C 44400 50500 1 0 0 JFET_N-Channel-1.sym
 {
-T 44750 51800 5 10 1 1 0 6 1
+T 44750 51300 5 10 1 1 0 6 1
 model=J201
-T 44400 53050 5 10 0 0 0 0 1
+T 44400 52550 5 10 0 0 0 0 1
 device=JFET N-Channel
-T 44400 51000 5 10 1 1 0 0 1
+T 44400 50500 5 10 1 1 0 0 1
 refdes=Q101
-T 44400 51000 5 10 0 1 0 0 1
+T 44400 50500 5 10 0 1 0 0 1
 footprint=TO92
 }
-N 42300 51200 44400 51200 4
-N 44100 50700 44100 51200 4
+N 42300 50700 44400 50700 4
+N 44100 50400 44100 50700 4
 C 44400 48000 1 0 0 JFET_N-Channel-1.sym
 {
 T 44750 48800 5 10 1 1 0 6 1
@@ -73,38 +73,14 @@ refdes=Q103
 T 46100 49000 5 10 0 1 0 0 1
 footprint=TO92
 }
-N 44800 51000 44800 49200 4
+N 44800 50500 44800 49200 4
 N 44100 49200 46100 49200 4
-N 44100 49200 44100 49800 4
+N 44100 49200 44100 49500 4
 N 44800 49200 44800 48800 4
-C 45500 53100 1 270 0 resistor-2.sym
-{
-T 45850 52700 5 10 0 0 270 0 1
-device=RESISTOR
-T 45800 52700 5 10 1 1 0 0 1
-refdes=R104
-T 45800 52500 5 10 1 1 0 0 1
-value=100
-T 45500 53100 5 10 0 1 0 0 1
-footprint=R025
-}
-C 47000 52100 1 180 1 capacitor-4.sym
-{
-T 47200 51000 5 10 0 0 180 6 1
-device=POLARIZED_CAPACITOR
-T 47300 52300 5 10 1 1 180 6 1
-refdes=C105
-T 47200 51400 5 10 0 0 180 6 1
-symversion=0.1
-T 47200 51500 5 10 1 1 0 0 1
-value=100u
-T 47000 52100 5 10 0 2 0 0 1
-footprint=RCY150P
-}
-N 44800 51800 44800 51900 4
-N 44800 51900 47000 51900 4
-N 45600 52200 45600 51900 4
-N 46500 49800 46500 51900 4
+N 44800 51300 44800 51400 4
+N 44800 51400 46500 51400 4
+N 45600 51700 45600 51400 4
+N 46500 49800 46500 51400 4
 C 46400 47800 1 270 0 resistor-2.sym
 {
 T 46750 47400 5 10 0 0 270 0 1
@@ -165,14 +141,11 @@ T 40200 48200 5 10 1 1 0 7 1
 value=BASS
 }
 N 41100 48200 41600 48200 4
-C 45400 53100 1 0 0 vcc-2.sym
+C 45400 51700 1 0 0 vcc-2.sym
 C 42700 46200 1 0 0 vcc-minus-1.sym
 C 43600 46200 1 0 0 vcc-minus-1.sym
 C 44500 46200 1 0 0 vcc-minus-1.sym
 C 46200 46200 1 0 0 vcc-minus-1.sym
-C 47800 50700 1 0 0 vcc-minus-1.sym
-N 47900 51900 48100 51900 4
-N 48100 51900 48100 51300 4
 N 43000 46800 43000 46900 4
 N 44800 46800 44800 46900 4
 N 45600 46600 45600 46900 4
@@ -189,194 +162,167 @@ value=BASS OUTPUT
 N 47600 48200 46500 48200 4
 T 48300 38500 9 16 1 0 0 0 1
 Preamps
-C 44300 41800 1 90 0 capacitor-4.sym
+C 44300 42900 1 90 0 capacitor-4.sym
 {
-T 43200 42000 5 10 0 0 90 0 1
+T 43200 43100 5 10 0 0 90 0 1
 device=POLARIZED_CAPACITOR
-T 43800 42500 5 10 1 1 180 0 1
+T 43800 43600 5 10 1 1 180 0 1
 refdes=C202
-T 43600 42000 5 10 0 0 90 0 1
+T 43600 43100 5 10 0 0 90 0 1
 symversion=0.1
-T 43400 42100 5 10 1 1 0 0 1
+T 43400 43200 5 10 1 1 0 0 1
 value=3.3u
-T 44300 41800 5 10 0 1 0 0 1
+T 44300 42900 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-C 41600 40000 1 0 0 capacitor-1.sym
+C 41600 41500 1 0 0 capacitor-1.sym
 {
-T 41800 40700 5 10 0 0 0 0 1
+T 41800 42200 5 10 0 0 0 0 1
 device=CAPACITOR
-T 41900 40500 5 10 1 1 0 0 1
+T 41900 42000 5 10 1 1 0 0 1
 refdes=C203
-T 41800 40900 5 10 0 0 0 0 1
+T 41800 42400 5 10 0 0 0 0 1
 symversion=0.1
-T 41800 39800 5 10 1 1 0 0 1
+T 41800 41300 5 10 1 1 0 0 1
 value=0.47u
-T 41600 40000 5 10 0 1 0 0 1
+T 41600 41500 5 10 0 1 0 0 1
 footprint=CK06_type_capacitor
 }
-C 44100 38800 1 90 0 capacitor-1.sym
+C 44100 40300 1 90 0 capacitor-1.sym
 {
-T 43400 39000 5 10 0 0 90 0 1
+T 43400 40500 5 10 0 0 90 0 1
 device=CAPACITOR
-T 44400 39500 5 10 1 1 180 0 1
+T 44400 41000 5 10 1 1 180 0 1
 refdes=C204
-T 43200 39000 5 10 0 0 90 0 1
+T 43200 40500 5 10 0 0 90 0 1
 symversion=0.1
-T 44200 39100 5 10 1 1 0 0 1
+T 44200 40600 5 10 1 1 0 0 1
 value=10p
-T 44100 38800 5 10 0 1 0 0 1
+T 44100 40300 5 10 0 1 0 0 1
 footprint=ACY100
 }
-C 44400 43000 1 0 0 JFET_N-Channel-1.sym
+C 44400 43800 1 0 0 JFET_N-Channel-1.sym
 {
-T 44750 43800 5 10 1 1 0 6 1
+T 44750 44600 5 10 1 1 0 6 1
 model=J201
-T 44400 45050 5 10 0 0 0 0 1
+T 44400 45850 5 10 0 0 0 0 1
 device=JFET N-Channel
-T 44400 43000 5 10 1 1 0 0 1
+T 44400 43800 5 10 1 1 0 0 1
 refdes=Q201
-T 44400 43000 5 10 0 1 0 0 1
+T 44400 43800 5 10 0 1 0 0 1
 footprint=TO92
 }
-N 42100 43200 44400 43200 4
-N 44100 42700 44100 43200 4
-C 44400 40000 1 0 0 JFET_N-Channel-1.sym
+N 42100 44000 44400 44000 4
+N 44100 43800 44100 44000 4
+C 44400 41500 1 0 0 JFET_N-Channel-1.sym
 {
-T 44750 40800 5 10 1 1 0 6 1
+T 44750 42300 5 10 1 1 0 6 1
 model=J201
-T 44400 42050 5 10 0 0 0 0 1
+T 44400 43550 5 10 0 0 0 0 1
 device=JFET N-Channel
-T 44400 40000 5 10 1 1 0 0 1
+T 44400 41500 5 10 1 1 0 0 1
 refdes=Q202
-T 44400 40000 5 10 0 1 0 0 1
+T 44400 41500 5 10 0 1 0 0 1
 footprint=TO92
 }
-C 46100 41000 1 0 0 JFET_N-Channel-1.sym
+C 46100 42500 1 0 0 JFET_N-Channel-1.sym
 {
-T 46950 41300 5 10 1 1 0 6 1
+T 46950 42800 5 10 1 1 0 6 1
 model=J201
-T 46100 43050 5 10 0 0 0 0 1
+T 46100 44550 5 10 0 0 0 0 1
 device=JFET N-Channel
-T 46100 41000 5 10 1 1 0 0 1
+T 46100 42500 5 10 1 1 0 0 1
 refdes=Q203
-T 46100 41000 5 10 0 1 0 0 1
+T 46100 42500 5 10 0 1 0 0 1
 footprint=TO92
 }
-N 44800 43000 44800 41200 4
-N 44100 41200 46100 41200 4
-N 44100 41200 44100 41800 4
-N 44800 41200 44800 40800 4
-C 45500 45100 1 270 0 resistor-2.sym
-{
-T 45850 44700 5 10 0 0 270 0 1
-device=RESISTOR
-T 45800 44700 5 10 1 1 0 0 1
-refdes=R204
-T 45800 44500 5 10 1 1 0 0 1
-value=100
-T 45500 45100 5 10 0 1 0 0 1
-footprint=R025
-}
-C 47000 44100 1 180 1 capacitor-4.sym
-{
-T 47200 43000 5 10 0 0 180 6 1
-device=POLARIZED_CAPACITOR
-T 47300 44300 5 10 1 1 180 6 1
-refdes=C205
-T 47200 43400 5 10 0 0 180 6 1
-symversion=0.1
-T 47200 43500 5 10 1 1 0 0 1
-value=100u
-T 47000 44100 5 10 0 1 0 0 1
-footprint=RCY150P
-}
-N 44800 43800 44800 43900 4
-N 44800 43900 47000 43900 4
-N 45600 44200 45600 43900 4
-N 46500 41800 46500 43900 4
-C 46400 39800 1 270 0 resistor-2.sym
-{
-T 46750 39400 5 10 0 0 270 0 1
+N 44800 43800 44800 42700 4
+N 44100 42700 46100 42700 4
+N 44100 42700 44100 42900 4
+N 44800 42700 44800 42300 4
+N 44800 44600 44800 44700 4
+N 44800 44700 46500 44700 4
+N 45600 45000 45600 44700 4
+N 46500 43300 46500 44700 4
+C 46400 41300 1 270 0 resistor-2.sym
+{
+T 46750 40900 5 10 0 0 270 0 1
 device=RESISTOR
-T 46700 39300 5 10 1 1 0 0 1
+T 46700 40800 5 10 1 1 0 0 1
 refdes=R205
-T 46700 39100 5 10 1 1 0 0 1
+T 46700 40600 5 10 1 1 0 0 1
 value=10k
-T 46400 39800 5 10 0 1 0 0 1
+T 46400 41300 5 10 0 1 0 0 1
 footprint=R025
 }
-C 44700 39800 1 270 0 resistor-2.sym
+C 44700 41300 1 270 0 resistor-2.sym
 {
-T 45050 39400 5 10 0 0 270 0 1
+T 45050 40900 5 10 0 0 270 0 1
 device=RESISTOR
-T 45000 39300 5 10 1 1 0 0 1
+T 45000 40800 5 10 1 1 0 0 1
 refdes=R206
-T 45000 39100 5 10 1 1 0 0 1
+T 45000 40600 5 10 1 1 0 0 1
 value=6k8
-T 44700 39800 5 10 0 1 0 0 1
+T 44700 41300 5 10 0 1 0 0 1
 footprint=R025
 }
-C 45500 39800 1 270 0 resistor-2.sym
+C 45500 41300 1 270 0 resistor-2.sym
 {
-T 45850 39400 5 10 0 0 270 0 1
+T 45850 40900 5 10 0 0 270 0 1
 device=RESISTOR
-T 45800 39300 5 10 1 1 0 0 1
+T 45800 40800 5 10 1 1 0 0 1
 refdes=R207
-T 45800 39100 5 10 1 1 0 0 1
+T 45800 40600 5 10 1 1 0 0 1
 value=1M
-T 45500 39800 5 10 0 1 0 0 1
+T 45500 41300 5 10 0 1 0 0 1
 footprint=R025
 }
-N 45600 41200 45600 39800 4
-N 46500 41000 46500 39800 4
-N 44800 40000 44800 39800 4
-N 42500 40200 44400 40200 4
-N 43900 40200 43900 39700 4
-C 42900 39800 1 270 0 resistor-2.sym
+N 45600 42700 45600 41300 4
+N 46500 42500 46500 41300 4
+N 44800 41500 44800 41300 4
+N 42500 41700 44400 41700 4
+N 43900 41700 43900 41200 4
+C 42900 41300 1 270 0 resistor-2.sym
 {
-T 43250 39400 5 10 0 0 270 0 1
+T 43250 40900 5 10 0 0 270 0 1
 device=RESISTOR
-T 42600 39300 5 10 1 1 0 0 1
+T 42600 40800 5 10 1 1 0 0 1
 refdes=R208
-T 42500 39100 5 10 1 1 0 0 1
+T 42500 40600 5 10 1 1 0 0 1
 value=10M
-T 42900 39800 5 10 0 1 0 0 1
+T 42900 41300 5 10 0 1 0 0 1
 footprint=R025
 }
-N 43000 39800 43000 40200 4
-C 39700 40100 1 0 0 input-2.sym
+N 43000 41300 43000 41700 4
+C 39700 41600 1 0 0 input-2.sym
 {
-T 39600 39800 5 10 1 0 0 0 1
+T 39600 41300 5 10 1 0 0 0 1
 net=INPUT_1:1
-T 40300 40800 5 10 0 0 0 0 1
+T 40300 42300 5 10 0 0 0 0 1
 device=none
-T 40200 40200 5 10 1 1 0 7 1
+T 40200 41700 5 10 1 1 0 7 1
 value=MELODY
 }
-N 41100 40200 41600 40200 4
-C 45400 45100 1 0 0 vcc-2.sym
-C 42700 38200 1 0 0 vcc-minus-1.sym
-C 43600 38200 1 0 0 vcc-minus-1.sym
-C 44500 38200 1 0 0 vcc-minus-1.sym
-C 46200 38200 1 0 0 vcc-minus-1.sym
-C 47800 42700 1 0 0 vcc-minus-1.sym
-N 47900 43900 48100 43900 4
-N 48100 43900 48100 43300 4
-N 43000 38800 43000 38900 4
-N 44800 38800 44800 38900 4
-N 45600 38600 45600 38900 4
-N 46500 38800 46500 38900 4
-C 49000 40300 1 180 0 input-2.sym
-{
-T 49100 40000 5 10 1 0 180 0 1
+N 41100 41700 41600 41700 4
+C 45400 45000 1 0 0 vcc-2.sym
+C 42700 39700 1 0 0 vcc-minus-1.sym
+C 43600 39700 1 0 0 vcc-minus-1.sym
+C 44500 39700 1 0 0 vcc-minus-1.sym
+C 46200 39700 1 0 0 vcc-minus-1.sym
+N 43000 40300 43000 40400 4
+N 44800 40300 44800 40400 4
+N 45600 40100 45600 40400 4
+N 46500 40300 46500 40400 4
+C 49000 41800 1 180 0 input-2.sym
+{
+T 49100 41500 5 10 1 0 180 0 1
 net=PREAMP_1:1
-T 48400 39600 5 10 0 0 180 0 1
+T 48400 41100 5 10 0 0 180 0 1
 device=none
-T 48500 40200 5 10 1 1 180 7 1
+T 48500 41700 5 10 1 1 180 7 1
 value=MELODY OUTPUT
 }
-N 47600 40200 46500 40200 4
+N 47600 41700 46500 41700 4
 C 31800 37600 0 0 0 title-A2.sym
 C 34500 43900 1 0 1 stereo_jack-1.sym
 {
@@ -449,12 +395,9 @@ footprint=CONNECTOR 3 1
 N 37000 42000 36700 42000 4
 N 37300 44300 37300 41700 4
 N 37300 41700 36700 41700 4
-T 47400 46800 9 10 1 0 0 0 2
-TODO: replace R109 and R107
-with reference voltage (i.e. GND)?
-C 42200 50100 1 0 0 gnd-1.sym
-N 42300 51200 42300 50400 4
-C 42000 42000 1 0 0 gnd-1.sym
-N 42100 43200 42100 42300 4
+C 42200 49600 1 0 0 gnd-1.sym
+N 42300 50700 42300 49900 4
+C 42000 42800 1 0 0 gnd-1.sym
+N 42100 44000 42100 43100 4
 C 45500 46300 1 0 0 gnd-1.sym
-C 45500 38300 1 0 0 gnd-1.sym
+C 45500 39800 1 0 0 gnd-1.sym