diff --git a/diylc-regression-data/input/cloud/netlist/562_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/562_incl_switches.txt index beefa6b2..142033a1 100644 --- a/diylc-regression-data/input/cloud/netlist/562_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/562_incl_switches.txt @@ -1,39 +1,3 @@ -Switch setup: [ 3-Way-Switch.Middle:Push Pull.ON1:Rhythm Circuit.ON1 ] - - Bridge.South Finish <-> Lead Tone.1 <-> Lead Volume.3 <-> Neck.North Finish - Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1 - Lead Tone Cap.1 <-> Lead Tone.2 - Lead Volume.2 <-> Output.Tip - RC Tone Cap.2 <-> RC Tone.2 - RC Tone.1 <-> RC Volume.3 - -Switch setup: [ 3-Way-Switch.Middle:Push Pull.ON1:Rhythm Circuit.ON2 ] - - Bridge.South Finish <-> Neck.North Finish <-> RC Tone.1 <-> RC Volume.3 - Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1 - Lead Tone Cap.1 <-> Lead Tone.2 - Lead Tone.1 <-> Lead Volume.3 - Output.Tip <-> RC Volume.2 - RC Tone Cap.2 <-> RC Tone.2 - -Switch setup: [ 3-Way-Switch.Rhythm:Push Pull.ON1:Rhythm Circuit.ON1 ] - - Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1 - Lead Tone Cap.1 <-> Lead Tone.2 - Lead Tone.1 <-> Lead Volume.3 <-> Neck.North Finish - Lead Volume.2 <-> Output.Tip - RC Tone Cap.2 <-> RC Tone.2 - RC Tone.1 <-> RC Volume.3 - -Switch setup: [ 3-Way-Switch.Rhythm:Push Pull.ON1:Rhythm Circuit.ON2 ] - - Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1 - Lead Tone Cap.1 <-> Lead Tone.2 - Lead Tone.1 <-> Lead Volume.3 - Neck.North Finish <-> RC Tone.1 <-> RC Volume.3 - Output.Tip <-> RC Volume.2 - RC Tone Cap.2 <-> RC Tone.2 - Switch setup: [ 3-Way-Switch.Treble:Push Pull.ON1:Rhythm Circuit.ON1 ] Bridge.South Finish <-> Lead Tone.1 <-> Lead Volume.3 @@ -72,3 +36,39 @@ Switch setup: [ Push Pull.ON2:Rhythm Circuit.ON2 ] Output.Tip <-> RC Volume.2 RC Tone Cap.2 <-> RC Tone.2 +Switch setup: [ 3-Way-Switch.Middle:Push Pull.ON1:Rhythm Circuit.ON1 ] + + Bridge.South Finish <-> Lead Tone.1 <-> Lead Volume.3 <-> Neck.North Finish + Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1 + Lead Tone Cap.1 <-> Lead Tone.2 + Lead Volume.2 <-> Output.Tip + RC Tone Cap.2 <-> RC Tone.2 + RC Tone.1 <-> RC Volume.3 + +Switch setup: [ 3-Way-Switch.Middle:Push Pull.ON1:Rhythm Circuit.ON2 ] + + Bridge.South Finish <-> Neck.North Finish <-> RC Tone.1 <-> RC Volume.3 + Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1 + Lead Tone Cap.1 <-> Lead Tone.2 + Lead Tone.1 <-> Lead Volume.3 + Output.Tip <-> RC Volume.2 + RC Tone Cap.2 <-> RC Tone.2 + +Switch setup: [ 3-Way-Switch.Rhythm:Push Pull.ON1:Rhythm Circuit.ON1 ] + + Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1 + Lead Tone Cap.1 <-> Lead Tone.2 + Lead Tone.1 <-> Lead Volume.3 <-> Neck.North Finish + Lead Volume.2 <-> Output.Tip + RC Tone Cap.2 <-> RC Tone.2 + RC Tone.1 <-> RC Volume.3 + +Switch setup: [ 3-Way-Switch.Rhythm:Push Pull.ON1:Rhythm Circuit.ON2 ] + + Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1 + Lead Tone Cap.1 <-> Lead Tone.2 + Lead Tone.1 <-> Lead Volume.3 + Neck.North Finish <-> RC Tone.1 <-> RC Volume.3 + Output.Tip <-> RC Volume.2 + RC Tone Cap.2 <-> RC Tone.2 + diff --git a/diylc-regression-data/input/cloud/png/211.png b/diylc-regression-data/input/cloud/png/211.png index 38b9d66f..9e62d17f 100644 Binary files a/diylc-regression-data/input/cloud/png/211.png and b/diylc-regression-data/input/cloud/png/211.png differ diff --git a/diylc-regression-data/input/cloud/png/259.png b/diylc-regression-data/input/cloud/png/259.png index 73a61153..52e45d6e 100644 Binary files a/diylc-regression-data/input/cloud/png/259.png and b/diylc-regression-data/input/cloud/png/259.png differ diff --git a/diylc-regression-data/input/cloud/png/331.png b/diylc-regression-data/input/cloud/png/331.png index 3b2678d5..581bd37d 100644 Binary files a/diylc-regression-data/input/cloud/png/331.png and b/diylc-regression-data/input/cloud/png/331.png differ diff --git a/diylc-regression-data/input/cloud/png/367.png b/diylc-regression-data/input/cloud/png/367.png index fe5899d3..56e3ec1a 100644 Binary files a/diylc-regression-data/input/cloud/png/367.png and b/diylc-regression-data/input/cloud/png/367.png differ diff --git a/diylc-regression-data/input/cloud/png/374.png b/diylc-regression-data/input/cloud/png/374.png index 80d4c0e4..ee0ebc2b 100644 Binary files a/diylc-regression-data/input/cloud/png/374.png and b/diylc-regression-data/input/cloud/png/374.png differ diff --git a/diylc-regression-data/input/cloud/png/419.png b/diylc-regression-data/input/cloud/png/419.png index ff6f0d9a..06da92de 100644 Binary files a/diylc-regression-data/input/cloud/png/419.png and b/diylc-regression-data/input/cloud/png/419.png differ diff --git a/diylc-regression-data/input/cloud/png/451.png b/diylc-regression-data/input/cloud/png/451.png index 7ac61a18..505e25bc 100644 Binary files a/diylc-regression-data/input/cloud/png/451.png and b/diylc-regression-data/input/cloud/png/451.png differ diff --git a/diylc-regression-data/input/cloud/png/537.png b/diylc-regression-data/input/cloud/png/537.png index b215b426..51090e26 100644 Binary files a/diylc-regression-data/input/cloud/png/537.png and b/diylc-regression-data/input/cloud/png/537.png differ diff --git a/diylc-regression-data/input/cloud/png/543.png b/diylc-regression-data/input/cloud/png/543.png index a6d31542..f20121ab 100644 Binary files a/diylc-regression-data/input/cloud/png/543.png and b/diylc-regression-data/input/cloud/png/543.png differ diff --git a/diylc-regression-data/input/cloud/png/578.png b/diylc-regression-data/input/cloud/png/578.png index 9b0aba41..0e217b5c 100644 Binary files a/diylc-regression-data/input/cloud/png/578.png and b/diylc-regression-data/input/cloud/png/578.png differ diff --git a/diylc-regression-data/input/cloud/png/580.png b/diylc-regression-data/input/cloud/png/580.png index be23f52f..18e0743c 100644 Binary files a/diylc-regression-data/input/cloud/png/580.png and b/diylc-regression-data/input/cloud/png/580.png differ diff --git a/diylc-regression-data/input/cloud/png/581.png b/diylc-regression-data/input/cloud/png/581.png index 187cd274..a5f091dc 100644 Binary files a/diylc-regression-data/input/cloud/png/581.png and b/diylc-regression-data/input/cloud/png/581.png differ diff --git a/diylc-regression-data/input/cloud/png/606.png b/diylc-regression-data/input/cloud/png/606.png index 9fa6ae7f..3c2067fb 100644 Binary files a/diylc-regression-data/input/cloud/png/606.png and b/diylc-regression-data/input/cloud/png/606.png differ diff --git a/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_incl_switches.txt index a45094e2..7dc05468 100644 --- a/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/lp switch + pots_incl_switches.txt @@ -1,3 +1,20 @@ +Switch setup: [ SW1.Treble:SW2.ON1 ] + + Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 + Bucker.South Start <-> VR1.3 + C1.1 <-> VR3.2 + J1.Tip <-> VR1.2 <-> VR3.1 + Single.North Finish <-> VR2.3 + +Switch setup: [ SW1.Treble:SW2.ON2 ] + + Bucker.North Finish <-> Bucker.South Finish + Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 + Bucker.South Start <-> VR1.3 + C1.1 <-> VR3.2 + J1.Tip <-> VR1.2 <-> VR3.1 + Single.North Finish <-> VR2.3 + Switch setup: [ SW1.Middle:SW2.ON1 ] Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 @@ -32,20 +49,3 @@ Switch setup: [ SW1.Rhythm:SW2.ON2 ] J1.Tip <-> VR2.2 <-> VR3.1 Single.North Finish <-> VR2.3 -Switch setup: [ SW1.Treble:SW2.ON1 ] - - Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 - Bucker.South Start <-> VR1.3 - C1.1 <-> VR3.2 - J1.Tip <-> VR1.2 <-> VR3.1 - Single.North Finish <-> VR2.3 - -Switch setup: [ SW1.Treble:SW2.ON2 ] - - Bucker.North Finish <-> Bucker.South Finish - Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1 - Bucker.South Start <-> VR1.3 - C1.1 <-> VR3.2 - J1.Tip <-> VR1.2 <-> VR3.1 - Single.North Finish <-> VR2.3 - diff --git a/diylc-regression-data/input/diy-fever/netlist/splitter2_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/splitter2_excl_switches.txt index 962edc35..bbd2e9b8 100644 --- a/diylc-regression-data/input/diy-fever/netlist/splitter2_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/splitter2_excl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [ ALL ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> SW1.1 diff --git a/diylc-regression-data/input/diy-fever/netlist/splitter2_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/splitter2_incl_switches.txt index 8ac20e95..ff775d34 100644 --- a/diylc-regression-data/input/diy-fever/netlist/splitter2_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/splitter2_incl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip @@ -16,7 +16,54 @@ Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1 ] Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> J4.Tip + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Sleeve <-> L4.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 + +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> J4.Tip + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + Impedance.2 <-> J2.Tip + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 + J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 + L4.2 <-> Level.3 + +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> J4.Tip + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + Impedance.2 <-> J2.Sleeve + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 + L4.2 <-> Level.3 + +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 @@ -27,136 +74,125 @@ Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2 ] J2.Tip <-> L4.2 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> J4.Tip - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - J2.Tip <-> L4.2 - J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - -Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - J2.Tip <-> L4.2 - J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - -Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> J4.Tip - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 - J2.Tip <-> L7.2 - J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 - J2.Tip <-> L7.2 + J2.Sleeve <-> L4.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> J4.Tip - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - J2.Tip <-> L7.2 - J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - -Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - J2.Tip <-> L7.2 - J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - -Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - J2.Sleeve <-> L4.2 + Impedance.2 <-> J2.Tip + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 + J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + L4.2 <-> Level.3 + +Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + Impedance.2 <-> J2.Sleeve J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + L4.2 <-> Level.3 + +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> J4.Tip + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.2 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - J2.Sleeve <-> L4.2 J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 - J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + Impedance.2 <-> J2.Tip J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 + L4.2 <-> Level.3 Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> J4.Tip + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 + L4.2 <-> Level.3 + +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.2 + J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + +Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 @@ -166,142 +202,128 @@ Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2 ] J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 -Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> J4.Tip - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - J2.Sleeve <-> L7.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 - J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - -Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - J2.Sleeve <-> L7.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 - J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 - J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 + Impedance.2 <-> J2.Tip + J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + L4.2 <-> Level.3 Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + L4.2 <-> Level.3 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Tip J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 + J2.Tip <-> L7.2 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L4.2 <-> Level.3 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Tip - J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 - J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L4.2 <-> Level.3 + J2.Sleeve <-> L7.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 Impedance.2 <-> J2.Tip + J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L4.2 <-> Level.3 + L7.2 <-> Level.3 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Tip - J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L4.2 <-> Level.3 + Impedance.2 <-> J2.Sleeve + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 + L7.2 <-> Level.3 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Tip J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1 - J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L7.2 <-> Level.3 + J2.Tip <-> L7.2 + J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Sleeve <-> L7.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + +Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 @@ -313,130 +335,68 @@ Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2 ] J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 L7.2 <-> Level.3 -Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> J4.Tip - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Tip - J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L7.2 <-> Level.3 - Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Tip + Impedance.2 <-> J2.Sleeve + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 L7.2 <-> Level.3 Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Sleeve - J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + J2.Tip <-> L7.2 J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L4.2 <-> Level.3 Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Sleeve J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 - J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L4.2 <-> Level.3 + J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip C1.2 <-> TL072.1 <-> TL072.2 C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 Impedance.1 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + Impedance.2 <-> J2.Tip J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L4.2 <-> Level.3 + L7.2 <-> Level.3 Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 - J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L4.2 <-> Level.3 - -Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> J4.Tip - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Sleeve - J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 - J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 - L7.2 <-> Level.3 - -Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 - C1.1 <-> R1.1 <-> R1.1 - C1.1 <-> R1.1 <-> TL072.3 - C1.2 <-> TL072.1 <-> TL072.2 - C2.+ <-> R1.2 <-> R1.2 <-> R1.2 - C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4 - Impedance.1 <-> Level.2 - Impedance.2 <-> J2.Sleeve - J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 - J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 - L7.2 <-> Level.3 - -Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ] - - 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> J4.Tip @@ -448,10 +408,50 @@ Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ] J5.Tip <-> L3.1 <-> L6.1 <-> R1.2 L7.2 <-> Level.3 +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L7.2 + J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + J2.Tip <-> L4.1 <-> L7.1 <-> Level.1 + J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + +Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ] + + 4001.A <-> C2.+ <-> J6.Sleeve + 4001.K <-> R1.1 <-> TL072.8 + C1.1 <-> R1.1 <-> R1.1 + C1.1 <-> R1.1 <-> TL072.3 + C1.2 <-> TL072.1 <-> TL072.2 + C2.+ <-> R1.2 <-> R1.2 <-> R1.2 + C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4 + Impedance.1 <-> Level.2 + Impedance.2 <-> J2.Tip + J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1 + L7.2 <-> Level.3 + Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2 ] 4001.A <-> C2.+ <-> J6.Sleeve - 4001.K <-> R1.1 <-> TL072.5 + 4001.K <-> R1.1 <-> TL072.8 C1.1 <-> R1.1 <-> R1.1 C1.1 <-> R1.1 <-> TL072.3 C1.2 <-> TL072.1 <-> TL072.2 diff --git a/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_incl_switches.txt index e6dfa822..5a6d5b76 100644 --- a/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_incl_switches.txt @@ -1,3 +1,12 @@ +Switch setup: [ Split.ON1:SW1.Treble ] + + Bridge.North Finish <-> Bridge.South Finish + Bridge.North Start <-> Cbleed.1 <-> Volume.3 + Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.1 + Cbleed.2 <-> Rbleed.2 + J1.Tip <-> Rbleed.1 <-> Volume.2 + Neck.North Start <-> Neck.South Start + Switch setup: [ Split.ON1:SW1.Middle ] Bridge.North Finish <-> Bridge.South Finish @@ -16,14 +25,12 @@ Switch setup: [ Split.ON1:SW1.Rhythm ] J1.Tip <-> Rbleed.1 <-> Volume.2 Neck.North Start <-> Neck.South Start -Switch setup: [ Split.ON1:SW1.Treble ] +Switch setup: [ Split.ON2:SW1.Treble ] - Bridge.North Finish <-> Bridge.South Finish + Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.1 Bridge.North Start <-> Cbleed.1 <-> Volume.3 - Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.1 Cbleed.2 <-> Rbleed.2 J1.Tip <-> Rbleed.1 <-> Volume.2 - Neck.North Start <-> Neck.South Start Switch setup: [ Split.ON2:SW1.Middle ] @@ -39,10 +46,3 @@ Switch setup: [ Split.ON2:SW1.Rhythm ] Cbleed.2 <-> Rbleed.2 J1.Tip <-> Rbleed.1 <-> Volume.2 -Switch setup: [ Split.ON2:SW1.Treble ] - - Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.1 - Bridge.North Start <-> Cbleed.1 <-> Volume.3 - Cbleed.2 <-> Rbleed.2 - J1.Tip <-> Rbleed.1 <-> Volume.2 - diff --git a/diylc-regression-data/input/diy-fever/png/IIc+.png b/diylc-regression-data/input/diy-fever/png/IIc+.png index acecc4d3..4feed592 100644 Binary files a/diylc-regression-data/input/diy-fever/png/IIc+.png and b/diylc-regression-data/input/diy-fever/png/IIc+.png differ diff --git a/diylc-regression-data/input/diy-fever/png/deacy.png b/diylc-regression-data/input/diy-fever/png/deacy.png index 3fef0a9d..ad2e0014 100644 Binary files a/diylc-regression-data/input/diy-fever/png/deacy.png and b/diylc-regression-data/input/diy-fever/png/deacy.png differ diff --git a/diylc-regression-data/input/diy-fever/png/rangemaster.png b/diylc-regression-data/input/diy-fever/png/rangemaster.png index 04a3fa53..fb7725fd 100644 Binary files a/diylc-regression-data/input/diy-fever/png/rangemaster.png and b/diylc-regression-data/input/diy-fever/png/rangemaster.png differ diff --git a/diylc-regression-data/input/diy-fever/png/ruby.png b/diylc-regression-data/input/diy-fever/png/ruby.png index ee7274f1..f0fcbcf7 100644 Binary files a/diylc-regression-data/input/diy-fever/png/ruby.png and b/diylc-regression-data/input/diy-fever/png/ruby.png differ diff --git a/diylc-regression-data/input/diy-fever/png/slo2.png b/diylc-regression-data/input/diy-fever/png/slo2.png index 4aa4faf7..abf35f47 100644 Binary files a/diylc-regression-data/input/diy-fever/png/slo2.png and b/diylc-regression-data/input/diy-fever/png/slo2.png differ diff --git a/diylc-regression-data/input/diy-fever/png/splitter2.png b/diylc-regression-data/input/diy-fever/png/splitter2.png index 58c40511..b8ef9480 100644 Binary files a/diylc-regression-data/input/diy-fever/png/splitter2.png and b/diylc-regression-data/input/diy-fever/png/splitter2.png differ diff --git a/diylc-regression-data/input/diy-fever/png/tda1521a-2.png b/diylc-regression-data/input/diy-fever/png/tda1521a-2.png index 7f14e817..f02ee86c 100644 Binary files a/diylc-regression-data/input/diy-fever/png/tda1521a-2.png and b/diylc-regression-data/input/diy-fever/png/tda1521a-2.png differ diff --git a/diylc-regression-data/input/diy-fever/png/timmy7.png b/diylc-regression-data/input/diy-fever/png/timmy7.png index 5c0ce951..9f7a6441 100644 Binary files a/diylc-regression-data/input/diy-fever/png/timmy7.png and b/diylc-regression-data/input/diy-fever/png/timmy7.png differ diff --git a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_incl_switches.txt index cd53809c..f6fe570d 100644 --- a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_incl_switches.txt @@ -1,175 +1,3 @@ -Switch setup: [ SW1.OFF:SW6.ON1,SW1.ON2:SW6.ON1 ] - - .047 uF.1 <-> J1.Tip - .047 uF.2 <-> 1 M.2 <-> R1.2 - .1 <-> R2.1 - .2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.Sleeve <-> J1.Tip Switch <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.COM2 <-> RY1.NC2 <-> RY1.NO2 <-> RY2.COM2 <-> RY2.NC2 <-> RY2.NO2 - .A <-> C31.- <-> R42.2 - .K <-> R54.1 - 1N4007.K <-> C8.1 <-> D7.A <-> R15.2 - BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 - BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2 - C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9 - C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6 - C10.2 <-> DUAL BASS 2--LEAD.3 - C11.1 <-> C14.2 <-> R23.2 - C11.2 <-> R22.2 - C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1 - C13.2 <-> C21.1 <-> TREBLE-LEAD.3 - C14.1 <-> MIDDLE-LEAD.2 - C15.2 <-> DUAL BASS-CLEAN.3 - C16.1 <-> C19.2 <-> R26.2 - C16.2 <-> R25.2 - C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1 - C18.2 <-> C23.1 <-> TREBLE-CLEAN.3 - C19.1 <-> MIDDLE--CLEAN.2 - C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1 - C21.2 <-> MIDDLE-LEAD.3 - C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1 - C23.2 <-> MIDDLE--CLEAN.3 - C24.1 <-> MASTER VOL.2 - C24.2 <-> R30.2 - C25.1 <-> R32.2 <-> V3.7 - C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1 - C26.1 <-> R36.2 - C26.2 <-> C28.1 <-> R34.1 - C27.1 <-> R37.2 - C27.2 <-> C28.2 <-> R35.1 - C29.1 <-> PRESENCE.2 - C29.2 <-> PRESENCE.1 - C3.1 <-> R8.2 <-> R9.2 - C3.2 <-> C4.2 <-> R5.2 <-> V1.6 - C30.+ <-> C31.+ <-> C33.- <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5 - C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 - C32.+1 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 - C32.+2 <-> R41.1 <-> R48.1 <-> V6.6 - C32.- <-> J29.J29Sleeve - C33.+1 <-> C33.+2 <-> D6.K <-> D8.K <-> FH2.1 - C34.2 <-> C5.2 <-> R6.1 <-> RY1.COM1 - C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3 - C4.1 <-> C7.+1 <-> C7.+2 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 - C7.- <-> J59.J59Sleeve - C9.1 <-> R18.1 - C9.2 <-> R17.1 <-> R20.1 <-> V2.7 - CLEAN GAIN.2 <-> RY1.NC1 - CP RY.Coil1 <-> D12.K - D1.A <-> D3.K <-> D4.K <-> D5.A - D1.K <-> D2.A - D10.K <-> D6.A - D12.A <-> R39.2 - D8.A <-> D9.K - DUAL BASS 2--LEAD.1 <-> R24.1 - DUAL BASS-CLEAN.1 <-> R27.1 - FEEDBACK (NFB).1 <-> R38.2 - FH1.1 <-> IEC1.Neutral - IEC1.Earth <-> J32.J32Sleeve - J36.J36Sleeve <-> J60.Sleeve <-> J61.Sleeve <-> V5.8 - J38.J38Sleeve <-> V7.1 <-> V7.8 - J60.Tip <-> J61.Tip - LEAD GAIN.2 <-> RY1.NO1 - LEAD VOL.2 <-> R16.1 - R13.2 <-> R14.1 - R14.2 <-> R15.1 <-> R16.2 <-> R17.2 - R30.1 <-> R31.1 <-> R32.1 <-> R33.1 - R31.2 <-> V3.8 - R46.1 <-> R47.1 - R46.2 <-> V4.4 - R47.2 <-> V5.4 - R48.2 <-> V6.4 - R50.2 <-> R51.2 - R51.1 <-> V4.5 - R52.1 <-> V6.5 - R52.2 <-> R53.2 - RY2.NO1 <-> TREBLE-LEAD.2 - V4.3 <-> V5.3 - V6.3 <-> V7.3 - -Switch setup: [ SW1.OFF:SW6.ON2,SW1.ON2:SW6.ON2 ] - - .047 uF.1 <-> J1.Tip - .047 uF.2 <-> 1 M.2 <-> R1.2 - .1 <-> R2.1 - .2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C34.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.Sleeve <-> J1.Tip Switch <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.COM2 <-> RY1.NC2 <-> RY1.NO2 <-> RY2.COM2 <-> RY2.NC2 <-> RY2.NO2 - .A <-> C31.- <-> R42.2 - .K <-> R54.1 - 1N4007.K <-> C8.1 <-> D7.A <-> R15.2 - BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 - BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2 - C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9 - C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6 - C10.2 <-> DUAL BASS 2--LEAD.3 - C11.1 <-> C14.2 <-> R23.2 - C11.2 <-> R22.2 - C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1 - C13.2 <-> C21.1 <-> TREBLE-LEAD.3 - C14.1 <-> MIDDLE-LEAD.2 - C15.2 <-> DUAL BASS-CLEAN.3 - C16.1 <-> C19.2 <-> R26.2 - C16.2 <-> R25.2 - C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1 - C18.2 <-> C23.1 <-> TREBLE-CLEAN.3 - C19.1 <-> MIDDLE--CLEAN.2 - C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1 - C21.2 <-> MIDDLE-LEAD.3 - C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1 - C23.2 <-> MIDDLE--CLEAN.3 - C24.1 <-> MASTER VOL.2 - C24.2 <-> R30.2 - C25.1 <-> R32.2 <-> V3.7 - C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1 - C26.1 <-> R36.2 - C26.2 <-> C28.1 <-> R34.1 - C27.1 <-> R37.2 - C27.2 <-> C28.2 <-> R35.1 - C29.1 <-> PRESENCE.2 - C29.2 <-> PRESENCE.1 - C3.1 <-> R8.2 <-> R9.2 - C3.2 <-> C4.2 <-> R5.2 <-> V1.6 - C30.+ <-> C31.+ <-> C33.- <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5 - C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 - C32.+1 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 - C32.+2 <-> R41.1 <-> R48.1 <-> V6.6 - C32.- <-> J29.J29Sleeve - C33.+1 <-> C33.+2 <-> D6.K <-> D8.K <-> FH2.1 - C34.2 <-> C5.2 <-> R6.1 <-> RY1.COM1 - C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3 - C4.1 <-> C7.+1 <-> C7.+2 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 - C7.- <-> J59.J59Sleeve - C9.1 <-> R18.1 - C9.2 <-> R17.1 <-> R20.1 <-> V2.7 - CLEAN GAIN.2 <-> RY1.NC1 - CP RY.Coil1 <-> D12.K - D1.A <-> D3.K <-> D4.K <-> D5.A - D1.K <-> D2.A - D10.K <-> D6.A - D12.A <-> R39.2 - D8.A <-> D9.K - DUAL BASS 2--LEAD.1 <-> R24.1 - DUAL BASS-CLEAN.1 <-> R27.1 - FEEDBACK (NFB).1 <-> R38.2 - FH1.1 <-> IEC1.Neutral - IEC1.Earth <-> J32.J32Sleeve - J36.J36Sleeve <-> J60.Sleeve <-> J61.Sleeve <-> V5.8 - J38.J38Sleeve <-> V7.1 <-> V7.8 - J60.Tip <-> J61.Tip - LEAD GAIN.2 <-> RY1.NO1 - LEAD VOL.2 <-> R16.1 - R13.2 <-> R14.1 - R14.2 <-> R15.1 <-> R16.2 <-> R17.2 - R30.1 <-> R31.1 <-> R32.1 <-> R33.1 - R31.2 <-> V3.8 - R46.1 <-> R47.1 - R46.2 <-> V4.4 - R47.2 <-> V5.4 - R48.2 <-> V6.4 - R50.2 <-> R51.2 - R51.1 <-> V4.5 - R52.1 <-> V6.5 - R52.2 <-> R53.2 - RY2.NO1 <-> TREBLE-LEAD.2 - V4.3 <-> V5.3 - V6.3 <-> V7.3 - Switch setup: [ SW1.ON1:SW6.ON1 ] .047 uF.1 <-> J1.Tip @@ -340,3 +168,175 @@ Switch setup: [ SW1.ON1:SW6.ON2 ] V4.3 <-> V5.3 V6.3 <-> V7.3 +Switch setup: [ SW1.OFF:SW6.ON1, SW1.ON2:SW6.ON1 ] + + .047 uF.1 <-> J1.Tip + .047 uF.2 <-> 1 M.2 <-> R1.2 + .1 <-> R2.1 + .2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.Sleeve <-> J1.Tip Switch <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.COM2 <-> RY1.NC2 <-> RY1.NO2 <-> RY2.COM2 <-> RY2.NC2 <-> RY2.NO2 + .A <-> C31.- <-> R42.2 + .K <-> R54.1 + 1N4007.K <-> C8.1 <-> D7.A <-> R15.2 + BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 + BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2 + C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9 + C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6 + C10.2 <-> DUAL BASS 2--LEAD.3 + C11.1 <-> C14.2 <-> R23.2 + C11.2 <-> R22.2 + C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1 + C13.2 <-> C21.1 <-> TREBLE-LEAD.3 + C14.1 <-> MIDDLE-LEAD.2 + C15.2 <-> DUAL BASS-CLEAN.3 + C16.1 <-> C19.2 <-> R26.2 + C16.2 <-> R25.2 + C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1 + C18.2 <-> C23.1 <-> TREBLE-CLEAN.3 + C19.1 <-> MIDDLE--CLEAN.2 + C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1 + C21.2 <-> MIDDLE-LEAD.3 + C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1 + C23.2 <-> MIDDLE--CLEAN.3 + C24.1 <-> MASTER VOL.2 + C24.2 <-> R30.2 + C25.1 <-> R32.2 <-> V3.7 + C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1 + C26.1 <-> R36.2 + C26.2 <-> C28.1 <-> R34.1 + C27.1 <-> R37.2 + C27.2 <-> C28.2 <-> R35.1 + C29.1 <-> PRESENCE.2 + C29.2 <-> PRESENCE.1 + C3.1 <-> R8.2 <-> R9.2 + C3.2 <-> C4.2 <-> R5.2 <-> V1.6 + C30.+ <-> C31.+ <-> C33.- <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5 + C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 + C32.+1 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 + C32.+2 <-> R41.1 <-> R48.1 <-> V6.6 + C32.- <-> J29.J29Sleeve + C33.+1 <-> C33.+2 <-> D6.K <-> D8.K <-> FH2.1 + C34.2 <-> C5.2 <-> R6.1 <-> RY1.COM1 + C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3 + C4.1 <-> C7.+1 <-> C7.+2 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 + C7.- <-> J59.J59Sleeve + C9.1 <-> R18.1 + C9.2 <-> R17.1 <-> R20.1 <-> V2.7 + CLEAN GAIN.2 <-> RY1.NC1 + CP RY.Coil1 <-> D12.K + D1.A <-> D3.K <-> D4.K <-> D5.A + D1.K <-> D2.A + D10.K <-> D6.A + D12.A <-> R39.2 + D8.A <-> D9.K + DUAL BASS 2--LEAD.1 <-> R24.1 + DUAL BASS-CLEAN.1 <-> R27.1 + FEEDBACK (NFB).1 <-> R38.2 + FH1.1 <-> IEC1.Neutral + IEC1.Earth <-> J32.J32Sleeve + J36.J36Sleeve <-> J60.Sleeve <-> J61.Sleeve <-> V5.8 + J38.J38Sleeve <-> V7.1 <-> V7.8 + J60.Tip <-> J61.Tip + LEAD GAIN.2 <-> RY1.NO1 + LEAD VOL.2 <-> R16.1 + R13.2 <-> R14.1 + R14.2 <-> R15.1 <-> R16.2 <-> R17.2 + R30.1 <-> R31.1 <-> R32.1 <-> R33.1 + R31.2 <-> V3.8 + R46.1 <-> R47.1 + R46.2 <-> V4.4 + R47.2 <-> V5.4 + R48.2 <-> V6.4 + R50.2 <-> R51.2 + R51.1 <-> V4.5 + R52.1 <-> V6.5 + R52.2 <-> R53.2 + RY2.NO1 <-> TREBLE-LEAD.2 + V4.3 <-> V5.3 + V6.3 <-> V7.3 + +Switch setup: [ SW1.OFF:SW6.ON2, SW1.ON2:SW6.ON2 ] + + .047 uF.1 <-> J1.Tip + .047 uF.2 <-> 1 M.2 <-> R1.2 + .1 <-> R2.1 + .2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C34.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.Sleeve <-> J1.Tip Switch <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.COM2 <-> RY1.NC2 <-> RY1.NO2 <-> RY2.COM2 <-> RY2.NC2 <-> RY2.NO2 + .A <-> C31.- <-> R42.2 + .K <-> R54.1 + 1N4007.K <-> C8.1 <-> D7.A <-> R15.2 + BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 + BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2 + C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9 + C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6 + C10.2 <-> DUAL BASS 2--LEAD.3 + C11.1 <-> C14.2 <-> R23.2 + C11.2 <-> R22.2 + C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1 + C13.2 <-> C21.1 <-> TREBLE-LEAD.3 + C14.1 <-> MIDDLE-LEAD.2 + C15.2 <-> DUAL BASS-CLEAN.3 + C16.1 <-> C19.2 <-> R26.2 + C16.2 <-> R25.2 + C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1 + C18.2 <-> C23.1 <-> TREBLE-CLEAN.3 + C19.1 <-> MIDDLE--CLEAN.2 + C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1 + C21.2 <-> MIDDLE-LEAD.3 + C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1 + C23.2 <-> MIDDLE--CLEAN.3 + C24.1 <-> MASTER VOL.2 + C24.2 <-> R30.2 + C25.1 <-> R32.2 <-> V3.7 + C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1 + C26.1 <-> R36.2 + C26.2 <-> C28.1 <-> R34.1 + C27.1 <-> R37.2 + C27.2 <-> C28.2 <-> R35.1 + C29.1 <-> PRESENCE.2 + C29.2 <-> PRESENCE.1 + C3.1 <-> R8.2 <-> R9.2 + C3.2 <-> C4.2 <-> R5.2 <-> V1.6 + C30.+ <-> C31.+ <-> C33.- <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5 + C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 + C32.+1 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 + C32.+2 <-> R41.1 <-> R48.1 <-> V6.6 + C32.- <-> J29.J29Sleeve + C33.+1 <-> C33.+2 <-> D6.K <-> D8.K <-> FH2.1 + C34.2 <-> C5.2 <-> R6.1 <-> RY1.COM1 + C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3 + C4.1 <-> C7.+1 <-> C7.+2 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 + C7.- <-> J59.J59Sleeve + C9.1 <-> R18.1 + C9.2 <-> R17.1 <-> R20.1 <-> V2.7 + CLEAN GAIN.2 <-> RY1.NC1 + CP RY.Coil1 <-> D12.K + D1.A <-> D3.K <-> D4.K <-> D5.A + D1.K <-> D2.A + D10.K <-> D6.A + D12.A <-> R39.2 + D8.A <-> D9.K + DUAL BASS 2--LEAD.1 <-> R24.1 + DUAL BASS-CLEAN.1 <-> R27.1 + FEEDBACK (NFB).1 <-> R38.2 + FH1.1 <-> IEC1.Neutral + IEC1.Earth <-> J32.J32Sleeve + J36.J36Sleeve <-> J60.Sleeve <-> J61.Sleeve <-> V5.8 + J38.J38Sleeve <-> V7.1 <-> V7.8 + J60.Tip <-> J61.Tip + LEAD GAIN.2 <-> RY1.NO1 + LEAD VOL.2 <-> R16.1 + R13.2 <-> R14.1 + R14.2 <-> R15.1 <-> R16.2 <-> R17.2 + R30.1 <-> R31.1 <-> R32.1 <-> R33.1 + R31.2 <-> V3.8 + R46.1 <-> R47.1 + R46.2 <-> V4.4 + R47.2 <-> V5.4 + R48.2 <-> V6.4 + R50.2 <-> R51.2 + R51.1 <-> V4.5 + R52.1 <-> V6.5 + R52.2 <-> R53.2 + RY2.NO1 <-> TREBLE-LEAD.2 + V4.3 <-> V5.3 + V6.3 <-> V7.3 + diff --git a/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt index c3c48d75..695bf721 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt @@ -13,7 +13,7 @@ Switch setup: [ ALL ] 100k.1 <-> 150p.1 100k.2 <-> 100k.2 <-> 22u 450v.+ <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2 100u 100v.+ <-> 270 3W.1 - 10k 2W.1 <-> 1k 2w.2 <-> 1k 2W.2 <-> L2.1 + 10k 2W.1 <-> 1k 2W.2 <-> 1k 2w.2 <-> L2.1 1k5.2 <-> 1k5.2 D1.K <-> D3.A D2.K <-> D4.A diff --git a/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt index c3c48d75..695bf721 100644 --- a/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt @@ -13,7 +13,7 @@ Switch setup: [ ALL ] 100k.1 <-> 150p.1 100k.2 <-> 100k.2 <-> 22u 450v.+ <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2 100u 100v.+ <-> 270 3W.1 - 10k 2W.1 <-> 1k 2w.2 <-> 1k 2W.2 <-> L2.1 + 10k 2W.1 <-> 1k 2W.2 <-> 1k 2w.2 <-> L2.1 1k5.2 <-> 1k5.2 D1.K <-> D3.A D2.K <-> D4.A diff --git a/diylc-regression-data/input/user-files/png/2555X BOARD LAYOUT RESaddTSRELAYnew.png b/diylc-regression-data/input/user-files/png/2555X BOARD LAYOUT RESaddTSRELAYnew.png index 8abe28ff..e3cba4ab 100644 Binary files a/diylc-regression-data/input/user-files/png/2555X BOARD LAYOUT RESaddTSRELAYnew.png and b/diylc-regression-data/input/user-files/png/2555X BOARD LAYOUT RESaddTSRELAYnew.png differ diff --git a/diylc-regression-data/input/user-files/png/Bus decoder board (RL,Z2,Z1,Z0).png b/diylc-regression-data/input/user-files/png/Bus decoder board (RL,Z2,Z1,Z0).png index 10279888..1f971c20 100644 Binary files a/diylc-regression-data/input/user-files/png/Bus decoder board (RL,Z2,Z1,Z0).png and b/diylc-regression-data/input/user-files/png/Bus decoder board (RL,Z2,Z1,Z0).png differ diff --git a/diylc-regression-data/input/user-files/png/DR18Tagstrip.png b/diylc-regression-data/input/user-files/png/DR18Tagstrip.png index 32b803c0..47a5b9b2 100644 Binary files a/diylc-regression-data/input/user-files/png/DR18Tagstrip.png and b/diylc-regression-data/input/user-files/png/DR18Tagstrip.png differ diff --git a/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png b/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png index 7766623f..b9786361 100644 Binary files a/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png and b/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png differ diff --git a/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png b/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png index 077f0ad6..4446b8e5 100644 Binary files a/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png and b/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png differ diff --git a/diylc-regression-data/input/user-files/png/LargeBandMaster.png b/diylc-regression-data/input/user-files/png/LargeBandMaster.png index 4caafb85..6af59fc1 100644 Binary files a/diylc-regression-data/input/user-files/png/LargeBandMaster.png and b/diylc-regression-data/input/user-files/png/LargeBandMaster.png differ diff --git a/diylc-regression-data/input/user-files/png/RAM board 2.png b/diylc-regression-data/input/user-files/png/RAM board 2.png index 9db1feff..504e11e5 100644 Binary files a/diylc-regression-data/input/user-files/png/RAM board 2.png and b/diylc-regression-data/input/user-files/png/RAM board 2.png differ diff --git a/diylc-regression-data/input/user-files/png/Radio Amp Noval.png b/diylc-regression-data/input/user-files/png/Radio Amp Noval.png index c4adf22e..91356890 100644 Binary files a/diylc-regression-data/input/user-files/png/Radio Amp Noval.png and b/diylc-regression-data/input/user-files/png/Radio Amp Noval.png differ diff --git a/diylc-regression-data/input/user-files/png/Register board (LSB).png b/diylc-regression-data/input/user-files/png/Register board (LSB).png index 9b593e9d..140e41c7 100644 Binary files a/diylc-regression-data/input/user-files/png/Register board (LSB).png and b/diylc-regression-data/input/user-files/png/Register board (LSB).png differ diff --git a/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png b/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png index 0ad838a6..9819b984 100644 Binary files a/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png and b/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png differ diff --git a/diylc-regression-data/input/user-files/png/Stack Pointer board.png b/diylc-regression-data/input/user-files/png/Stack Pointer board.png index d206f1fd..fd07cd09 100644 Binary files a/diylc-regression-data/input/user-files/png/Stack Pointer board.png and b/diylc-regression-data/input/user-files/png/Stack Pointer board.png differ diff --git a/diylc-regression-data/input/user-files/png/Synth Oscllator_v1.png b/diylc-regression-data/input/user-files/png/Synth Oscllator_v1.png index 509c94ad..97ae4506 100644 Binary files a/diylc-regression-data/input/user-files/png/Synth Oscllator_v1.png and b/diylc-regression-data/input/user-files/png/Synth Oscllator_v1.png differ diff --git a/diylc-regression-data/input/user-files/png/dist_layout.png b/diylc-regression-data/input/user-files/png/dist_layout.png index ee513d0e..5bb8ab60 100644 Binary files a/diylc-regression-data/input/user-files/png/dist_layout.png and b/diylc-regression-data/input/user-files/png/dist_layout.png differ diff --git a/diylc-regression-data/input/v1/png/9V_supply_regulated.png b/diylc-regression-data/input/v1/png/9V_supply_regulated.png index d71723cf..9a9bf23b 100644 Binary files a/diylc-regression-data/input/v1/png/9V_supply_regulated.png and b/diylc-regression-data/input/v1/png/9V_supply_regulated.png differ diff --git a/diylc-regression-data/input/v1/png/antiquity_fuzz.png b/diylc-regression-data/input/v1/png/antiquity_fuzz.png index 72dd51f3..af698b35 100644 Binary files a/diylc-regression-data/input/v1/png/antiquity_fuzz.png and b/diylc-regression-data/input/v1/png/antiquity_fuzz.png differ diff --git a/diylc-regression-data/input/v1/png/b_blender.png b/diylc-regression-data/input/v1/png/b_blender.png index 943cd13c..6e12f221 100644 Binary files a/diylc-regression-data/input/v1/png/b_blender.png and b/diylc-regression-data/input/v1/png/b_blender.png differ diff --git a/diylc-regression-data/input/v1/png/bixonix_expandora.png b/diylc-regression-data/input/v1/png/bixonix_expandora.png index 7846fac2..358757a1 100644 Binary files a/diylc-regression-data/input/v1/png/bixonix_expandora.png and b/diylc-regression-data/input/v1/png/bixonix_expandora.png differ diff --git a/diylc-regression-data/input/v1/png/dallas_rangemaster_pcb.png b/diylc-regression-data/input/v1/png/dallas_rangemaster_pcb.png index 4342eb95..08cbb18d 100644 Binary files a/diylc-regression-data/input/v1/png/dallas_rangemaster_pcb.png and b/diylc-regression-data/input/v1/png/dallas_rangemaster_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/dyna_comp_perf.png b/diylc-regression-data/input/v1/png/dyna_comp_perf.png index 0663d787..12528c2f 100644 Binary files a/diylc-regression-data/input/v1/png/dyna_comp_perf.png and b/diylc-regression-data/input/v1/png/dyna_comp_perf.png differ diff --git a/diylc-regression-data/input/v1/png/eh_octave_multiplexer.png b/diylc-regression-data/input/v1/png/eh_octave_multiplexer.png index a4689ccb..8311b841 100644 Binary files a/diylc-regression-data/input/v1/png/eh_octave_multiplexer.png and b/diylc-regression-data/input/v1/png/eh_octave_multiplexer.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_ruby.png b/diylc-regression-data/input/v1/png/fetzer_ruby.png index f10073cb..3662f86b 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_ruby.png and b/diylc-regression-data/input/v1/png/fetzer_ruby.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve.png b/diylc-regression-data/input/v1/png/fetzer_valve.png index e1a9a487..f795956c 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve.png and b/diylc-regression-data/input/v1/png/fetzer_valve.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_2.png b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_2.png index 512d6a2b..c37454fa 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_2.png and b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_2.png differ diff --git a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_perf.png b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_perf.png index aae02a5b..8db80093 100644 Binary files a/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_perf.png and b/diylc-regression-data/input/v1/png/fetzer_valve_deluxe_perf.png differ diff --git a/diylc-regression-data/input/v1/png/flexi_clip.png b/diylc-regression-data/input/v1/png/flexi_clip.png index 475b660d..80050b8e 100644 Binary files a/diylc-regression-data/input/v1/png/flexi_clip.png and b/diylc-regression-data/input/v1/png/flexi_clip.png differ diff --git a/diylc-regression-data/input/v1/png/ga5t_preamp.png b/diylc-regression-data/input/v1/png/ga5t_preamp.png index 2450ffdf..ccb01198 100644 Binary files a/diylc-regression-data/input/v1/png/ga5t_preamp.png and b/diylc-regression-data/input/v1/png/ga5t_preamp.png differ diff --git a/diylc-regression-data/input/v1/png/lxh2_marshall_amp_sim.png b/diylc-regression-data/input/v1/png/lxh2_marshall_amp_sim.png index 5a10ceb0..c0c72883 100644 Binary files a/diylc-regression-data/input/v1/png/lxh2_marshall_amp_sim.png and b/diylc-regression-data/input/v1/png/lxh2_marshall_amp_sim.png differ diff --git a/diylc-regression-data/input/v1/png/orange_treble_bass_booster_2.png b/diylc-regression-data/input/v1/png/orange_treble_bass_booster_2.png index 23695059..c097b423 100644 Binary files a/diylc-regression-data/input/v1/png/orange_treble_bass_booster_2.png and b/diylc-regression-data/input/v1/png/orange_treble_bass_booster_2.png differ diff --git a/diylc-regression-data/input/v1/png/puzzle87_comp.png b/diylc-regression-data/input/v1/png/puzzle87_comp.png index 102fc31d..4d29ff95 100644 Binary files a/diylc-regression-data/input/v1/png/puzzle87_comp.png and b/diylc-regression-data/input/v1/png/puzzle87_comp.png differ diff --git a/diylc-regression-data/input/v1/png/roger_mayer_octavia_vero.png b/diylc-regression-data/input/v1/png/roger_mayer_octavia_vero.png index 7411125b..e4546da2 100644 Binary files a/diylc-regression-data/input/v1/png/roger_mayer_octavia_vero.png and b/diylc-regression-data/input/v1/png/roger_mayer_octavia_vero.png differ diff --git a/diylc-regression-data/input/v1/png/shaka_hv.png b/diylc-regression-data/input/v1/png/shaka_hv.png index c72ecb70..45074fa4 100644 Binary files a/diylc-regression-data/input/v1/png/shaka_hv.png and b/diylc-regression-data/input/v1/png/shaka_hv.png differ diff --git a/diylc-regression-data/input/v1/png/signal_gen.png b/diylc-regression-data/input/v1/png/signal_gen.png index 16403776..89320dff 100644 Binary files a/diylc-regression-data/input/v1/png/signal_gen.png and b/diylc-regression-data/input/v1/png/signal_gen.png differ diff --git a/diylc-regression-data/input/v1/png/soapdodger2.png b/diylc-regression-data/input/v1/png/soapdodger2.png index 0b580209..8fcb53fe 100644 Binary files a/diylc-regression-data/input/v1/png/soapdodger2.png and b/diylc-regression-data/input/v1/png/soapdodger2.png differ diff --git a/diylc-regression-data/input/v1/png/wah2.png b/diylc-regression-data/input/v1/png/wah2.png index 9ba85d3b..dbd55efb 100644 Binary files a/diylc-regression-data/input/v1/png/wah2.png and b/diylc-regression-data/input/v1/png/wah2.png differ diff --git a/diylc-regression-data/reports/2026-11-04T16_54_22.967621-V6_10_0.csv b/diylc-regression-data/reports/2026-11-04T16_54_22.967621-V6_10_0.csv new file mode 100644 index 00000000..f74b6388 --- /dev/null +++ b/diylc-regression-data/reports/2026-11-04T16_54_22.967621-V6_10_0.csv @@ -0,0 +1,102 @@ +OK,Failed,Total Time,Avg Time +38,59,278979,2876 + + +File,Status,Message,Time +12v_supply.diy,OK,,3351 +211.diy,FAILED,Images do not match!,1890 +255.diy,OK,File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

Could not recognize component type Transformer
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

Could not recognize component type Jack
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

Unsupported toggle switch dimensions
File was opened, but there were some issues with it:

Could not recognize component type Jack
File was opened, but there were some issues with it:

Could not recognize component type Jack
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

Could not recognize component type Jack
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

Could not recognize component type Jack
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
File was opened, but there were some issues with it:

The project references unknown component properties, most likely because it was created with a newer version of DIYLC.
{ @Override public int compareTo(Group o) { - return toString().compareToIgnoreCase(o.toString()); + String text = toString(); + String otherText = o.toString(); + int comparison = text.compareToIgnoreCase(otherText); + return comparison != 0 ? comparison : text.compareTo(otherText); } @Override diff --git a/diylc/diylc-core/src/main/java/org/diylc/netlist/Node.java b/diylc/diylc-core/src/main/java/org/diylc/netlist/Node.java index ef9bec10..9161bfd6 100644 --- a/diylc/diylc-core/src/main/java/org/diylc/netlist/Node.java +++ b/diylc/diylc-core/src/main/java/org/diylc/netlist/Node.java @@ -23,6 +23,7 @@ package org.diylc.netlist; import java.awt.geom.Point2D; import java.util.Arrays; +import java.util.Comparator; import java.util.HashSet; import java.util.Objects; import java.util.Set; @@ -41,6 +42,13 @@ public class Node implements Comparable { private static final Set NON_NET_NAMES = new HashSet(Arrays.asList("NC", "RSV", "IC")); + /** + * Orders points top to bottom, then left to right. Breaks ties between parts that share a name: + * where a part sits is the same in every run, unlike the order a hash set yields it in. + */ + static final Comparator LOCATION_ORDER = Comparator.nullsLast( + Comparator.comparingDouble(Point2D::getY).thenComparingDouble(Point2D::getX)); + private IDIYComponent component; private int pointIndex; @@ -137,6 +145,15 @@ public class Node implements Comparable { @Override public int compareTo(Node o) { - return toString().compareToIgnoreCase(o.toString()); + String name = toString(); + String otherName = o.toString(); + int comparison = name.compareToIgnoreCase(otherName); + if (comparison == 0) { + comparison = name.compareTo(otherName); + } + if (comparison == 0) { + comparison = LOCATION_ORDER.compare(getPoint2D(), o.getPoint2D()); + } + return comparison != 0 ? comparison : Integer.compare(pointIndex, o.pointIndex); } } diff --git a/diylc/diylc-core/src/main/java/org/diylc/netlist/Position.java b/diylc/diylc-core/src/main/java/org/diylc/netlist/Position.java index 9a1a1361..d6f468c0 100644 --- a/diylc/diylc-core/src/main/java/org/diylc/netlist/Position.java +++ b/diylc/diylc-core/src/main/java/org/diylc/netlist/Position.java @@ -21,6 +21,8 @@ */ package org.diylc.netlist; +import java.awt.geom.Point2D; + import org.diylc.core.IDIYComponent; import org.diylc.core.ISwitch; @@ -84,9 +86,20 @@ public class Position implements Comparable { @Override public int compareTo(Position o) { int comparison = getSwitchName().compareToIgnoreCase(o.getSwitchName()); - return comparison != 0 - ? comparison - : Integer.compare(position, o.position); + if (comparison == 0) { + comparison = getSwitchName().compareTo(o.getSwitchName()); + } + // switches that share a name keep apart by location, so a setup reads the same in every run + if (comparison == 0) { + comparison = Node.LOCATION_ORDER.compare(getSwitchLocation(), o.getSwitchLocation()); + } + return comparison != 0 ? comparison : Integer.compare(position, o.position); + } + + private Point2D getSwitchLocation() { + return theSwitch instanceof IDIYComponent component && component.getControlPointCount() > 0 + ? component.getControlPoint(0) + : null; } String getSwitchName() { diff --git a/diylc/diylc-core/src/main/java/org/diylc/netlist/SwitchSetup.java b/diylc/diylc-core/src/main/java/org/diylc/netlist/SwitchSetup.java index d5203556..ca51a532 100644 --- a/diylc/diylc-core/src/main/java/org/diylc/netlist/SwitchSetup.java +++ b/diylc/diylc-core/src/main/java/org/diylc/netlist/SwitchSetup.java @@ -124,6 +124,7 @@ public class SwitchSetup implements Comparable { } // Same earliest full configuration: use the description as a tie-breaker. - return toString().compareToIgnoreCase(o.toString()); + int comparison = toString().compareToIgnoreCase(o.toString()); + return comparison != 0 ? comparison : toString().compareTo(o.toString()); } } diff --git a/diylc/diylc-core/src/test/java/org/diylc/netlist/NetlistSortingTest.java b/diylc/diylc-core/src/test/java/org/diylc/netlist/NetlistSortingTest.java new file mode 100644 index 00000000..accf0324 --- /dev/null +++ b/diylc/diylc-core/src/test/java/org/diylc/netlist/NetlistSortingTest.java @@ -0,0 +1,86 @@ +/* + * + * DIY Layout Creator (DIYLC). + * Copyright (c) 2009-2025 held jointly by the individual authors. + * + * This file is part of DIYLC. + * + * DIYLC is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * DIYLC is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with DIYLC. If not, see . + * + */ +package org.diylc.netlist; + +import java.awt.geom.Point2D; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; + +import org.diylc.testcomponents.OnePointTestComponent; +import org.diylc.testcomponents.SwitchTestComponent; + +public class NetlistSortingTest { + + @Test + public void namesDifferingOnlyInCaseSortTheSameEitherWay() { + Node lower = new Node(new OnePointTestComponent("1k 2w", "2", new Point2D.Double(0, 0)), 0); + Node upper = new Node(new OnePointTestComponent("1k 2W", "2", new Point2D.Double(0, 0)), 0); + + Assert.assertEquals(sorted(lower, upper), sorted(upper, lower)); + } + + @Test + public void sameNamedPartsSortByLocation() { + Node top = new Node(new OnePointTestComponent("R1", "1", new Point2D.Double(50, 0)), 0); + Node bottom = new Node(new OnePointTestComponent("R1", "1", new Point2D.Double(0, 10)), 0); + + Assert.assertEquals(Arrays.asList(top, bottom), sorted(bottom, top)); + Assert.assertEquals(Arrays.asList(top, bottom), sorted(top, bottom)); + } + + @Test + public void sameNamedSwitchesKeepTheirPlaceInASetup() { + SwitchTestComponent upper = switchAt(0); + SwitchTestComponent lower = switchAt(10); + + SwitchSetup upperOn = setup(new Position(lower, 1), new Position(upper, 0)); + SwitchSetup lowerOn = setup(new Position(upper, 1), new Position(lower, 0)); + + Assert.assertEquals("SW1.ON:SW1.OFF", upperOn.toString()); + Assert.assertEquals("SW1.OFF:SW1.ON", lowerOn.toString()); + Assert.assertEquals(-Integer.signum(lowerOn.compareTo(upperOn)), + Integer.signum(upperOn.compareTo(lowerOn))); + Assert.assertNotEquals(0, upperOn.compareTo(lowerOn)); + } + + private static List sorted(Node... nodes) { + List list = new ArrayList(Arrays.asList(nodes)); + Collections.sort(list); + return list; + } + + private static SwitchTestComponent switchAt(double y) { + SwitchTestComponent component = new SwitchTestComponent("SW1"); + component.setControlPoint(new Point2D.Double(0, y), 0); + component.setControlPoint(new Point2D.Double(10, y), 1); + return component; + } + + private static SwitchSetup setup(Position... positions) { + return new SwitchSetup(new ArrayList(Arrays.asList(positions))); + } +}