diff --git a/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt index b9a935b9..31cc83bb 100644 --- a/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt @@ -8,7 +8,7 @@ Switch setup: [Default] C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND4 <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt index 59de25b5..c5d5e635 100644 --- a/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt @@ -7,7 +7,7 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2] C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND4 <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 @@ -27,7 +27,7 @@ Switch setup: [.ON2:.ON1, .ON2:.ON2] C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND4 <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt index b9a935b9..31cc83bb 100644 --- a/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt @@ -8,7 +8,7 @@ Switch setup: [Default] C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND4 <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt index 59de25b5..c5d5e635 100644 --- a/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt @@ -7,7 +7,7 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2] C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND4 <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 @@ -27,7 +27,7 @@ Switch setup: [.ON2:.ON1, .ON2:.ON2] C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND4 <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/212_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/212_excl_switches.txt index 7a158ac0..0d934139 100644 --- a/diylc-regression-data/input/cloud/netlist/212_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/212_excl_switches.txt @@ -1,8 +1,6 @@ Switch setup: [Default] - C1.2 <-> GND2 - C2.2 <-> GND3 - C3.2 <-> GND5 + C1.2 <-> C2.2 <-> C3.2 <-> GND D2.1 <-> D2.2 D4.1 <-> D4.2 R10.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/212_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/212_incl_switches.txt index 7a158ac0..0d934139 100644 --- a/diylc-regression-data/input/cloud/netlist/212_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/212_incl_switches.txt @@ -1,8 +1,6 @@ Switch setup: [Default] - C1.2 <-> GND2 - C2.2 <-> GND3 - C3.2 <-> GND5 + C1.2 <-> C2.2 <-> C3.2 <-> GND D2.1 <-> D2.2 D4.1 <-> D4.2 R10.1 <-> R2.2 diff --git a/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt index b9a935b9..31cc83bb 100644 --- a/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt @@ -8,7 +8,7 @@ Switch setup: [Default] C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND4 <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt index 59de25b5..c5d5e635 100644 --- a/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt @@ -7,7 +7,7 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2] C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND4 <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 @@ -27,7 +27,7 @@ Switch setup: [.ON2:.ON1, .ON2:.ON2] C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1 C4.1 <-> Q1.1 <-> Q2.2 C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2 - C4.2 <-> D1.1 <-> GND4 <-> Q3.Q3.2 <-> R2.2 <-> R3.1 + C4.2 <-> D1.1 <-> GND <-> Q3.Q3.2 <-> R2.2 <-> R3.1 C5.1 <-> C6.1 C6.1 <-> Q2.1 <-> R7.1 C6.2 <-> Q3.2 <-> R5.2 diff --git a/diylc-regression-data/input/cloud/netlist/242_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/242_excl_switches.txt index 20fd6803..c27187c6 100644 --- a/diylc-regression-data/input/cloud/netlist/242_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/242_excl_switches.txt @@ -3,10 +3,9 @@ Switch setup: [Default] C2.1 <-> GAIN.1 C2.2 <-> R1.2 C4.1 <-> Secteur 9V.Secteur 9V.+ - C4.2 <-> GND4 + C4.2 <-> C6.2 <-> GND C5.2 <-> R4.1 C6.1 <-> TREBLE.3 - C6.2 <-> GND6 R4.2 <-> VOLUME.2 TREBLE.2 <-> VOLUME.1 diff --git a/diylc-regression-data/input/cloud/netlist/242_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/242_incl_switches.txt index 20fd6803..c27187c6 100644 --- a/diylc-regression-data/input/cloud/netlist/242_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/242_incl_switches.txt @@ -3,10 +3,9 @@ Switch setup: [Default] C2.1 <-> GAIN.1 C2.2 <-> R1.2 C4.1 <-> Secteur 9V.Secteur 9V.+ - C4.2 <-> GND4 + C4.2 <-> C6.2 <-> GND C5.2 <-> R4.1 C6.1 <-> TREBLE.3 - C6.2 <-> GND6 R4.2 <-> VOLUME.2 TREBLE.2 <-> VOLUME.1 diff --git a/diylc-regression-data/input/cloud/netlist/243_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/243_excl_switches.txt index 98ef1246..3119c302 100644 --- a/diylc-regression-data/input/cloud/netlist/243_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/243_excl_switches.txt @@ -9,22 +9,12 @@ Switch setup: [Default] C1.1 <-> R1.2 C10.2 <-> R18.1 <-> TONE.2 C11.1 <-> R17.2 <-> TONE.3 - C11.2 <-> GND9 + C11.2 <-> C14.2 <-> GND <-> R13.2 <-> R14.2 <-> R19.2 <-> R2.2 <-> R21.2 <-> R3.2 <-> R6.2 <-> R8.2 <-> R9.2 C12.1 <-> TONE.1 - C14.2 <-> GND13 C2.2 <-> C3.1 C4.1 <-> SUSTAIN.1 C4.2 <-> R7.1 C7.2 <-> R12.1 - GND1 <-> R2.2 - GND10 <-> R19.2 - GND11 <-> R21.2 - GND2 <-> R3.2 - GND3 <-> R6.2 - GND4 <-> R8.2 - GND5 <-> R9.2 - GND6 <-> R13.2 - GND7 <-> R14.2 R19.1 <-> R20.1 R6.1 <-> SUSTAIN.3 diff --git a/diylc-regression-data/input/cloud/netlist/243_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/243_incl_switches.txt index 98ef1246..3119c302 100644 --- a/diylc-regression-data/input/cloud/netlist/243_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/243_incl_switches.txt @@ -9,22 +9,12 @@ Switch setup: [Default] C1.1 <-> R1.2 C10.2 <-> R18.1 <-> TONE.2 C11.1 <-> R17.2 <-> TONE.3 - C11.2 <-> GND9 + C11.2 <-> C14.2 <-> GND <-> R13.2 <-> R14.2 <-> R19.2 <-> R2.2 <-> R21.2 <-> R3.2 <-> R6.2 <-> R8.2 <-> R9.2 C12.1 <-> TONE.1 - C14.2 <-> GND13 C2.2 <-> C3.1 C4.1 <-> SUSTAIN.1 C4.2 <-> R7.1 C7.2 <-> R12.1 - GND1 <-> R2.2 - GND10 <-> R19.2 - GND11 <-> R21.2 - GND2 <-> R3.2 - GND3 <-> R6.2 - GND4 <-> R8.2 - GND5 <-> R9.2 - GND6 <-> R13.2 - GND7 <-> R14.2 R19.1 <-> R20.1 R6.1 <-> SUSTAIN.3 diff --git a/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt index 6795a451..dff08485 100644 --- a/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt @@ -40,7 +40,7 @@ Switch setup: [Default] 220K.1 <-> 220K.2 220K.2 <-> 68nf.2 220K.2 <-> 68nf.2 - 22uF 63v.1 <-> 22uf 63v.1 <-> D1.1 <-> D1.2 <-> D2.2 <-> D3.2 <-> GND3 <-> TREBLE.1 <-> TREBLE.2 + 22uf 63v.1 <-> 22uF 63v.1 <-> D1.1 <-> D1.2 <-> D2.2 <-> D3.2 <-> GND <-> TREBLE.1 <-> TREBLE.2 2K4.1 <-> 2K4.1 <-> 68nF.1 4,7nf.1 <-> 4,7nf.2 4,7nf.2 <-> 68nf.1 diff --git a/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt index 6795a451..dff08485 100644 --- a/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt @@ -40,7 +40,7 @@ Switch setup: [Default] 220K.1 <-> 220K.2 220K.2 <-> 68nf.2 220K.2 <-> 68nf.2 - 22uF 63v.1 <-> 22uf 63v.1 <-> D1.1 <-> D1.2 <-> D2.2 <-> D3.2 <-> GND3 <-> TREBLE.1 <-> TREBLE.2 + 22uf 63v.1 <-> 22uF 63v.1 <-> D1.1 <-> D1.2 <-> D2.2 <-> D3.2 <-> GND <-> TREBLE.1 <-> TREBLE.2 2K4.1 <-> 2K4.1 <-> 68nF.1 4,7nf.1 <-> 4,7nf.2 4,7nf.2 <-> 68nf.1 diff --git a/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt index 39182ecd..f95c40dc 100644 --- a/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt @@ -2,6 +2,6 @@ Switch setup: [Default] .1 <-> .2 <-> .3 <-> B1.B1.+ <-> J1.Ring .2 <-> .2 <-> .2 - B1.B1.- <-> GND1 <-> J1.Sleeve <-> Volume.3 + B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.3 J1.Tip <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/289_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/289_incl_switches.txt index baea938f..a822974d 100644 --- a/diylc-regression-data/input/cloud/netlist/289_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/289_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2] B1.B1.+ <-> J1.Ring - B1.B1.- <-> GND1 <-> J1.Sleeve <-> Volume.3 + B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.3 J1.Tip <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt index 4528f28b..4ebf3132 100644 --- a/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt @@ -4,11 +4,8 @@ Switch setup: [Default] 10K.2 <-> 470K.2 10K.2 <-> 470K.2 <-> IC1.2 10uF.1 <-> 470K.1 - 10uF.2 <-> GND5 + 10uF.2 <-> 1M.2 <-> 2.2nF.2 <-> D1.2 <-> GND 1M.1 <-> 2.2nF.1 <-> 22nF.1 - 1M.2 <-> GND3 2.2nF.1 <-> 22nF.1 - 2.2nF.2 <-> GND4 D1.1 <-> IC1.4 - D1.2 <-> GND1 diff --git a/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt index 4528f28b..4ebf3132 100644 --- a/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt @@ -4,11 +4,8 @@ Switch setup: [Default] 10K.2 <-> 470K.2 10K.2 <-> 470K.2 <-> IC1.2 10uF.1 <-> 470K.1 - 10uF.2 <-> GND5 + 10uF.2 <-> 1M.2 <-> 2.2nF.2 <-> D1.2 <-> GND 1M.1 <-> 2.2nF.1 <-> 22nF.1 - 1M.2 <-> GND3 2.2nF.1 <-> 22nF.1 - 2.2nF.2 <-> GND4 D1.1 <-> IC1.4 - D1.2 <-> GND1 diff --git a/diylc-regression-data/input/cloud/netlist/292_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/292_excl_switches.txt index 0301d91d..c42ec751 100644 --- a/diylc-regression-data/input/cloud/netlist/292_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/292_excl_switches.txt @@ -21,7 +21,7 @@ Switch setup: [Default] 10K.1 <-> BIAS.3 10K.2 <-> V2.8 <-> V5.8 18K 3W.1 <-> R1.1 - 18K 3W.2 <-> 1K 3W.1 <-> GND1 <-> R1.1 <-> R1.1 <-> R1.2 <-> V2.P <-> V2.P + 18K 3W.2 <-> 1K 3W.1 <-> GND <-> R1.1 <-> R1.1 <-> R1.2 <-> V2.P <-> V2.P 1N4007.1 <-> PL1.3 <-> PL1.4 <-> V2.2 <-> V2.5 1N4007.2 <-> V2.4 1N4007.2 <-> V2.6 diff --git a/diylc-regression-data/input/cloud/netlist/292_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/292_incl_switches.txt index 0301d91d..c42ec751 100644 --- a/diylc-regression-data/input/cloud/netlist/292_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/292_incl_switches.txt @@ -21,7 +21,7 @@ Switch setup: [Default] 10K.1 <-> BIAS.3 10K.2 <-> V2.8 <-> V5.8 18K 3W.1 <-> R1.1 - 18K 3W.2 <-> 1K 3W.1 <-> GND1 <-> R1.1 <-> R1.1 <-> R1.2 <-> V2.P <-> V2.P + 18K 3W.2 <-> 1K 3W.1 <-> GND <-> R1.1 <-> R1.1 <-> R1.2 <-> V2.P <-> V2.P 1N4007.1 <-> PL1.3 <-> PL1.4 <-> V2.2 <-> V2.5 1N4007.2 <-> V2.4 1N4007.2 <-> V2.6 diff --git a/diylc-regression-data/input/cloud/netlist/308_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/308_excl_switches.txt index 410f0f49..135793e9 100644 --- a/diylc-regression-data/input/cloud/netlist/308_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/308_excl_switches.txt @@ -8,5 +8,5 @@ Switch setup: [Default] .3 <-> .3 .3 <-> .6 .5 <-> J1.Tip - GND1 <-> J1.Sleeve + GND <-> J1.Sleeve diff --git a/diylc-regression-data/input/cloud/netlist/308_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/308_incl_switches.txt index a27119f5..d04e13f7 100644 --- a/diylc-regression-data/input/cloud/netlist/308_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/308_incl_switches.txt @@ -1,11 +1,11 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2] - GND1 <-> J1.Sleeve + GND <-> J1.Sleeve Volume.1 <-> Volume.3 Switch setup: [.ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2] - GND1 <-> J1.Sleeve + GND <-> J1.Sleeve J1.Tip <-> Volume.2 Volume.1 <-> Volume.3 diff --git a/diylc-regression-data/input/cloud/netlist/309_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/309_excl_switches.txt index 0c659ca6..14dc69f2 100644 --- a/diylc-regression-data/input/cloud/netlist/309_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/309_excl_switches.txt @@ -10,5 +10,5 @@ Switch setup: [Default] .3 <-> .6 .5 <-> J1.Tip .6 <-> .6 - GND1 <-> J1.Sleeve + GND <-> J1.Sleeve diff --git a/diylc-regression-data/input/cloud/netlist/309_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/309_incl_switches.txt index a27119f5..d04e13f7 100644 --- a/diylc-regression-data/input/cloud/netlist/309_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/309_incl_switches.txt @@ -1,11 +1,11 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2] - GND1 <-> J1.Sleeve + GND <-> J1.Sleeve Volume.1 <-> Volume.3 Switch setup: [.ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2] - GND1 <-> J1.Sleeve + GND <-> J1.Sleeve J1.Tip <-> Volume.2 Volume.1 <-> Volume.3 diff --git a/diylc-regression-data/input/cloud/netlist/310_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/310_excl_switches.txt index 37b4dca7..f67f55ec 100644 --- a/diylc-regression-data/input/cloud/netlist/310_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/310_excl_switches.txt @@ -14,5 +14,5 @@ Switch setup: [Default] .4 <-> .6 .5 <-> J1.Tip .6 <-> .6 - GND1 <-> J1.Sleeve + GND <-> J1.Sleeve diff --git a/diylc-regression-data/input/cloud/netlist/310_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/310_incl_switches.txt index 3b1c70a8..964ea309 100644 --- a/diylc-regression-data/input/cloud/netlist/310_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/310_incl_switches.txt @@ -1,26 +1 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON1:.ON1:.ON1:.ON3, .ON1:.ON1:.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON1:.ON1:.ON2:.ON2, .ON1:.ON1:.ON1:.ON1:.ON2:.ON3, .ON1:.ON1:.ON1:.ON2:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2:.ON1:.ON2, .ON1:.ON1:.ON1:.ON2:.ON1:.ON3, .ON1:.ON1:.ON1:.ON2:.ON2:.ON1, .ON1:.ON1:.ON1:.ON2:.ON2:.ON2, .ON1:.ON1:.ON1:.ON2:.ON2:.ON3, .ON1:.ON1:.ON2:.ON1:.ON1:.ON1, .ON1:.ON1:.ON2:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1:.ON1:.ON3, .ON1:.ON1:.ON2:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON1:.ON2:.ON2, .ON1:.ON1:.ON2:.ON1:.ON2:.ON3, .ON1:.ON1:.ON2:.ON2:.ON1:.ON1, .ON1:.ON1:.ON2:.ON2:.ON1:.ON2, .ON1:.ON1:.ON2:.ON2:.ON1:.ON3, .ON1:.ON1:.ON2:.ON2:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2:.ON2:.ON2, .ON1:.ON1:.ON2:.ON2:.ON2:.ON3, .ON1:.ON2:.ON1:.ON1:.ON1:.ON1, .ON1:.ON2:.ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1:.ON1:.ON3, .ON1:.ON2:.ON1:.ON1:.ON2:.ON1, .ON1:.ON2:.ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1:.ON2:.ON3, .ON1:.ON2:.ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON1:.ON2:.ON1:.ON3, .ON1:.ON2:.ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON1:.ON2:.ON2:.ON2, .ON1:.ON2:.ON1:.ON2:.ON2:.ON3, .ON1:.ON2:.ON2:.ON1:.ON1:.ON1, .ON1:.ON2:.ON2:.ON1:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1:.ON1:.ON3, .ON1:.ON2:.ON2:.ON1:.ON2:.ON1, .ON1:.ON2:.ON2:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1:.ON2:.ON3, .ON1:.ON2:.ON2:.ON2:.ON1:.ON1, .ON1:.ON2:.ON2:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON2:.ON1:.ON3, .ON1:.ON2:.ON2:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2:.ON2:.ON2, .ON1:.ON2:.ON2:.ON2:.ON2:.ON3] - - Bridge: North.North Start <-> Bridge: South.South Finish <-> Bridge: South.South Start - GND1 <-> J1.Sleeve - Volume.1 <-> Volume.3 - -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON3:.ON1, .ON1:.ON1:.ON1:.ON1:.ON3:.ON2, .ON1:.ON1:.ON1:.ON1:.ON3:.ON3, .ON1:.ON1:.ON1:.ON2:.ON3:.ON1, .ON1:.ON1:.ON1:.ON2:.ON3:.ON2, .ON1:.ON1:.ON1:.ON2:.ON3:.ON3, .ON1:.ON1:.ON2:.ON1:.ON3:.ON1, .ON1:.ON1:.ON2:.ON1:.ON3:.ON2, .ON1:.ON1:.ON2:.ON1:.ON3:.ON3, .ON1:.ON1:.ON2:.ON2:.ON3:.ON1, .ON1:.ON1:.ON2:.ON2:.ON3:.ON2, .ON1:.ON1:.ON2:.ON2:.ON3:.ON3, .ON1:.ON2:.ON1:.ON1:.ON3:.ON1, .ON1:.ON2:.ON1:.ON1:.ON3:.ON2, .ON1:.ON2:.ON1:.ON1:.ON3:.ON3, .ON1:.ON2:.ON1:.ON2:.ON3:.ON1, .ON1:.ON2:.ON1:.ON2:.ON3:.ON2, .ON1:.ON2:.ON1:.ON2:.ON3:.ON3, .ON1:.ON2:.ON2:.ON1:.ON3:.ON1, .ON1:.ON2:.ON2:.ON1:.ON3:.ON2, .ON1:.ON2:.ON2:.ON1:.ON3:.ON3, .ON1:.ON2:.ON2:.ON2:.ON3:.ON1, .ON1:.ON2:.ON2:.ON2:.ON3:.ON2, .ON1:.ON2:.ON2:.ON2:.ON3:.ON3] - - Bridge: North.North Start <-> Bridge: South.South Start - GND1 <-> J1.Sleeve - Volume.1 <-> Volume.3 - -Switch setup: [.ON2:.ON1:.ON1:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON1:.ON1:.ON2, .ON2:.ON1:.ON1:.ON1:.ON1:.ON3, .ON2:.ON1:.ON1:.ON1:.ON2:.ON1, .ON2:.ON1:.ON1:.ON1:.ON2:.ON2, .ON2:.ON1:.ON1:.ON1:.ON2:.ON3, .ON2:.ON1:.ON1:.ON2:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2:.ON1:.ON2, .ON2:.ON1:.ON1:.ON2:.ON1:.ON3, .ON2:.ON1:.ON1:.ON2:.ON2:.ON1, .ON2:.ON1:.ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON1:.ON2:.ON2:.ON3, .ON2:.ON1:.ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1:.ON1:.ON3, .ON2:.ON1:.ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON1:.ON2:.ON2, .ON2:.ON1:.ON2:.ON1:.ON2:.ON3, .ON2:.ON1:.ON2:.ON2:.ON1:.ON1, .ON2:.ON1:.ON2:.ON2:.ON1:.ON2, .ON2:.ON1:.ON2:.ON2:.ON1:.ON3, .ON2:.ON1:.ON2:.ON2:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2:.ON2:.ON2, .ON2:.ON1:.ON2:.ON2:.ON2:.ON3, .ON2:.ON2:.ON1:.ON1:.ON1:.ON1, .ON2:.ON2:.ON1:.ON1:.ON1:.ON2, .ON2:.ON2:.ON1:.ON1:.ON1:.ON3, .ON2:.ON2:.ON1:.ON1:.ON2:.ON1, .ON2:.ON2:.ON1:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1:.ON2:.ON3, .ON2:.ON2:.ON1:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2:.ON1:.ON2, .ON2:.ON2:.ON1:.ON2:.ON1:.ON3, .ON2:.ON2:.ON1:.ON2:.ON2:.ON1, .ON2:.ON2:.ON1:.ON2:.ON2:.ON2, .ON2:.ON2:.ON1:.ON2:.ON2:.ON3, .ON2:.ON2:.ON2:.ON1:.ON1:.ON1, .ON2:.ON2:.ON2:.ON1:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1:.ON1:.ON3, .ON2:.ON2:.ON2:.ON1:.ON2:.ON1, .ON2:.ON2:.ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON2:.ON1:.ON2:.ON3, .ON2:.ON2:.ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON2:.ON1:.ON3, .ON2:.ON2:.ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2:.ON2:.ON2, .ON2:.ON2:.ON2:.ON2:.ON2:.ON3] - - Bridge: North.North Start <-> Bridge: South.South Finish <-> Bridge: South.South Start - GND1 <-> J1.Sleeve - J1.Tip <-> Volume.2 - Volume.1 <-> Volume.3 - -Switch setup: [.ON2:.ON1:.ON1:.ON1:.ON3:.ON1, .ON2:.ON1:.ON1:.ON1:.ON3:.ON2, .ON2:.ON1:.ON1:.ON1:.ON3:.ON3, .ON2:.ON1:.ON1:.ON2:.ON3:.ON1, .ON2:.ON1:.ON1:.ON2:.ON3:.ON2, .ON2:.ON1:.ON1:.ON2:.ON3:.ON3, .ON2:.ON1:.ON2:.ON1:.ON3:.ON1, .ON2:.ON1:.ON2:.ON1:.ON3:.ON2, .ON2:.ON1:.ON2:.ON1:.ON3:.ON3, .ON2:.ON1:.ON2:.ON2:.ON3:.ON1, .ON2:.ON1:.ON2:.ON2:.ON3:.ON2, .ON2:.ON1:.ON2:.ON2:.ON3:.ON3, .ON2:.ON2:.ON1:.ON1:.ON3:.ON1, .ON2:.ON2:.ON1:.ON1:.ON3:.ON2, .ON2:.ON2:.ON1:.ON1:.ON3:.ON3, .ON2:.ON2:.ON1:.ON2:.ON3:.ON1, .ON2:.ON2:.ON1:.ON2:.ON3:.ON2, .ON2:.ON2:.ON1:.ON2:.ON3:.ON3, .ON2:.ON2:.ON2:.ON1:.ON3:.ON1, .ON2:.ON2:.ON2:.ON1:.ON3:.ON2, .ON2:.ON2:.ON2:.ON1:.ON3:.ON3, .ON2:.ON2:.ON2:.ON2:.ON3:.ON1, .ON2:.ON2:.ON2:.ON2:.ON3:.ON2, .ON2:.ON2:.ON2:.ON2:.ON3:.ON3] - - Bridge: North.North Start <-> Bridge: South.South Start - GND1 <-> J1.Sleeve - J1.Tip <-> Volume.2 - Volume.1 <-> Volume.3 - +org.diylc.netlist.NetlistException: Maximum number of switching combinations exceeded. Allowed: 64, actual: 144 \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/311_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/311_excl_switches.txt index 4bf20db2..9c1ccba6 100644 --- a/diylc-regression-data/input/cloud/netlist/311_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/311_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - .1 <-> .1 <-> .1 <-> .2 <-> .2 <-> .3 <-> .4 <-> .5 <-> .5 <-> .6 <-> C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.3 + .1 <-> .1 <-> .1 <-> .2 <-> .2 <-> .3 <-> .4 <-> .5 <-> .5 <-> .6 <-> C2.2 <-> GND <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.3 .1 <-> .2 <-> .4 <-> .5 .1 <-> .2 <-> .7 .1 <-> .2 <-> .8 <-> Bridge: South.South Finish diff --git a/diylc-regression-data/input/cloud/netlist/311_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/311_incl_switches.txt index 2c737665..ce26032b 100644 --- a/diylc-regression-data/input/cloud/netlist/311_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/311_incl_switches.txt @@ -1,64 +1 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON1:.ON1:.ON2:.ON2:.ON1, .ON1:.ON1:.ON2:.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON2:.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON1:.ON1:.ON1:.ON1:.ON1, .ON1:.ON2:.ON1:.ON1:.ON1:.ON2:.ON1, .ON1:.ON2:.ON1:.ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON1:.ON1:.ON1:.ON1, .ON1:.ON2:.ON2:.ON1:.ON1:.ON2:.ON1, .ON1:.ON2:.ON2:.ON1:.ON2:.ON2:.ON1, .ON2:.ON1:.ON1:.ON1:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON1:.ON1:.ON2:.ON1, .ON2:.ON1:.ON1:.ON1:.ON2:.ON2:.ON1, .ON2:.ON1:.ON2:.ON1:.ON1:.ON1:.ON1, .ON2:.ON1:.ON2:.ON1:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON1:.ON2:.ON2:.ON1, .ON2:.ON2:.ON1:.ON1:.ON1:.ON1:.ON1, .ON2:.ON2:.ON1:.ON1:.ON1:.ON2:.ON1, .ON2:.ON2:.ON1:.ON1:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON1:.ON1:.ON1:.ON1, .ON2:.ON2:.ON2:.ON1:.ON1:.ON2:.ON1, .ON2:.ON2:.ON2:.ON1:.ON2:.ON2:.ON1] - - Bridge: North.North Start <-> Bridge: South.South Finish <-> Bridge: South.South Start <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.1 <-> VOL / TONE.2 <-> VOL / TONE.3 - -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON1:.ON1:.ON1:.ON2:.ON2, .ON1:.ON1:.ON1:.ON1:.ON2:.ON2:.ON2, .ON1:.ON1:.ON2:.ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1:.ON1:.ON2:.ON2, .ON1:.ON1:.ON2:.ON1:.ON2:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1:.ON2:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON1:.ON1:.ON1:.ON1:.ON2, .ON2:.ON1:.ON1:.ON1:.ON1:.ON2:.ON2, .ON2:.ON1:.ON1:.ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON2:.ON1:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1:.ON1:.ON2:.ON2, .ON2:.ON1:.ON2:.ON1:.ON2:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1:.ON1:.ON1:.ON2, .ON2:.ON2:.ON1:.ON1:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1:.ON2:.ON2:.ON2, .ON2:.ON2:.ON2:.ON1:.ON1:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1:.ON1:.ON2:.ON2, .ON2:.ON2:.ON2:.ON1:.ON2:.ON2:.ON2] - - Bridge: North.North Start <-> Bridge: South.South Finish <-> Bridge: South.South Start <-> C1.1 <-> C1.2 <-> C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.3 - C2.1 <-> VOL / TONE.2 - -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON2:.ON1:.ON1, .ON1:.ON1:.ON1:.ON3:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON3:.ON1:.ON2:.ON1, .ON1:.ON1:.ON1:.ON3:.ON2:.ON1:.ON1, .ON1:.ON1:.ON1:.ON3:.ON2:.ON2:.ON1, .ON1:.ON1:.ON2:.ON1:.ON2:.ON1:.ON1, .ON1:.ON1:.ON2:.ON3:.ON1:.ON1:.ON1, .ON1:.ON1:.ON2:.ON3:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON3:.ON2:.ON1:.ON1, .ON1:.ON1:.ON2:.ON3:.ON2:.ON2:.ON1, .ON1:.ON2:.ON1:.ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON3:.ON1:.ON1:.ON1, .ON1:.ON2:.ON1:.ON3:.ON1:.ON2:.ON1, .ON1:.ON2:.ON1:.ON3:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON3:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON2:.ON3:.ON1:.ON1:.ON1, .ON1:.ON2:.ON2:.ON3:.ON1:.ON2:.ON1, .ON1:.ON2:.ON2:.ON3:.ON2:.ON1:.ON1, .ON1:.ON2:.ON2:.ON3:.ON2:.ON2:.ON1, .ON2:.ON1:.ON1:.ON1:.ON2:.ON1:.ON1, .ON2:.ON1:.ON1:.ON3:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON3:.ON1:.ON2:.ON1, .ON2:.ON1:.ON1:.ON3:.ON2:.ON1:.ON1, .ON2:.ON1:.ON1:.ON3:.ON2:.ON2:.ON1, .ON2:.ON1:.ON2:.ON1:.ON2:.ON1:.ON1, .ON2:.ON1:.ON2:.ON3:.ON1:.ON1:.ON1, .ON2:.ON1:.ON2:.ON3:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON3:.ON2:.ON1:.ON1, .ON2:.ON1:.ON2:.ON3:.ON2:.ON2:.ON1, .ON2:.ON2:.ON1:.ON1:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON3:.ON1:.ON1:.ON1, .ON2:.ON2:.ON1:.ON3:.ON1:.ON2:.ON1, .ON2:.ON2:.ON1:.ON3:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON3:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON1:.ON2:.ON1:.ON1, .ON2:.ON2:.ON2:.ON3:.ON1:.ON1:.ON1, .ON2:.ON2:.ON2:.ON3:.ON1:.ON2:.ON1, .ON2:.ON2:.ON2:.ON3:.ON2:.ON1:.ON1, .ON2:.ON2:.ON2:.ON3:.ON2:.ON2:.ON1] - - Bridge: North.North Start <-> Bridge: South.South Finish <-> Bridge: South.South Start <-> C1.1 - C2.1 <-> C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.1 <-> VOL / TONE.2 <-> VOL / TONE.3 - -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON2:.ON1:.ON2, .ON1:.ON1:.ON1:.ON3:.ON1:.ON1:.ON2, .ON1:.ON1:.ON1:.ON3:.ON1:.ON2:.ON2, .ON1:.ON1:.ON1:.ON3:.ON2:.ON1:.ON2, .ON1:.ON1:.ON1:.ON3:.ON2:.ON2:.ON2, .ON1:.ON1:.ON2:.ON1:.ON2:.ON1:.ON2, .ON1:.ON1:.ON2:.ON3:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON3:.ON1:.ON2:.ON2, .ON1:.ON1:.ON2:.ON3:.ON2:.ON1:.ON2, .ON1:.ON1:.ON2:.ON3:.ON2:.ON2:.ON2, .ON1:.ON2:.ON1:.ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON1:.ON3:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON3:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON3:.ON2:.ON1:.ON2, .ON1:.ON2:.ON1:.ON3:.ON2:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON3:.ON1:.ON1:.ON2, .ON1:.ON2:.ON2:.ON3:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON3:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON3:.ON2:.ON2:.ON2, .ON2:.ON1:.ON1:.ON1:.ON2:.ON1:.ON2, .ON2:.ON1:.ON1:.ON3:.ON1:.ON1:.ON2, .ON2:.ON1:.ON1:.ON3:.ON1:.ON2:.ON2, .ON2:.ON1:.ON1:.ON3:.ON2:.ON1:.ON2, .ON2:.ON1:.ON1:.ON3:.ON2:.ON2:.ON2, .ON2:.ON1:.ON2:.ON1:.ON2:.ON1:.ON2, .ON2:.ON1:.ON2:.ON3:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON3:.ON1:.ON2:.ON2, .ON2:.ON1:.ON2:.ON3:.ON2:.ON1:.ON2, .ON2:.ON1:.ON2:.ON3:.ON2:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1:.ON2:.ON1:.ON2, .ON2:.ON2:.ON1:.ON3:.ON1:.ON1:.ON2, .ON2:.ON2:.ON1:.ON3:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON3:.ON2:.ON1:.ON2, .ON2:.ON2:.ON1:.ON3:.ON2:.ON2:.ON2, .ON2:.ON2:.ON2:.ON1:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON3:.ON1:.ON1:.ON2, .ON2:.ON2:.ON2:.ON3:.ON1:.ON2:.ON2, .ON2:.ON2:.ON2:.ON3:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON3:.ON2:.ON2:.ON2] - - Bridge: North.North Start <-> Bridge: South.South Finish <-> Bridge: South.South Start <-> C1.1 - C2.1 <-> VOL / TONE.2 - C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.3 - -Switch setup: [.ON1:.ON1:.ON1:.ON2:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2:.ON1:.ON2:.ON1, .ON1:.ON1:.ON1:.ON2:.ON2:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2:.ON2:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2:.ON1:.ON1:.ON1, .ON1:.ON1:.ON2:.ON2:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2:.ON2:.ON1:.ON1, .ON1:.ON1:.ON2:.ON2:.ON2:.ON2:.ON1, .ON1:.ON2:.ON1:.ON2:.ON1:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2:.ON1:.ON2:.ON1, .ON1:.ON2:.ON1:.ON2:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2:.ON1:.ON1:.ON1, .ON1:.ON2:.ON2:.ON2:.ON1:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2:.ON2:.ON1:.ON1, .ON1:.ON2:.ON2:.ON2:.ON2:.ON2:.ON1, .ON2:.ON1:.ON1:.ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON1:.ON2:.ON2:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2:.ON2:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON2:.ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2:.ON2:.ON1:.ON1, .ON2:.ON1:.ON2:.ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON1:.ON2:.ON1:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2:.ON1:.ON2:.ON1, .ON2:.ON2:.ON1:.ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2:.ON1:.ON1:.ON1, .ON2:.ON2:.ON2:.ON2:.ON1:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON2:.ON2:.ON2:.ON2:.ON1] - - Bridge: North.North Start <-> Bridge: South.South Finish <-> Bridge: South.South Start <-> C1.1 <-> C1.2 - C2.1 <-> C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.1 <-> VOL / TONE.2 <-> VOL / TONE.3 - -Switch setup: [.ON1:.ON1:.ON1:.ON2:.ON1:.ON1:.ON2, .ON1:.ON1:.ON1:.ON2:.ON1:.ON2:.ON2, .ON1:.ON1:.ON1:.ON2:.ON2:.ON1:.ON2, .ON1:.ON1:.ON1:.ON2:.ON2:.ON2:.ON2, .ON1:.ON1:.ON2:.ON2:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON2:.ON1:.ON2:.ON2, .ON1:.ON1:.ON2:.ON2:.ON2:.ON1:.ON2, .ON1:.ON1:.ON2:.ON2:.ON2:.ON2:.ON2, .ON1:.ON2:.ON1:.ON2:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON2:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON2:.ON2:.ON1:.ON2, .ON1:.ON2:.ON1:.ON2:.ON2:.ON2:.ON2, .ON1:.ON2:.ON2:.ON2:.ON1:.ON1:.ON2, .ON1:.ON2:.ON2:.ON2:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON2:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON2:.ON2:.ON2:.ON2, .ON2:.ON1:.ON1:.ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON1:.ON2:.ON1:.ON2:.ON2, .ON2:.ON1:.ON1:.ON2:.ON2:.ON1:.ON2, .ON2:.ON1:.ON1:.ON2:.ON2:.ON2:.ON2, .ON2:.ON1:.ON2:.ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON2:.ON1:.ON2:.ON2, .ON2:.ON1:.ON2:.ON2:.ON2:.ON1:.ON2, .ON2:.ON1:.ON2:.ON2:.ON2:.ON2:.ON2, .ON2:.ON2:.ON1:.ON2:.ON1:.ON1:.ON2, .ON2:.ON2:.ON1:.ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON1:.ON2:.ON2:.ON2:.ON2, .ON2:.ON2:.ON2:.ON2:.ON1:.ON1:.ON2, .ON2:.ON2:.ON2:.ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON2:.ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON2:.ON2:.ON2:.ON2] - - Bridge: North.North Start <-> Bridge: South.South Finish <-> Bridge: South.South Start <-> C1.1 <-> C1.2 - C2.1 <-> VOL / TONE.2 - C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.3 - -Switch setup: [.ON1:.ON1:.ON3:.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON3:.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON3:.ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON3:.ON1:.ON1:.ON1:.ON1, .ON1:.ON2:.ON3:.ON1:.ON1:.ON2:.ON1, .ON1:.ON2:.ON3:.ON1:.ON2:.ON2:.ON1, .ON2:.ON1:.ON3:.ON1:.ON1:.ON1:.ON1, .ON2:.ON1:.ON3:.ON1:.ON1:.ON2:.ON1, .ON2:.ON1:.ON3:.ON1:.ON2:.ON2:.ON1, .ON2:.ON2:.ON3:.ON1:.ON1:.ON1:.ON1, .ON2:.ON2:.ON3:.ON1:.ON1:.ON2:.ON1, .ON2:.ON2:.ON3:.ON1:.ON2:.ON2:.ON1] - - Bridge: North.North Start <-> Bridge: South.South Start <-> C1.1 - Bridge: South.South Finish <-> C1.2 <-> C2.1 <-> C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.1 <-> VOL / TONE.2 <-> VOL / TONE.3 - -Switch setup: [.ON1:.ON1:.ON3:.ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON3:.ON1:.ON1:.ON2:.ON2, .ON1:.ON1:.ON3:.ON1:.ON2:.ON2:.ON2, .ON1:.ON2:.ON3:.ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON3:.ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON3:.ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON3:.ON1:.ON1:.ON1:.ON2, .ON2:.ON1:.ON3:.ON1:.ON1:.ON2:.ON2, .ON2:.ON1:.ON3:.ON1:.ON2:.ON2:.ON2, .ON2:.ON2:.ON3:.ON1:.ON1:.ON1:.ON2, .ON2:.ON2:.ON3:.ON1:.ON1:.ON2:.ON2, .ON2:.ON2:.ON3:.ON1:.ON2:.ON2:.ON2] - - Bridge: North.North Start <-> Bridge: South.South Start <-> C1.1 - Bridge: South.South Finish <-> C1.2 <-> C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.3 - C2.1 <-> VOL / TONE.2 - -Switch setup: [.ON1:.ON1:.ON3:.ON1:.ON2:.ON1:.ON1, .ON1:.ON1:.ON3:.ON3:.ON1:.ON1:.ON1, .ON1:.ON1:.ON3:.ON3:.ON1:.ON2:.ON1, .ON1:.ON1:.ON3:.ON3:.ON2:.ON1:.ON1, .ON1:.ON1:.ON3:.ON3:.ON2:.ON2:.ON1, .ON1:.ON2:.ON3:.ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON3:.ON3:.ON1:.ON1:.ON1, .ON1:.ON2:.ON3:.ON3:.ON1:.ON2:.ON1, .ON1:.ON2:.ON3:.ON3:.ON2:.ON1:.ON1, .ON1:.ON2:.ON3:.ON3:.ON2:.ON2:.ON1, .ON2:.ON1:.ON3:.ON1:.ON2:.ON1:.ON1, .ON2:.ON1:.ON3:.ON3:.ON1:.ON1:.ON1, .ON2:.ON1:.ON3:.ON3:.ON1:.ON2:.ON1, .ON2:.ON1:.ON3:.ON3:.ON2:.ON1:.ON1, .ON2:.ON1:.ON3:.ON3:.ON2:.ON2:.ON1, .ON2:.ON2:.ON3:.ON1:.ON2:.ON1:.ON1, .ON2:.ON2:.ON3:.ON3:.ON1:.ON1:.ON1, .ON2:.ON2:.ON3:.ON3:.ON1:.ON2:.ON1, .ON2:.ON2:.ON3:.ON3:.ON2:.ON1:.ON1, .ON2:.ON2:.ON3:.ON3:.ON2:.ON2:.ON1] - - Bridge: North.North Start <-> Bridge: South.South Start <-> C1.1 - C2.1 <-> C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.1 <-> VOL / TONE.2 <-> VOL / TONE.3 - -Switch setup: [.ON1:.ON1:.ON3:.ON1:.ON2:.ON1:.ON2, .ON1:.ON1:.ON3:.ON3:.ON1:.ON1:.ON2, .ON1:.ON1:.ON3:.ON3:.ON1:.ON2:.ON2, .ON1:.ON1:.ON3:.ON3:.ON2:.ON1:.ON2, .ON1:.ON1:.ON3:.ON3:.ON2:.ON2:.ON2, .ON1:.ON2:.ON3:.ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON3:.ON3:.ON1:.ON1:.ON2, .ON1:.ON2:.ON3:.ON3:.ON1:.ON2:.ON2, .ON1:.ON2:.ON3:.ON3:.ON2:.ON1:.ON2, .ON1:.ON2:.ON3:.ON3:.ON2:.ON2:.ON2, .ON2:.ON1:.ON3:.ON1:.ON2:.ON1:.ON2, .ON2:.ON1:.ON3:.ON3:.ON1:.ON1:.ON2, .ON2:.ON1:.ON3:.ON3:.ON1:.ON2:.ON2, .ON2:.ON1:.ON3:.ON3:.ON2:.ON1:.ON2, .ON2:.ON1:.ON3:.ON3:.ON2:.ON2:.ON2, .ON2:.ON2:.ON3:.ON1:.ON2:.ON1:.ON2, .ON2:.ON2:.ON3:.ON3:.ON1:.ON1:.ON2, .ON2:.ON2:.ON3:.ON3:.ON1:.ON2:.ON2, .ON2:.ON2:.ON3:.ON3:.ON2:.ON1:.ON2, .ON2:.ON2:.ON3:.ON3:.ON2:.ON2:.ON2] - - Bridge: North.North Start <-> Bridge: South.South Start <-> C1.1 - C2.1 <-> VOL / TONE.2 - C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.3 - -Switch setup: [.ON1:.ON1:.ON3:.ON2:.ON1:.ON1:.ON1, .ON1:.ON1:.ON3:.ON2:.ON1:.ON2:.ON1, .ON1:.ON1:.ON3:.ON2:.ON2:.ON1:.ON1, .ON1:.ON1:.ON3:.ON2:.ON2:.ON2:.ON1, .ON1:.ON2:.ON3:.ON2:.ON1:.ON1:.ON1, .ON1:.ON2:.ON3:.ON2:.ON1:.ON2:.ON1, .ON1:.ON2:.ON3:.ON2:.ON2:.ON1:.ON1, .ON1:.ON2:.ON3:.ON2:.ON2:.ON2:.ON1, .ON2:.ON1:.ON3:.ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON3:.ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON3:.ON2:.ON2:.ON1:.ON1, .ON2:.ON1:.ON3:.ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON3:.ON2:.ON1:.ON1:.ON1, .ON2:.ON2:.ON3:.ON2:.ON1:.ON2:.ON1, .ON2:.ON2:.ON3:.ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON3:.ON2:.ON2:.ON2:.ON1] - - Bridge: North.North Start <-> Bridge: South.South Start <-> C1.1 <-> C1.2 - C2.1 <-> C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.1 <-> VOL / TONE.2 <-> VOL / TONE.3 - -Switch setup: [.ON1:.ON1:.ON3:.ON2:.ON1:.ON1:.ON2, .ON1:.ON1:.ON3:.ON2:.ON1:.ON2:.ON2, .ON1:.ON1:.ON3:.ON2:.ON2:.ON1:.ON2, .ON1:.ON1:.ON3:.ON2:.ON2:.ON2:.ON2, .ON1:.ON2:.ON3:.ON2:.ON1:.ON1:.ON2, .ON1:.ON2:.ON3:.ON2:.ON1:.ON2:.ON2, .ON1:.ON2:.ON3:.ON2:.ON2:.ON1:.ON2, .ON1:.ON2:.ON3:.ON2:.ON2:.ON2:.ON2, .ON2:.ON1:.ON3:.ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON3:.ON2:.ON1:.ON2:.ON2, .ON2:.ON1:.ON3:.ON2:.ON2:.ON1:.ON2, .ON2:.ON1:.ON3:.ON2:.ON2:.ON2:.ON2, .ON2:.ON2:.ON3:.ON2:.ON1:.ON1:.ON2, .ON2:.ON2:.ON3:.ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON3:.ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON3:.ON2:.ON2:.ON2:.ON2] - - Bridge: North.North Start <-> Bridge: South.South Start <-> C1.1 <-> C1.2 - C2.1 <-> VOL / TONE.2 - C2.2 <-> GND1 <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.3 - +org.diylc.netlist.NetlistException: Maximum number of switching combinations exceeded. Allowed: 64, actual: 288 \ No newline at end of file diff --git a/diylc-regression-data/input/cloud/netlist/317_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/317_excl_switches.txt index f004e2df..9325a5c9 100644 --- a/diylc-regression-data/input/cloud/netlist/317_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/317_excl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [Default] Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.1 - Presence.2 <-> GND2 <-> Presence-Poly.1 + Presence.2 <-> GND <-> Presence-Poly.1 .022uF 630v Bass.1 <-> Bass.2 <-> Treble.3 .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C5.2 <-> Treble Peaker.2 diff --git a/diylc-regression-data/input/cloud/netlist/317_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/317_incl_switches.txt index c8cba8cc..7cc9a337 100644 --- a/diylc-regression-data/input/cloud/netlist/317_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/317_incl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [.ON1, .ON2] Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.1 - Presence.2 <-> GND2 <-> Presence-Poly.1 + Presence.2 <-> GND <-> Presence-Poly.1 .022uF 630v Bass.1 <-> Bass.2 <-> Treble.3 .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C5.2 <-> Treble Peaker.2 diff --git a/diylc-regression-data/input/cloud/netlist/318_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/318_excl_switches.txt index 971c5d1b..147b28c9 100644 --- a/diylc-regression-data/input/cloud/netlist/318_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/318_excl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [Default] Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.1 - Presence.2 <-> GND2 <-> Presence-Poly.1 + Presence.2 <-> GND <-> Presence-Poly.1 .022uF 630v Bass.1 <-> Bass.2 <-> Treble.3 .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C5.2 <-> Treble Peaker.2 diff --git a/diylc-regression-data/input/cloud/netlist/318_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/318_incl_switches.txt index 26f5169c..a1ccbdc5 100644 --- a/diylc-regression-data/input/cloud/netlist/318_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/318_incl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [.ON1, .ON2] Presence.1 <-> .1uF 200v AC Shunt.1 <-> 10K 1W.1 <-> NFB.2 <-> Presence.1 - Presence.2 <-> GND2 <-> Presence-Poly.1 + Presence.2 <-> GND <-> Presence-Poly.1 .022uF 630v Bass.1 <-> Bass.2 <-> Treble.3 .022uF 630v Bass.2 <-> .022uF 630v Mid.2 <-> 20uF 500V.1 <-> 4.7K 2W.2 <-> Tone Slope.2 .022uF 630v Coupling.1 <-> C5.2 <-> Treble Peaker.2 diff --git a/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt index d65b7d7d..921790b9 100644 --- a/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - Presence.1 <-> GND1 <-> Presence.1 + Presence.1 <-> GND <-> Presence.1 Presence.2 <-> Middle.3 <-> Poly.1 Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 Bass.2 <-> Tone Bass.2 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt index d65b7d7d..921790b9 100644 --- a/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - Presence.1 <-> GND1 <-> Presence.1 + Presence.1 <-> GND <-> Presence.1 Presence.2 <-> Middle.3 <-> Poly.1 Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 Bass.2 <-> Tone Bass.2 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt index d65b7d7d..921790b9 100644 --- a/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - Presence.1 <-> GND1 <-> Presence.1 + Presence.1 <-> GND <-> Presence.1 Presence.2 <-> Middle.3 <-> Poly.1 Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 Bass.2 <-> Tone Bass.2 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt index d65b7d7d..921790b9 100644 --- a/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - Presence.1 <-> GND1 <-> Presence.1 + Presence.1 <-> GND <-> Presence.1 Presence.2 <-> Middle.3 <-> Poly.1 Backup1.1 <-> Backup2.1 <-> Center Tap 6.3.1 <-> Center Tap 6.3.1 <-> Filter Cap B+1.2 <-> Grid Leak V4.2 <-> Grid Leak V5.2 <-> Power Tube Cathode.1 <-> Power Tube Cathode.2 Bass.2 <-> Tone Bass.2 <-> Treble.3 diff --git a/diylc-regression-data/input/cloud/netlist/329_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/329_excl_switches.txt index edc495b8..9ef54a6c 100644 --- a/diylc-regression-data/input/cloud/netlist/329_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/329_excl_switches.txt @@ -2,14 +2,9 @@ Switch setup: [Default] 1N4007.1 <-> C3.2 1N4007.1 <-> L3.2 + 1N4007.2 <-> C3.1 <-> C3.2 <-> GND <-> L3.1 <-> L3.1 <-> L3.2 <-> VR1.2 1N4007.2 <-> C3.1 <-> R2.2 - 1N4007.2 <-> GND1 <-> L3.2 C1.1 <-> D1.2 C1.2 <-> C2.1 C2.2 <-> D2.1 <-> VR1.3 - C3.1 <-> GND1 - C3.2 <-> GND1 - GND1 <-> L3.1 - GND1 <-> L3.1 - GND1 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/329_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/329_incl_switches.txt index edc495b8..9ef54a6c 100644 --- a/diylc-regression-data/input/cloud/netlist/329_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/329_incl_switches.txt @@ -2,14 +2,9 @@ Switch setup: [Default] 1N4007.1 <-> C3.2 1N4007.1 <-> L3.2 + 1N4007.2 <-> C3.1 <-> C3.2 <-> GND <-> L3.1 <-> L3.1 <-> L3.2 <-> VR1.2 1N4007.2 <-> C3.1 <-> R2.2 - 1N4007.2 <-> GND1 <-> L3.2 C1.1 <-> D1.2 C1.2 <-> C2.1 C2.2 <-> D2.1 <-> VR1.3 - C3.1 <-> GND1 - C3.2 <-> GND1 - GND1 <-> L3.1 - GND1 <-> L3.1 - GND1 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/330_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/330_excl_switches.txt index d68a6a17..10c4df53 100644 --- a/diylc-regression-data/input/cloud/netlist/330_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/330_excl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [Default] C1.1 <-> VR1.3 <-> VR2.2 - C1.2 <-> GND1 <-> GND2 <-> GND3 <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish + C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 PKP1.North Start <-> SW1.5 PKP2.North Start <-> SW1.3 diff --git a/diylc-regression-data/input/cloud/netlist/330_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/330_incl_switches.txt index 9319cd46..56ef4aea 100644 --- a/diylc-regression-data/input/cloud/netlist/330_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/330_incl_switches.txt @@ -1,35 +1,35 @@ Switch setup: [SW1.1] C1.1 <-> VR1.3 <-> VR2.2 - C1.2 <-> GND1 <-> GND2 <-> GND3 <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish + C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 PKP3.North Start <-> VR3.1 Switch setup: [SW1.2] C1.1 <-> VR1.3 <-> VR2.2 - C1.2 <-> GND1 <-> GND2 <-> GND3 <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish + C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 PKP2.North Start <-> PKP3.North Start <-> VR2.3 <-> VR3.1 Switch setup: [SW1.3] C1.1 <-> VR1.3 <-> VR2.2 - C1.2 <-> GND1 <-> GND2 <-> GND3 <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish + C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 PKP2.North Start <-> VR2.3 <-> VR3.1 Switch setup: [SW1.4] C1.1 <-> VR1.3 <-> VR2.2 - C1.2 <-> GND1 <-> GND2 <-> GND3 <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish + C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 PKP1.North Start <-> PKP2.North Start <-> VR1.2 <-> VR2.3 <-> VR3.1 Switch setup: [SW1.5] C1.1 <-> VR1.3 <-> VR2.2 - C1.2 <-> GND1 <-> GND2 <-> GND3 <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish + C1.2 <-> GND <-> J1.Sleeve <-> PKP1.North Finish <-> PKP2.North Finish <-> PKP3.North Finish J1.Tip <-> VR3.2 PKP1.North Start <-> VR1.2 <-> VR3.1 diff --git a/diylc-regression-data/input/cloud/netlist/350_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/350_excl_switches.txt index 77ce5335..072d2f6a 100644 --- a/diylc-regression-data/input/cloud/netlist/350_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/350_excl_switches.txt @@ -1,10 +1,5 @@ Switch setup: [Default] - C1.2 <-> GND2 - C4.2 <-> GND5 + C1.2 <-> C4.2 <-> D1.1 <-> D2.2 <-> GND <-> R4.2 <-> VR2.3 C6.2 <-> D1.2 - D1.1 <-> GND4 - D2.2 <-> GND6 - GND3 <-> R4.2 - GND7 <-> VR2.3 diff --git a/diylc-regression-data/input/cloud/netlist/350_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/350_incl_switches.txt index 77ce5335..072d2f6a 100644 --- a/diylc-regression-data/input/cloud/netlist/350_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/350_incl_switches.txt @@ -1,10 +1,5 @@ Switch setup: [Default] - C1.2 <-> GND2 - C4.2 <-> GND5 + C1.2 <-> C4.2 <-> D1.1 <-> D2.2 <-> GND <-> R4.2 <-> VR2.3 C6.2 <-> D1.2 - D1.1 <-> GND4 - D2.2 <-> GND6 - GND3 <-> R4.2 - GND7 <-> VR2.3 diff --git a/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt index e9ca011e..0f1e92e4 100644 --- a/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt @@ -11,7 +11,7 @@ Switch setup: [Default] 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 4.7k.2 <-> 4.7k.2 - Br Plug Fem.4 <-> GND1 + Br Plug Fem.4 <-> GND Bridge.North Start <-> CRL Switch.4 CRL Switch.6 <-> Middle.North Start CRL Switch.8 <-> Neck.North Start diff --git a/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt index 459d0e32..42b5be3a 100644 --- a/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt @@ -11,7 +11,7 @@ Switch setup: [CRL Switch.1] 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 4.7k.2 <-> 4.7k.2 - Br Plug Fem.4 <-> GND1 + Br Plug Fem.4 <-> GND J1.Tip <-> Plug Jill.3 Switch setup: [CRL Switch.2] @@ -26,7 +26,7 @@ Switch setup: [CRL Switch.2] 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 4.7k.2 <-> 4.7k.2 - Br Plug Fem.4 <-> GND1 + Br Plug Fem.4 <-> GND J1.Tip <-> Plug Jill.3 Switch setup: [CRL Switch.3] @@ -41,7 +41,7 @@ Switch setup: [CRL Switch.3] 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 4.7k.2 <-> 4.7k.2 - Br Plug Fem.4 <-> GND1 + Br Plug Fem.4 <-> GND J1.Tip <-> Plug Jill.3 Switch setup: [CRL Switch.4] @@ -55,7 +55,7 @@ Switch setup: [CRL Switch.4] 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 4.7k.2 <-> 4.7k.2 - Br Plug Fem.4 <-> GND1 + Br Plug Fem.4 <-> GND J1.Tip <-> Plug Jill.3 Switch setup: [CRL Switch.5] @@ -70,6 +70,6 @@ Switch setup: [CRL Switch.5] 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 4.7k.2 <-> 4.7k.2 - Br Plug Fem.4 <-> GND1 + Br Plug Fem.4 <-> GND J1.Tip <-> Plug Jill.3 diff --git a/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt index 77a1b8de..15e714dd 100644 --- a/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt @@ -1,6 +1,4 @@ Switch setup: [Default] - GND2 <-> J1.Sleeve - GND5 <-> SW1.3 - GND7 <-> PKP1.North Start <-> PKP3.North Start + GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start <-> SW1.3 diff --git a/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt index cad7f2b6..5b621b74 100644 --- a/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt @@ -1,5 +1,4 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1, SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2, SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1, SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2, SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1, SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2, SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1, SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2, SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1, SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2, SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1, SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2, SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1, SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2, SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1, SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2] - GND2 <-> J1.Sleeve - GND7 <-> PKP1.North Start <-> PKP3.North Start + GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start diff --git a/diylc-regression-data/input/cloud/netlist/378_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/378_excl_switches.txt index 842d367b..735939a3 100644 --- a/diylc-regression-data/input/cloud/netlist/378_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/378_excl_switches.txt @@ -6,7 +6,7 @@ Switch setup: [Default] C2.2 <-> Q1.Q1.1 <-> R3.2 C3.1 <-> Q1.3 <-> R9.1 C3.2 <-> Q1.Q1.2 <-> R4.1 - GND1 <-> R2.2 <-> R4.2 + GND <-> R2.2 <-> R4.2 R1.1 <-> R3.1 R1.1 <-> R3.1 R2.2 <-> R9.2 diff --git a/diylc-regression-data/input/cloud/netlist/378_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/378_incl_switches.txt index 842d367b..735939a3 100644 --- a/diylc-regression-data/input/cloud/netlist/378_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/378_incl_switches.txt @@ -6,7 +6,7 @@ Switch setup: [Default] C2.2 <-> Q1.Q1.1 <-> R3.2 C3.1 <-> Q1.3 <-> R9.1 C3.2 <-> Q1.Q1.2 <-> R4.1 - GND1 <-> R2.2 <-> R4.2 + GND <-> R2.2 <-> R4.2 R1.1 <-> R3.1 R1.1 <-> R3.1 R2.2 <-> R9.2 diff --git a/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt index de69dbf3..67c3dd01 100644 --- a/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt @@ -2,11 +2,9 @@ Switch setup: [Default] C10.1 <-> C9.2 <-> PR6 (GAIN).3 <-> R10.2 <-> R9.1 C10.1 <-> R10.2 - C10.2 <-> C11.1 <-> C11.2 <-> C12.2 <-> C18.2 <-> C19.1 <-> C20.1 <-> C21.1 <-> GND1 <-> GND2 <-> GND3 <-> GND4 <-> GND5 <-> GND6 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9 - C11.1 <-> GND3 + C10.2 <-> C11.1 <-> C11.2 <-> C12.2 <-> C18.2 <-> C19.1 <-> C20.1 <-> C21.1 <-> GND <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9 C11.2 <-> R11.1 C12.1 <-> R2.2 <-> V1.3 - C12.2 <-> GND6 C15.1 <-> R14.2 <-> V1.1 C15.2 <-> R15.2 C17.1 <-> R18.2 <-> R19.1 @@ -17,8 +15,6 @@ Switch setup: [Default] C22.1 <-> R24.1 C9.1 <-> INPUT.2 <-> R9.2 C9.1 <-> R9.2 - GND1 <-> R10.1 - GND4 <-> R2.1 R12.1 <-> R13.1 <-> R14.1 R15.1 <-> R16.2 <-> V1.7 R17.2 <-> V1.8 diff --git a/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt index de69dbf3..67c3dd01 100644 --- a/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt @@ -2,11 +2,9 @@ Switch setup: [Default] C10.1 <-> C9.2 <-> PR6 (GAIN).3 <-> R10.2 <-> R9.1 C10.1 <-> R10.2 - C10.2 <-> C11.1 <-> C11.2 <-> C12.2 <-> C18.2 <-> C19.1 <-> C20.1 <-> C21.1 <-> GND1 <-> GND2 <-> GND3 <-> GND4 <-> GND5 <-> GND6 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9 - C11.1 <-> GND3 + C10.2 <-> C11.1 <-> C11.2 <-> C12.2 <-> C18.2 <-> C19.1 <-> C20.1 <-> C21.1 <-> GND <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9 C11.2 <-> R11.1 C12.1 <-> R2.2 <-> V1.3 - C12.2 <-> GND6 C15.1 <-> R14.2 <-> V1.1 C15.2 <-> R15.2 C17.1 <-> R18.2 <-> R19.1 @@ -17,8 +15,6 @@ Switch setup: [Default] C22.1 <-> R24.1 C9.1 <-> INPUT.2 <-> R9.2 C9.1 <-> R9.2 - GND1 <-> R10.1 - GND4 <-> R2.1 R12.1 <-> R13.1 <-> R14.1 R15.1 <-> R16.2 <-> V1.7 R17.2 <-> V1.8 diff --git a/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt index 7a403804..bf615bab 100644 --- a/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt @@ -3,5 +3,5 @@ Switch setup: [Default] C10.1 <-> PR6 (GAIN).2 C10.2 <-> C9.1 <-> PR6 (GAIN).3 <-> R10.2 C9.2 <-> INPUT.1 <-> R9.1 - GND2 <-> PR6 (GAIN).1 <-> R10.1 + GND <-> PR6 (GAIN).1 <-> R10.1 diff --git a/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt index 7a403804..bf615bab 100644 --- a/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt @@ -3,5 +3,5 @@ Switch setup: [Default] C10.1 <-> PR6 (GAIN).2 C10.2 <-> C9.1 <-> PR6 (GAIN).3 <-> R10.2 C9.2 <-> INPUT.1 <-> R9.1 - GND2 <-> PR6 (GAIN).1 <-> R10.1 + GND <-> PR6 (GAIN).1 <-> R10.1 diff --git a/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt index 610d52b0..add967e1 100644 --- a/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND1 <-> GND10 <-> GND2 <-> GND3 <-> GND4 <-> GND6 <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> SW1.1 <-> SW1.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 + (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> SW1.1 <-> SW1.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 C10.1 <-> R7.1 <-> V2.1 C10.1 <-> V2.1 C10.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2 @@ -18,7 +18,6 @@ Switch setup: [Default] C3.1 <-> R2.1 <-> V1.1 C3.2 <-> R4.1 C5.1 <-> PR6 (GAIN).3 <-> R5.2 - GND1 <-> R5.1 R10.2 <-> V2.7 R12.1 <-> R13.1 R13.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt index 83b86080..e673ec5b 100644 --- a/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [SW1.ON1, SW1.OFF] - (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND1 <-> GND10 <-> GND2 <-> GND3 <-> GND4 <-> GND6 <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 + (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 C10.1 <-> R7.1 <-> V2.1 C10.1 <-> V2.1 C10.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2 @@ -17,7 +17,6 @@ Switch setup: [SW1.ON1, SW1.OFF] C3.1 <-> R2.1 <-> V1.1 C3.2 <-> R4.1 C5.1 <-> PR6 (GAIN).3 <-> R5.2 - GND1 <-> R5.1 R10.2 <-> V2.7 R12.1 <-> R13.1 R13.2 <-> V3.2 @@ -31,7 +30,7 @@ Switch setup: [SW1.ON1, SW1.OFF] Switch setup: [SW1.ON2] - (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C17.1 <-> C18.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND1 <-> GND10 <-> GND2 <-> GND3 <-> GND4 <-> GND6 <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 + (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C17.1 <-> C18.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7 C10.1 <-> R7.1 <-> V2.1 C10.1 <-> V2.1 C10.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2 @@ -48,7 +47,6 @@ Switch setup: [SW1.ON2] C3.1 <-> R2.1 <-> V1.1 C3.2 <-> R4.1 C5.1 <-> PR6 (GAIN).3 <-> R5.2 - GND1 <-> R5.1 R10.2 <-> V2.7 R12.1 <-> R13.1 R13.2 <-> V3.2 diff --git a/diylc-regression-data/input/cloud/netlist/387_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/387_excl_switches.txt index 9bffeed2..5599112c 100644 --- a/diylc-regression-data/input/cloud/netlist/387_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/387_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] C1.1 <-> J1.1 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 - GND1 <-> J1.2 + GND <-> J1.2 V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 diff --git a/diylc-regression-data/input/cloud/netlist/387_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/387_incl_switches.txt index 9bffeed2..5599112c 100644 --- a/diylc-regression-data/input/cloud/netlist/387_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/387_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] C1.1 <-> J1.1 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 - GND1 <-> J1.2 + GND <-> J1.2 V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 diff --git a/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt index db0cad81..160c6583 100644 --- a/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - ANODE <-> C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C9.2 <-> GND1 <-> GND2 <-> GND3 <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.6 + C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR4 GAIN.2 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6 C1.1 <-> R3.1 C14.2 <-> R12.2 <-> R13.1 C15.1 <-> R15.2 @@ -11,19 +11,15 @@ Switch setup: [Default] C20.1 <-> PR8 BASS.2 <-> PR8 BASS.3 C20.2 <-> C21.2 <-> R23.1 C22.1 <-> PR10 VOL.3 - C3.1 <-> GND8 <-> R5.2 C3.2 <-> PR1 TREBLE.3 C4.1 <-> C5.1 <-> R5.1 C4.2 <-> R20.2 <-> R22.2 <-> R23.2 <-> V3.1 <-> V3.7 <-> V3.8 C4.2 <-> R22.2 C5.2 <-> PR2 BASS.1 <-> PR3 MID.2 <-> PR3 MID.3 C6.2 <-> R6.2 <-> V4.3 - C7.2 <-> CH-SELECT C8.1 <-> PR5 VOL.3 C8.2 <-> R7.1 C8.2 <-> R7.1 <-> V4.1 - C9.1 <-> GND4 <-> R5.1 - GND5 <-> PR4 GAIN.2 <-> V4.2 J4.2 <-> R17.1 PR10 VOL.1 <-> R24.1 PR2 BASS.2 <-> PR2 BASS.3 diff --git a/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt index db0cad81..160c6583 100644 --- a/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - ANODE <-> C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C9.2 <-> GND1 <-> GND2 <-> GND3 <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.6 + C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR4 GAIN.2 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6 C1.1 <-> R3.1 C14.2 <-> R12.2 <-> R13.1 C15.1 <-> R15.2 @@ -11,19 +11,15 @@ Switch setup: [Default] C20.1 <-> PR8 BASS.2 <-> PR8 BASS.3 C20.2 <-> C21.2 <-> R23.1 C22.1 <-> PR10 VOL.3 - C3.1 <-> GND8 <-> R5.2 C3.2 <-> PR1 TREBLE.3 C4.1 <-> C5.1 <-> R5.1 C4.2 <-> R20.2 <-> R22.2 <-> R23.2 <-> V3.1 <-> V3.7 <-> V3.8 C4.2 <-> R22.2 C5.2 <-> PR2 BASS.1 <-> PR3 MID.2 <-> PR3 MID.3 C6.2 <-> R6.2 <-> V4.3 - C7.2 <-> CH-SELECT C8.1 <-> PR5 VOL.3 C8.2 <-> R7.1 C8.2 <-> R7.1 <-> V4.1 - C9.1 <-> GND4 <-> R5.1 - GND5 <-> PR4 GAIN.2 <-> V4.2 J4.2 <-> R17.1 PR10 VOL.1 <-> R24.1 PR2 BASS.2 <-> PR2 BASS.3 diff --git a/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt index 311c4504..03cf992b 100644 --- a/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt @@ -6,7 +6,7 @@ Switch setup: [Default] C11.2 <-> R17.2 <-> V2.6 C12.1 <-> R21.1 C12.1 <-> R21.1 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND1 <-> GND2 <-> L5.1 <-> OT.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 + C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> L5.1 <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 C13.1 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> L3.1 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9 @@ -23,7 +23,6 @@ Switch setup: [Default] C8.1 <-> R15.2 <-> R9.2 C8.2 <-> R10.2 <-> V2.7 C9.1 <-> R11.2 <-> R12.1 - GND5 <-> R13.2 Input Jack.Sleeve <-> R1A.1 Input Jack.Tip <-> R1.1 <-> R1A.2 J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1 diff --git a/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt index 311c4504..03cf992b 100644 --- a/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt @@ -6,7 +6,7 @@ Switch setup: [Default] C11.2 <-> R17.2 <-> V2.6 C12.1 <-> R21.1 C12.1 <-> R21.1 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND1 <-> GND2 <-> L5.1 <-> OT.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 + C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> L5.1 <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 C13.1 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> L3.1 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9 @@ -23,7 +23,6 @@ Switch setup: [Default] C8.1 <-> R15.2 <-> R9.2 C8.2 <-> R10.2 <-> V2.7 C9.1 <-> R11.2 <-> R12.1 - GND5 <-> R13.2 Input Jack.Sleeve <-> R1A.1 Input Jack.Tip <-> R1.1 <-> R1A.2 J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1 diff --git a/diylc-regression-data/input/cloud/netlist/401_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/401_excl_switches.txt index 532c95b7..6b7f0b60 100644 --- a/diylc-regression-data/input/cloud/netlist/401_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/401_excl_switches.txt @@ -5,7 +5,7 @@ Switch setup: [Default] C2.1 <-> R9.2 <-> V2.5 C2.2 <-> R7.2 <-> V3.6 C3.1 <-> R10.1 <-> V1.2 <-> V1.8 - C3.2 <-> GND2 <-> R9.1 + C3.2 <-> GND <-> R9.1 C5.1 <-> R5.1 <-> R7.1 C5.2 <-> C7.2 <-> Input 2.Sleeve <-> R12.3 <-> R4.1 C6.1 <-> R8.2 <-> V2.8 diff --git a/diylc-regression-data/input/cloud/netlist/401_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/401_incl_switches.txt index 532c95b7..6b7f0b60 100644 --- a/diylc-regression-data/input/cloud/netlist/401_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/401_incl_switches.txt @@ -5,7 +5,7 @@ Switch setup: [Default] C2.1 <-> R9.2 <-> V2.5 C2.2 <-> R7.2 <-> V3.6 C3.1 <-> R10.1 <-> V1.2 <-> V1.8 - C3.2 <-> GND2 <-> R9.1 + C3.2 <-> GND <-> R9.1 C5.1 <-> R5.1 <-> R7.1 C5.2 <-> C7.2 <-> Input 2.Sleeve <-> R12.3 <-> R4.1 C6.1 <-> R8.2 <-> V2.8 diff --git a/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt index 945a1f9d..fece9478 100644 --- a/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - 1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> GND1 <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> SW1.6 <-> V2.5 <-> V2.7 <-> VR1.1 + 1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> GND <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> SW1.6 <-> V2.5 <-> V2.7 <-> VR1.1 1N4007.2 <-> V2.4 1N4007.2 <-> V2.6 2W.1 <-> 2W.2 <-> 5W.2 <-> C3.1 <-> V2.6 diff --git a/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt index 35be4159..4e139dae 100644 --- a/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [SW1.ON1] - 1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> GND1 <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> V2.5 <-> V2.7 <-> VR1.1 + 1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> GND <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> V2.5 <-> V2.7 <-> VR1.1 1N4007.2 <-> V2.4 1N4007.2 <-> V2.6 2W.1 <-> 2W.2 <-> 5W.2 <-> C3.1 <-> V2.6 @@ -30,7 +30,7 @@ Switch setup: [SW1.ON1] Switch setup: [SW1.ON2] - 1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> FH1.1 <-> GND1 <-> IEC1.3 <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> V2.5 <-> V2.7 <-> VR1.1 + 1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> FH1.1 <-> GND <-> IEC1.3 <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> V2.5 <-> V2.7 <-> VR1.1 1N4007.2 <-> V2.4 1N4007.2 <-> V2.6 2W.1 <-> 2W.2 <-> 5W.2 <-> C3.1 <-> V2.6 diff --git a/diylc-regression-data/input/cloud/netlist/404_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/404_excl_switches.txt index 532c95b7..6b7f0b60 100644 --- a/diylc-regression-data/input/cloud/netlist/404_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/404_excl_switches.txt @@ -5,7 +5,7 @@ Switch setup: [Default] C2.1 <-> R9.2 <-> V2.5 C2.2 <-> R7.2 <-> V3.6 C3.1 <-> R10.1 <-> V1.2 <-> V1.8 - C3.2 <-> GND2 <-> R9.1 + C3.2 <-> GND <-> R9.1 C5.1 <-> R5.1 <-> R7.1 C5.2 <-> C7.2 <-> Input 2.Sleeve <-> R12.3 <-> R4.1 C6.1 <-> R8.2 <-> V2.8 diff --git a/diylc-regression-data/input/cloud/netlist/404_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/404_incl_switches.txt index 532c95b7..6b7f0b60 100644 --- a/diylc-regression-data/input/cloud/netlist/404_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/404_incl_switches.txt @@ -5,7 +5,7 @@ Switch setup: [Default] C2.1 <-> R9.2 <-> V2.5 C2.2 <-> R7.2 <-> V3.6 C3.1 <-> R10.1 <-> V1.2 <-> V1.8 - C3.2 <-> GND2 <-> R9.1 + C3.2 <-> GND <-> R9.1 C5.1 <-> R5.1 <-> R7.1 C5.2 <-> C7.2 <-> Input 2.Sleeve <-> R12.3 <-> R4.1 C6.1 <-> R8.2 <-> V2.8 diff --git a/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt index 311c4504..03cf992b 100644 --- a/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt @@ -6,7 +6,7 @@ Switch setup: [Default] C11.2 <-> R17.2 <-> V2.6 C12.1 <-> R21.1 C12.1 <-> R21.1 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND1 <-> GND2 <-> L5.1 <-> OT.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 + C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> L5.1 <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 C13.1 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> L3.1 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9 @@ -23,7 +23,6 @@ Switch setup: [Default] C8.1 <-> R15.2 <-> R9.2 C8.2 <-> R10.2 <-> V2.7 C9.1 <-> R11.2 <-> R12.1 - GND5 <-> R13.2 Input Jack.Sleeve <-> R1A.1 Input Jack.Tip <-> R1.1 <-> R1A.2 J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1 diff --git a/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt index 311c4504..03cf992b 100644 --- a/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt @@ -6,7 +6,7 @@ Switch setup: [Default] C11.2 <-> R17.2 <-> V2.6 C12.1 <-> R21.1 C12.1 <-> R21.1 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND1 <-> GND2 <-> L5.1 <-> OT.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 + C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> L5.1 <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8 C13.1 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> L3.1 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9 @@ -23,7 +23,6 @@ Switch setup: [Default] C8.1 <-> R15.2 <-> R9.2 C8.2 <-> R10.2 <-> V2.7 C9.1 <-> R11.2 <-> R12.1 - GND5 <-> R13.2 Input Jack.Sleeve <-> R1A.1 Input Jack.Tip <-> R1.1 <-> R1A.2 J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1 diff --git a/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt index e57cbe8a..f90553cc 100644 --- a/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt @@ -5,7 +5,7 @@ Switch setup: [Default] C11.1 <-> R17.2 <-> V2.6 C11.2 <-> R19.2 <-> V4.2 C12.1 <-> R21.2 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C3.2 <-> C9.2 <-> GND1 <-> GND2 <-> Input Jack.Sleeve <-> J1.Sleeve <-> J1.Tip <-> OT.2 <-> OT.4 <-> OT.5 <-> R13.1 <-> R18.2 <-> R19.1 <-> R1A.2 <-> R2.2 <-> R21.1 <-> R27.1 <-> R29.1 <-> R32.1 <-> R7.1 <-> Tone.3 <-> TS R3.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.3 + C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C3.2 <-> C9.2 <-> GND <-> Input Jack.Sleeve <-> J1.Sleeve <-> J1.Tip <-> OT.2 <-> OT.4 <-> OT.5 <-> R13.1 <-> R18.2 <-> R19.1 <-> R1A.2 <-> R2.2 <-> R21.1 <-> R27.1 <-> R29.1 <-> R32.1 <-> R7.1 <-> Tone.3 <-> TS R3.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.3 C13.1 <-> OT.3 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.2 <-> R28.2 <-> R30.2 <-> V3.9 <-> V4.9 diff --git a/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt index e57cbe8a..f90553cc 100644 --- a/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt @@ -5,7 +5,7 @@ Switch setup: [Default] C11.1 <-> R17.2 <-> V2.6 C11.2 <-> R19.2 <-> V4.2 C12.1 <-> R21.2 <-> V3.3 <-> V4.3 - C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C3.2 <-> C9.2 <-> GND1 <-> GND2 <-> Input Jack.Sleeve <-> J1.Sleeve <-> J1.Tip <-> OT.2 <-> OT.4 <-> OT.5 <-> R13.1 <-> R18.2 <-> R19.1 <-> R1A.2 <-> R2.2 <-> R21.1 <-> R27.1 <-> R29.1 <-> R32.1 <-> R7.1 <-> Tone.3 <-> TS R3.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.3 + C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C3.2 <-> C9.2 <-> GND <-> Input Jack.Sleeve <-> J1.Sleeve <-> J1.Tip <-> OT.2 <-> OT.4 <-> OT.5 <-> R13.1 <-> R18.2 <-> R19.1 <-> R1A.2 <-> R2.2 <-> R21.1 <-> R27.1 <-> R29.1 <-> R32.1 <-> R7.1 <-> Tone.3 <-> TS R3.2 <-> V5.4 <-> V5.6 <-> V5.8 <-> Volume.3 C13.1 <-> OT.3 <-> V3.7 C13.2 <-> R22.1 C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.2 <-> R28.2 <-> R30.2 <-> V3.9 <-> V4.9 diff --git a/diylc-regression-data/input/cloud/netlist/414_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/414_excl_switches.txt index 75178c89..1c81af7e 100644 --- a/diylc-regression-data/input/cloud/netlist/414_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/414_excl_switches.txt @@ -1,4 +1,4 @@ Switch setup: [Default] - CAP 0.47 uF.2 <-> GND1 <-> Precision South Coil.South Finish <-> Presa Jack.Sleeve + CAP 0.47 uF.2 <-> GND <-> Precision South Coil.South Finish <-> Presa Jack.Sleeve diff --git a/diylc-regression-data/input/cloud/netlist/414_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/414_incl_switches.txt index 75178c89..1c81af7e 100644 --- a/diylc-regression-data/input/cloud/netlist/414_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/414_incl_switches.txt @@ -1,4 +1,4 @@ Switch setup: [Default] - CAP 0.47 uF.2 <-> GND1 <-> Precision South Coil.South Finish <-> Presa Jack.Sleeve + CAP 0.47 uF.2 <-> GND <-> Precision South Coil.South Finish <-> Presa Jack.Sleeve diff --git a/diylc-regression-data/input/cloud/png/100.png b/diylc-regression-data/input/cloud/png/100.png index 37873927..5df0a96b 100644 Binary files a/diylc-regression-data/input/cloud/png/100.png and b/diylc-regression-data/input/cloud/png/100.png differ diff --git a/diylc-regression-data/input/cloud/png/101.png b/diylc-regression-data/input/cloud/png/101.png index b89d34d2..f509f7da 100644 Binary files a/diylc-regression-data/input/cloud/png/101.png and b/diylc-regression-data/input/cloud/png/101.png differ diff --git a/diylc-regression-data/input/cloud/png/102.png b/diylc-regression-data/input/cloud/png/102.png index 491dec6b..c8e14621 100644 Binary files a/diylc-regression-data/input/cloud/png/102.png and b/diylc-regression-data/input/cloud/png/102.png differ diff --git a/diylc-regression-data/input/cloud/png/103.png b/diylc-regression-data/input/cloud/png/103.png index 64db816d..b77f936f 100644 Binary files a/diylc-regression-data/input/cloud/png/103.png and b/diylc-regression-data/input/cloud/png/103.png differ diff --git a/diylc-regression-data/input/cloud/png/105.png b/diylc-regression-data/input/cloud/png/105.png index b35e8588..591e0b13 100644 Binary files a/diylc-regression-data/input/cloud/png/105.png and b/diylc-regression-data/input/cloud/png/105.png differ diff --git a/diylc-regression-data/input/cloud/png/106.png b/diylc-regression-data/input/cloud/png/106.png index 1472d7ab..10e4d76f 100644 Binary files a/diylc-regression-data/input/cloud/png/106.png and b/diylc-regression-data/input/cloud/png/106.png differ diff --git a/diylc-regression-data/input/cloud/png/111.png b/diylc-regression-data/input/cloud/png/111.png index f8f1d184..149830bf 100644 Binary files a/diylc-regression-data/input/cloud/png/111.png and b/diylc-regression-data/input/cloud/png/111.png differ diff --git a/diylc-regression-data/input/cloud/png/112.png b/diylc-regression-data/input/cloud/png/112.png index e0b67cf6..9176aa37 100644 Binary files a/diylc-regression-data/input/cloud/png/112.png and b/diylc-regression-data/input/cloud/png/112.png differ diff --git a/diylc-regression-data/input/cloud/png/113.png b/diylc-regression-data/input/cloud/png/113.png index f588a817..de30d457 100644 Binary files a/diylc-regression-data/input/cloud/png/113.png and b/diylc-regression-data/input/cloud/png/113.png differ diff --git a/diylc-regression-data/input/cloud/png/114.png b/diylc-regression-data/input/cloud/png/114.png index c8ef627f..d8cb49e6 100644 Binary files a/diylc-regression-data/input/cloud/png/114.png and b/diylc-regression-data/input/cloud/png/114.png differ diff --git a/diylc-regression-data/input/cloud/png/117.png b/diylc-regression-data/input/cloud/png/117.png index 1f3a5abe..eb1bdd24 100644 Binary files a/diylc-regression-data/input/cloud/png/117.png and b/diylc-regression-data/input/cloud/png/117.png differ diff --git a/diylc-regression-data/input/cloud/png/118.png b/diylc-regression-data/input/cloud/png/118.png index f443e507..9a1fa56a 100644 Binary files a/diylc-regression-data/input/cloud/png/118.png and b/diylc-regression-data/input/cloud/png/118.png differ diff --git a/diylc-regression-data/input/cloud/png/119.png b/diylc-regression-data/input/cloud/png/119.png index c4e717eb..d12a54be 100644 Binary files a/diylc-regression-data/input/cloud/png/119.png and b/diylc-regression-data/input/cloud/png/119.png differ diff --git a/diylc-regression-data/input/cloud/png/120.png b/diylc-regression-data/input/cloud/png/120.png index 5b008dab..9e263b14 100644 Binary files a/diylc-regression-data/input/cloud/png/120.png and b/diylc-regression-data/input/cloud/png/120.png differ diff --git a/diylc-regression-data/input/cloud/png/122.png b/diylc-regression-data/input/cloud/png/122.png index e3988b1e..23fb8750 100644 Binary files a/diylc-regression-data/input/cloud/png/122.png and b/diylc-regression-data/input/cloud/png/122.png differ diff --git a/diylc-regression-data/input/cloud/png/131.png b/diylc-regression-data/input/cloud/png/131.png index b0fbc941..4aa2c12d 100644 Binary files a/diylc-regression-data/input/cloud/png/131.png and b/diylc-regression-data/input/cloud/png/131.png differ diff --git a/diylc-regression-data/input/cloud/png/132.png b/diylc-regression-data/input/cloud/png/132.png index 46d2ee46..f7f91422 100644 Binary files a/diylc-regression-data/input/cloud/png/132.png and b/diylc-regression-data/input/cloud/png/132.png differ diff --git a/diylc-regression-data/input/cloud/png/133.png b/diylc-regression-data/input/cloud/png/133.png index ba1d9ef1..f834bd4b 100644 Binary files a/diylc-regression-data/input/cloud/png/133.png and b/diylc-regression-data/input/cloud/png/133.png differ diff --git a/diylc-regression-data/input/cloud/png/134.png b/diylc-regression-data/input/cloud/png/134.png index 5fa87dcd..80b0488c 100644 Binary files a/diylc-regression-data/input/cloud/png/134.png and b/diylc-regression-data/input/cloud/png/134.png differ diff --git a/diylc-regression-data/input/cloud/png/143.png b/diylc-regression-data/input/cloud/png/143.png index 0ea86b22..060bc005 100644 Binary files a/diylc-regression-data/input/cloud/png/143.png and b/diylc-regression-data/input/cloud/png/143.png differ diff --git a/diylc-regression-data/input/cloud/png/144.png b/diylc-regression-data/input/cloud/png/144.png index 11584462..748bd863 100644 Binary files a/diylc-regression-data/input/cloud/png/144.png and b/diylc-regression-data/input/cloud/png/144.png differ diff --git a/diylc-regression-data/input/cloud/png/159.png b/diylc-regression-data/input/cloud/png/159.png index dbc4c4be..ada2ecb3 100644 Binary files a/diylc-regression-data/input/cloud/png/159.png and b/diylc-regression-data/input/cloud/png/159.png differ diff --git a/diylc-regression-data/input/cloud/png/174.png b/diylc-regression-data/input/cloud/png/174.png index a6b44d9f..34a222fc 100644 Binary files a/diylc-regression-data/input/cloud/png/174.png and b/diylc-regression-data/input/cloud/png/174.png differ diff --git a/diylc-regression-data/input/cloud/png/176.png b/diylc-regression-data/input/cloud/png/176.png index 5d31d550..179060aa 100644 Binary files a/diylc-regression-data/input/cloud/png/176.png and b/diylc-regression-data/input/cloud/png/176.png differ diff --git a/diylc-regression-data/input/cloud/png/178.png b/diylc-regression-data/input/cloud/png/178.png index 7f3d1073..a28e3ed1 100644 Binary files a/diylc-regression-data/input/cloud/png/178.png and b/diylc-regression-data/input/cloud/png/178.png differ diff --git a/diylc-regression-data/input/cloud/png/179.png b/diylc-regression-data/input/cloud/png/179.png index 6f77d35e..3ced1788 100644 Binary files a/diylc-regression-data/input/cloud/png/179.png and b/diylc-regression-data/input/cloud/png/179.png differ diff --git a/diylc-regression-data/input/cloud/png/189.png b/diylc-regression-data/input/cloud/png/189.png index ea309b80..a2332647 100644 Binary files a/diylc-regression-data/input/cloud/png/189.png and b/diylc-regression-data/input/cloud/png/189.png differ diff --git a/diylc-regression-data/input/cloud/png/190.png b/diylc-regression-data/input/cloud/png/190.png index a20fd7a1..8e3b0bac 100644 Binary files a/diylc-regression-data/input/cloud/png/190.png and b/diylc-regression-data/input/cloud/png/190.png differ diff --git a/diylc-regression-data/input/cloud/png/192.png b/diylc-regression-data/input/cloud/png/192.png index c0a02d90..3807b4d0 100644 Binary files a/diylc-regression-data/input/cloud/png/192.png and b/diylc-regression-data/input/cloud/png/192.png differ diff --git a/diylc-regression-data/input/cloud/png/194.png b/diylc-regression-data/input/cloud/png/194.png index 96b3719e..00fb5a32 100644 Binary files a/diylc-regression-data/input/cloud/png/194.png and b/diylc-regression-data/input/cloud/png/194.png differ diff --git a/diylc-regression-data/input/cloud/png/197.png b/diylc-regression-data/input/cloud/png/197.png index f2aebd4a..095aae97 100644 Binary files a/diylc-regression-data/input/cloud/png/197.png and b/diylc-regression-data/input/cloud/png/197.png differ diff --git a/diylc-regression-data/input/cloud/png/198.png b/diylc-regression-data/input/cloud/png/198.png index f50ba49d..9c7afbd1 100644 Binary files a/diylc-regression-data/input/cloud/png/198.png and b/diylc-regression-data/input/cloud/png/198.png differ diff --git a/diylc-regression-data/input/cloud/png/199.png b/diylc-regression-data/input/cloud/png/199.png index b97f6769..44d6a752 100644 Binary files a/diylc-regression-data/input/cloud/png/199.png and b/diylc-regression-data/input/cloud/png/199.png differ diff --git a/diylc-regression-data/input/cloud/png/200.png b/diylc-regression-data/input/cloud/png/200.png index e9cb983a..3313f3fd 100644 Binary files a/diylc-regression-data/input/cloud/png/200.png and b/diylc-regression-data/input/cloud/png/200.png differ diff --git a/diylc-regression-data/input/cloud/png/202.png b/diylc-regression-data/input/cloud/png/202.png index 3d9bcbee..a6cacc95 100644 Binary files a/diylc-regression-data/input/cloud/png/202.png and b/diylc-regression-data/input/cloud/png/202.png differ diff --git a/diylc-regression-data/input/cloud/png/203.png b/diylc-regression-data/input/cloud/png/203.png index fae0a286..22eb437b 100644 Binary files a/diylc-regression-data/input/cloud/png/203.png and b/diylc-regression-data/input/cloud/png/203.png differ diff --git a/diylc-regression-data/input/cloud/png/205.png b/diylc-regression-data/input/cloud/png/205.png index 3d9bcbee..a6cacc95 100644 Binary files a/diylc-regression-data/input/cloud/png/205.png and b/diylc-regression-data/input/cloud/png/205.png differ diff --git a/diylc-regression-data/input/cloud/png/206.png b/diylc-regression-data/input/cloud/png/206.png index 67495dd6..e8513906 100644 Binary files a/diylc-regression-data/input/cloud/png/206.png and b/diylc-regression-data/input/cloud/png/206.png differ diff --git a/diylc-regression-data/input/cloud/png/211.png b/diylc-regression-data/input/cloud/png/211.png index d73d29e1..65f2f30f 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/212.png b/diylc-regression-data/input/cloud/png/212.png index e76ebabd..99765607 100644 Binary files a/diylc-regression-data/input/cloud/png/212.png and b/diylc-regression-data/input/cloud/png/212.png differ diff --git a/diylc-regression-data/input/cloud/png/214.png b/diylc-regression-data/input/cloud/png/214.png index eec1afee..7acde337 100644 Binary files a/diylc-regression-data/input/cloud/png/214.png and b/diylc-regression-data/input/cloud/png/214.png differ diff --git a/diylc-regression-data/input/cloud/png/215.png b/diylc-regression-data/input/cloud/png/215.png index 335ccf39..47504fbb 100644 Binary files a/diylc-regression-data/input/cloud/png/215.png and b/diylc-regression-data/input/cloud/png/215.png differ diff --git a/diylc-regression-data/input/cloud/png/220.png b/diylc-regression-data/input/cloud/png/220.png index 3d9bcbee..a6cacc95 100644 Binary files a/diylc-regression-data/input/cloud/png/220.png and b/diylc-regression-data/input/cloud/png/220.png differ diff --git a/diylc-regression-data/input/cloud/png/222.png b/diylc-regression-data/input/cloud/png/222.png index d410971a..5aaf6e2f 100644 Binary files a/diylc-regression-data/input/cloud/png/222.png and b/diylc-regression-data/input/cloud/png/222.png differ diff --git a/diylc-regression-data/input/cloud/png/223.png b/diylc-regression-data/input/cloud/png/223.png index 526596ed..80d42c92 100644 Binary files a/diylc-regression-data/input/cloud/png/223.png and b/diylc-regression-data/input/cloud/png/223.png differ diff --git a/diylc-regression-data/input/cloud/png/224.png b/diylc-regression-data/input/cloud/png/224.png index b21b5e1e..e3fd37b9 100644 Binary files a/diylc-regression-data/input/cloud/png/224.png and b/diylc-regression-data/input/cloud/png/224.png differ diff --git a/diylc-regression-data/input/cloud/png/225.png b/diylc-regression-data/input/cloud/png/225.png index 5d4e8b4b..0cd4797f 100644 Binary files a/diylc-regression-data/input/cloud/png/225.png and b/diylc-regression-data/input/cloud/png/225.png differ diff --git a/diylc-regression-data/input/cloud/png/226.png b/diylc-regression-data/input/cloud/png/226.png index babfbd7e..7abf25fa 100644 Binary files a/diylc-regression-data/input/cloud/png/226.png and b/diylc-regression-data/input/cloud/png/226.png differ diff --git a/diylc-regression-data/input/cloud/png/230.png b/diylc-regression-data/input/cloud/png/230.png index d7637cac..9f27a4a5 100644 Binary files a/diylc-regression-data/input/cloud/png/230.png and b/diylc-regression-data/input/cloud/png/230.png differ diff --git a/diylc-regression-data/input/cloud/png/232.png b/diylc-regression-data/input/cloud/png/232.png index 25f86499..27552965 100644 Binary files a/diylc-regression-data/input/cloud/png/232.png and b/diylc-regression-data/input/cloud/png/232.png differ diff --git a/diylc-regression-data/input/cloud/png/233.png b/diylc-regression-data/input/cloud/png/233.png index 25f86499..27552965 100644 Binary files a/diylc-regression-data/input/cloud/png/233.png and b/diylc-regression-data/input/cloud/png/233.png differ diff --git a/diylc-regression-data/input/cloud/png/234.png b/diylc-regression-data/input/cloud/png/234.png index 22603c42..29379da4 100644 Binary files a/diylc-regression-data/input/cloud/png/234.png and b/diylc-regression-data/input/cloud/png/234.png differ diff --git a/diylc-regression-data/input/cloud/png/236.png b/diylc-regression-data/input/cloud/png/236.png index 2e3a0be9..6faa937d 100644 Binary files a/diylc-regression-data/input/cloud/png/236.png and b/diylc-regression-data/input/cloud/png/236.png differ diff --git a/diylc-regression-data/input/cloud/png/238.png b/diylc-regression-data/input/cloud/png/238.png index bce53739..19c31c2b 100644 Binary files a/diylc-regression-data/input/cloud/png/238.png and b/diylc-regression-data/input/cloud/png/238.png differ diff --git a/diylc-regression-data/input/cloud/png/242.png b/diylc-regression-data/input/cloud/png/242.png index ecb32fce..d550109d 100644 Binary files a/diylc-regression-data/input/cloud/png/242.png and b/diylc-regression-data/input/cloud/png/242.png differ diff --git a/diylc-regression-data/input/cloud/png/243.png b/diylc-regression-data/input/cloud/png/243.png index 3e2ff4eb..4f3aa998 100644 Binary files a/diylc-regression-data/input/cloud/png/243.png and b/diylc-regression-data/input/cloud/png/243.png differ diff --git a/diylc-regression-data/input/cloud/png/245.png b/diylc-regression-data/input/cloud/png/245.png index 04e4c707..db0bc9d5 100644 Binary files a/diylc-regression-data/input/cloud/png/245.png and b/diylc-regression-data/input/cloud/png/245.png differ diff --git a/diylc-regression-data/input/cloud/png/248.png b/diylc-regression-data/input/cloud/png/248.png index 43d73f44..ce1bc3ea 100644 Binary files a/diylc-regression-data/input/cloud/png/248.png and b/diylc-regression-data/input/cloud/png/248.png differ diff --git a/diylc-regression-data/input/cloud/png/249.png b/diylc-regression-data/input/cloud/png/249.png index 75da55cf..293d2ddf 100644 Binary files a/diylc-regression-data/input/cloud/png/249.png and b/diylc-regression-data/input/cloud/png/249.png differ diff --git a/diylc-regression-data/input/cloud/png/251.png b/diylc-regression-data/input/cloud/png/251.png index 0297f652..68275497 100644 Binary files a/diylc-regression-data/input/cloud/png/251.png and b/diylc-regression-data/input/cloud/png/251.png differ diff --git a/diylc-regression-data/input/cloud/png/252.png b/diylc-regression-data/input/cloud/png/252.png index b7c3c7ab..15a291c1 100644 Binary files a/diylc-regression-data/input/cloud/png/252.png and b/diylc-regression-data/input/cloud/png/252.png differ diff --git a/diylc-regression-data/input/cloud/png/253.png b/diylc-regression-data/input/cloud/png/253.png index ad79ec0c..f43923d4 100644 Binary files a/diylc-regression-data/input/cloud/png/253.png and b/diylc-regression-data/input/cloud/png/253.png differ diff --git a/diylc-regression-data/input/cloud/png/254.png b/diylc-regression-data/input/cloud/png/254.png index bb7e7921..c6f0583e 100644 Binary files a/diylc-regression-data/input/cloud/png/254.png and b/diylc-regression-data/input/cloud/png/254.png differ diff --git a/diylc-regression-data/input/cloud/png/256.png b/diylc-regression-data/input/cloud/png/256.png index c25867b5..42c63f81 100644 Binary files a/diylc-regression-data/input/cloud/png/256.png and b/diylc-regression-data/input/cloud/png/256.png differ diff --git a/diylc-regression-data/input/cloud/png/259.png b/diylc-regression-data/input/cloud/png/259.png index 6cc09761..79cc875e 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/260.png b/diylc-regression-data/input/cloud/png/260.png index 123dbee3..72936d97 100644 Binary files a/diylc-regression-data/input/cloud/png/260.png and b/diylc-regression-data/input/cloud/png/260.png differ diff --git a/diylc-regression-data/input/cloud/png/264.png b/diylc-regression-data/input/cloud/png/264.png index 17750b8c..e914acf9 100644 Binary files a/diylc-regression-data/input/cloud/png/264.png and b/diylc-regression-data/input/cloud/png/264.png differ diff --git a/diylc-regression-data/input/cloud/png/265.png b/diylc-regression-data/input/cloud/png/265.png index 78f05c9c..10d5e4b0 100644 Binary files a/diylc-regression-data/input/cloud/png/265.png and b/diylc-regression-data/input/cloud/png/265.png differ diff --git a/diylc-regression-data/input/cloud/png/267.png b/diylc-regression-data/input/cloud/png/267.png index e422592e..7ece4f05 100644 Binary files a/diylc-regression-data/input/cloud/png/267.png and b/diylc-regression-data/input/cloud/png/267.png differ diff --git a/diylc-regression-data/input/cloud/png/272.png b/diylc-regression-data/input/cloud/png/272.png index 659686fa..b635be57 100644 Binary files a/diylc-regression-data/input/cloud/png/272.png and b/diylc-regression-data/input/cloud/png/272.png differ diff --git a/diylc-regression-data/input/cloud/png/274.png b/diylc-regression-data/input/cloud/png/274.png index 5304cca3..e02fc236 100644 Binary files a/diylc-regression-data/input/cloud/png/274.png and b/diylc-regression-data/input/cloud/png/274.png differ diff --git a/diylc-regression-data/input/cloud/png/281.png b/diylc-regression-data/input/cloud/png/281.png index c0e2cc94..32137542 100644 Binary files a/diylc-regression-data/input/cloud/png/281.png and b/diylc-regression-data/input/cloud/png/281.png differ diff --git a/diylc-regression-data/input/cloud/png/287.png b/diylc-regression-data/input/cloud/png/287.png index dd8469e6..3134110b 100644 Binary files a/diylc-regression-data/input/cloud/png/287.png and b/diylc-regression-data/input/cloud/png/287.png differ diff --git a/diylc-regression-data/input/cloud/png/288.png b/diylc-regression-data/input/cloud/png/288.png index 06889d88..42d5f3a3 100644 Binary files a/diylc-regression-data/input/cloud/png/288.png and b/diylc-regression-data/input/cloud/png/288.png differ diff --git a/diylc-regression-data/input/cloud/png/289.png b/diylc-regression-data/input/cloud/png/289.png index b4e54e50..663564fe 100644 Binary files a/diylc-regression-data/input/cloud/png/289.png and b/diylc-regression-data/input/cloud/png/289.png differ diff --git a/diylc-regression-data/input/cloud/png/291.png b/diylc-regression-data/input/cloud/png/291.png index 438b745b..2b1e77c7 100644 Binary files a/diylc-regression-data/input/cloud/png/291.png and b/diylc-regression-data/input/cloud/png/291.png differ diff --git a/diylc-regression-data/input/cloud/png/292.png b/diylc-regression-data/input/cloud/png/292.png index d82b7737..63ee0593 100644 Binary files a/diylc-regression-data/input/cloud/png/292.png and b/diylc-regression-data/input/cloud/png/292.png differ diff --git a/diylc-regression-data/input/cloud/png/293.png b/diylc-regression-data/input/cloud/png/293.png index 2ad942ce..93b130f9 100644 Binary files a/diylc-regression-data/input/cloud/png/293.png and b/diylc-regression-data/input/cloud/png/293.png differ diff --git a/diylc-regression-data/input/cloud/png/294.png b/diylc-regression-data/input/cloud/png/294.png index c06fdc2d..6dcee3b2 100644 Binary files a/diylc-regression-data/input/cloud/png/294.png and b/diylc-regression-data/input/cloud/png/294.png differ diff --git a/diylc-regression-data/input/cloud/png/298.png b/diylc-regression-data/input/cloud/png/298.png index 40d2a747..d1be5e26 100644 Binary files a/diylc-regression-data/input/cloud/png/298.png and b/diylc-regression-data/input/cloud/png/298.png differ diff --git a/diylc-regression-data/input/cloud/png/301.png b/diylc-regression-data/input/cloud/png/301.png index 2412b50d..4fac0d6e 100644 Binary files a/diylc-regression-data/input/cloud/png/301.png and b/diylc-regression-data/input/cloud/png/301.png differ diff --git a/diylc-regression-data/input/cloud/png/302.png b/diylc-regression-data/input/cloud/png/302.png index e9a37ccd..d6ec779d 100644 Binary files a/diylc-regression-data/input/cloud/png/302.png and b/diylc-regression-data/input/cloud/png/302.png differ diff --git a/diylc-regression-data/input/cloud/png/305.png b/diylc-regression-data/input/cloud/png/305.png index 237abd46..3d1029b2 100644 Binary files a/diylc-regression-data/input/cloud/png/305.png and b/diylc-regression-data/input/cloud/png/305.png differ diff --git a/diylc-regression-data/input/cloud/png/308.png b/diylc-regression-data/input/cloud/png/308.png index 5f7b4bbd..6c6420ed 100644 Binary files a/diylc-regression-data/input/cloud/png/308.png and b/diylc-regression-data/input/cloud/png/308.png differ diff --git a/diylc-regression-data/input/cloud/png/309.png b/diylc-regression-data/input/cloud/png/309.png index 9ae313c2..270ed123 100644 Binary files a/diylc-regression-data/input/cloud/png/309.png and b/diylc-regression-data/input/cloud/png/309.png differ diff --git a/diylc-regression-data/input/cloud/png/310.png b/diylc-regression-data/input/cloud/png/310.png index 77cd382e..d7b162e1 100644 Binary files a/diylc-regression-data/input/cloud/png/310.png and b/diylc-regression-data/input/cloud/png/310.png differ diff --git a/diylc-regression-data/input/cloud/png/311.png b/diylc-regression-data/input/cloud/png/311.png index 4626196b..2459c8f7 100644 Binary files a/diylc-regression-data/input/cloud/png/311.png and b/diylc-regression-data/input/cloud/png/311.png differ diff --git a/diylc-regression-data/input/cloud/png/317.png b/diylc-regression-data/input/cloud/png/317.png index a00358e4..9cc155a2 100644 Binary files a/diylc-regression-data/input/cloud/png/317.png and b/diylc-regression-data/input/cloud/png/317.png differ diff --git a/diylc-regression-data/input/cloud/png/318.png b/diylc-regression-data/input/cloud/png/318.png index be3808da..bed8d0e1 100644 Binary files a/diylc-regression-data/input/cloud/png/318.png and b/diylc-regression-data/input/cloud/png/318.png differ diff --git a/diylc-regression-data/input/cloud/png/320.png b/diylc-regression-data/input/cloud/png/320.png index db847cec..f0d63d1a 100644 Binary files a/diylc-regression-data/input/cloud/png/320.png and b/diylc-regression-data/input/cloud/png/320.png differ diff --git a/diylc-regression-data/input/cloud/png/321.png b/diylc-regression-data/input/cloud/png/321.png index db847cec..f0d63d1a 100644 Binary files a/diylc-regression-data/input/cloud/png/321.png and b/diylc-regression-data/input/cloud/png/321.png differ diff --git a/diylc-regression-data/input/cloud/png/325.png b/diylc-regression-data/input/cloud/png/325.png index 576b4f98..ee366133 100644 Binary files a/diylc-regression-data/input/cloud/png/325.png and b/diylc-regression-data/input/cloud/png/325.png differ diff --git a/diylc-regression-data/input/cloud/png/329.png b/diylc-regression-data/input/cloud/png/329.png index 6dd35b37..c8d7ca63 100644 Binary files a/diylc-regression-data/input/cloud/png/329.png and b/diylc-regression-data/input/cloud/png/329.png differ diff --git a/diylc-regression-data/input/cloud/png/330.png b/diylc-regression-data/input/cloud/png/330.png index 21aaf592..f15aa06e 100644 Binary files a/diylc-regression-data/input/cloud/png/330.png and b/diylc-regression-data/input/cloud/png/330.png differ diff --git a/diylc-regression-data/input/cloud/png/345.png b/diylc-regression-data/input/cloud/png/345.png index a32c1e9b..b1d6f6c2 100644 Binary files a/diylc-regression-data/input/cloud/png/345.png and b/diylc-regression-data/input/cloud/png/345.png differ diff --git a/diylc-regression-data/input/cloud/png/348.png b/diylc-regression-data/input/cloud/png/348.png index 6400797e..c4cf7c08 100644 Binary files a/diylc-regression-data/input/cloud/png/348.png and b/diylc-regression-data/input/cloud/png/348.png differ diff --git a/diylc-regression-data/input/cloud/png/350.png b/diylc-regression-data/input/cloud/png/350.png index 09bd8005..da24a44b 100644 Binary files a/diylc-regression-data/input/cloud/png/350.png and b/diylc-regression-data/input/cloud/png/350.png differ diff --git a/diylc-regression-data/input/cloud/png/354.png b/diylc-regression-data/input/cloud/png/354.png index e02acc05..3de85481 100644 Binary files a/diylc-regression-data/input/cloud/png/354.png and b/diylc-regression-data/input/cloud/png/354.png differ diff --git a/diylc-regression-data/input/cloud/png/355.png b/diylc-regression-data/input/cloud/png/355.png index 8f9c0904..f2f43991 100644 Binary files a/diylc-regression-data/input/cloud/png/355.png and b/diylc-regression-data/input/cloud/png/355.png differ diff --git a/diylc-regression-data/input/cloud/png/363.png b/diylc-regression-data/input/cloud/png/363.png index 3e931c57..e8d9acca 100644 Binary files a/diylc-regression-data/input/cloud/png/363.png and b/diylc-regression-data/input/cloud/png/363.png differ diff --git a/diylc-regression-data/input/cloud/png/367.png b/diylc-regression-data/input/cloud/png/367.png index f2cdae6a..9f8fbaa6 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/368.png b/diylc-regression-data/input/cloud/png/368.png index f2cdae6a..9f8fbaa6 100644 Binary files a/diylc-regression-data/input/cloud/png/368.png and b/diylc-regression-data/input/cloud/png/368.png differ diff --git a/diylc-regression-data/input/cloud/png/375.png b/diylc-regression-data/input/cloud/png/375.png index 57442d9d..6ab7b5c7 100644 Binary files a/diylc-regression-data/input/cloud/png/375.png and b/diylc-regression-data/input/cloud/png/375.png differ diff --git a/diylc-regression-data/input/cloud/png/376.png b/diylc-regression-data/input/cloud/png/376.png index d97799cb..a894d418 100644 Binary files a/diylc-regression-data/input/cloud/png/376.png and b/diylc-regression-data/input/cloud/png/376.png differ diff --git a/diylc-regression-data/input/cloud/png/377.png b/diylc-regression-data/input/cloud/png/377.png index 037c4266..bfc47a2e 100644 Binary files a/diylc-regression-data/input/cloud/png/377.png and b/diylc-regression-data/input/cloud/png/377.png differ diff --git a/diylc-regression-data/input/cloud/png/378.png b/diylc-regression-data/input/cloud/png/378.png index b5627784..73b071f1 100644 Binary files a/diylc-regression-data/input/cloud/png/378.png and b/diylc-regression-data/input/cloud/png/378.png differ diff --git a/diylc-regression-data/input/cloud/png/379.png b/diylc-regression-data/input/cloud/png/379.png index 10d5781f..a2f946d9 100644 Binary files a/diylc-regression-data/input/cloud/png/379.png and b/diylc-regression-data/input/cloud/png/379.png differ diff --git a/diylc-regression-data/input/cloud/png/381.png b/diylc-regression-data/input/cloud/png/381.png index c5ae2c0f..fbc35013 100644 Binary files a/diylc-regression-data/input/cloud/png/381.png and b/diylc-regression-data/input/cloud/png/381.png differ diff --git a/diylc-regression-data/input/cloud/png/382.png b/diylc-regression-data/input/cloud/png/382.png index 52597e0d..673b58bd 100644 Binary files a/diylc-regression-data/input/cloud/png/382.png and b/diylc-regression-data/input/cloud/png/382.png differ diff --git a/diylc-regression-data/input/cloud/png/384.png b/diylc-regression-data/input/cloud/png/384.png index 04870696..de21cdcb 100644 Binary files a/diylc-regression-data/input/cloud/png/384.png and b/diylc-regression-data/input/cloud/png/384.png differ diff --git a/diylc-regression-data/input/cloud/png/385.png b/diylc-regression-data/input/cloud/png/385.png index f84e7856..a3ef2a52 100644 Binary files a/diylc-regression-data/input/cloud/png/385.png and b/diylc-regression-data/input/cloud/png/385.png differ diff --git a/diylc-regression-data/input/cloud/png/386.png b/diylc-regression-data/input/cloud/png/386.png index 119cad5c..96f4ef6a 100644 Binary files a/diylc-regression-data/input/cloud/png/386.png and b/diylc-regression-data/input/cloud/png/386.png differ diff --git a/diylc-regression-data/input/cloud/png/387.png b/diylc-regression-data/input/cloud/png/387.png index 6b5f87a1..09895a51 100644 Binary files a/diylc-regression-data/input/cloud/png/387.png and b/diylc-regression-data/input/cloud/png/387.png differ diff --git a/diylc-regression-data/input/cloud/png/388.png b/diylc-regression-data/input/cloud/png/388.png index 6fa0a315..2e491e77 100644 Binary files a/diylc-regression-data/input/cloud/png/388.png and b/diylc-regression-data/input/cloud/png/388.png differ diff --git a/diylc-regression-data/input/cloud/png/389.png b/diylc-regression-data/input/cloud/png/389.png index bb146711..0b32829d 100644 Binary files a/diylc-regression-data/input/cloud/png/389.png and b/diylc-regression-data/input/cloud/png/389.png differ diff --git a/diylc-regression-data/input/cloud/png/397.png b/diylc-regression-data/input/cloud/png/397.png index c21dc777..91b10475 100644 Binary files a/diylc-regression-data/input/cloud/png/397.png and b/diylc-regression-data/input/cloud/png/397.png differ diff --git a/diylc-regression-data/input/cloud/png/401.png b/diylc-regression-data/input/cloud/png/401.png index b5398596..97aac21c 100644 Binary files a/diylc-regression-data/input/cloud/png/401.png and b/diylc-regression-data/input/cloud/png/401.png differ diff --git a/diylc-regression-data/input/cloud/png/402.png b/diylc-regression-data/input/cloud/png/402.png index a7e46e7c..bbb12d64 100644 Binary files a/diylc-regression-data/input/cloud/png/402.png and b/diylc-regression-data/input/cloud/png/402.png differ diff --git a/diylc-regression-data/input/cloud/png/403.png b/diylc-regression-data/input/cloud/png/403.png index 05bce7a6..83f2a0fc 100644 Binary files a/diylc-regression-data/input/cloud/png/403.png and b/diylc-regression-data/input/cloud/png/403.png differ diff --git a/diylc-regression-data/input/cloud/png/404.png b/diylc-regression-data/input/cloud/png/404.png index b5398596..97aac21c 100644 Binary files a/diylc-regression-data/input/cloud/png/404.png and b/diylc-regression-data/input/cloud/png/404.png differ diff --git a/diylc-regression-data/input/cloud/png/405.png b/diylc-regression-data/input/cloud/png/405.png index 67fca82d..f13cfbaf 100644 Binary files a/diylc-regression-data/input/cloud/png/405.png and b/diylc-regression-data/input/cloud/png/405.png differ diff --git a/diylc-regression-data/input/cloud/png/406.png b/diylc-regression-data/input/cloud/png/406.png index e4d52166..ae70fc97 100644 Binary files a/diylc-regression-data/input/cloud/png/406.png and b/diylc-regression-data/input/cloud/png/406.png differ diff --git a/diylc-regression-data/input/cloud/png/407.png b/diylc-regression-data/input/cloud/png/407.png index 57bf8e16..04a6e5c4 100644 Binary files a/diylc-regression-data/input/cloud/png/407.png and b/diylc-regression-data/input/cloud/png/407.png differ diff --git a/diylc-regression-data/input/cloud/png/408.png b/diylc-regression-data/input/cloud/png/408.png index 8dc4f330..3667cfb1 100644 Binary files a/diylc-regression-data/input/cloud/png/408.png and b/diylc-regression-data/input/cloud/png/408.png differ diff --git a/diylc-regression-data/input/cloud/png/409.png b/diylc-regression-data/input/cloud/png/409.png index d30eb8db..475ee0a0 100644 Binary files a/diylc-regression-data/input/cloud/png/409.png and b/diylc-regression-data/input/cloud/png/409.png differ diff --git a/diylc-regression-data/input/cloud/png/410.png b/diylc-regression-data/input/cloud/png/410.png index e0368cd2..6a26c1a2 100644 Binary files a/diylc-regression-data/input/cloud/png/410.png and b/diylc-regression-data/input/cloud/png/410.png differ diff --git a/diylc-regression-data/input/cloud/png/412.png b/diylc-regression-data/input/cloud/png/412.png index 47dea924..bfafd3af 100644 Binary files a/diylc-regression-data/input/cloud/png/412.png and b/diylc-regression-data/input/cloud/png/412.png differ diff --git a/diylc-regression-data/input/cloud/png/413.png b/diylc-regression-data/input/cloud/png/413.png index 141bf27c..b0d99a9b 100644 Binary files a/diylc-regression-data/input/cloud/png/413.png and b/diylc-regression-data/input/cloud/png/413.png differ diff --git a/diylc-regression-data/input/cloud/png/414.png b/diylc-regression-data/input/cloud/png/414.png index 49c15ed3..4ffe0795 100644 Binary files a/diylc-regression-data/input/cloud/png/414.png and b/diylc-regression-data/input/cloud/png/414.png differ diff --git a/diylc-regression-data/input/cloud/png/416.png b/diylc-regression-data/input/cloud/png/416.png index ccf457c8..0dc0486c 100644 Binary files a/diylc-regression-data/input/cloud/png/416.png and b/diylc-regression-data/input/cloud/png/416.png differ diff --git a/diylc-regression-data/input/cloud/png/419.png b/diylc-regression-data/input/cloud/png/419.png index bf0d2770..3cd27621 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/46.png b/diylc-regression-data/input/cloud/png/46.png index c3a81d58..bb9c5846 100644 Binary files a/diylc-regression-data/input/cloud/png/46.png and b/diylc-regression-data/input/cloud/png/46.png differ diff --git a/diylc-regression-data/input/cloud/png/47.png b/diylc-regression-data/input/cloud/png/47.png index 22dd0bb7..3e7bc3c2 100644 Binary files a/diylc-regression-data/input/cloud/png/47.png and b/diylc-regression-data/input/cloud/png/47.png differ diff --git a/diylc-regression-data/input/cloud/png/50.png b/diylc-regression-data/input/cloud/png/50.png index d4e786b8..b4bc15cc 100644 Binary files a/diylc-regression-data/input/cloud/png/50.png and b/diylc-regression-data/input/cloud/png/50.png differ diff --git a/diylc-regression-data/input/cloud/png/51.png b/diylc-regression-data/input/cloud/png/51.png index 6d36ef78..075101fc 100644 Binary files a/diylc-regression-data/input/cloud/png/51.png and b/diylc-regression-data/input/cloud/png/51.png differ diff --git a/diylc-regression-data/input/cloud/png/60.png b/diylc-regression-data/input/cloud/png/60.png index ee5b5c6c..ce854d2c 100644 Binary files a/diylc-regression-data/input/cloud/png/60.png and b/diylc-regression-data/input/cloud/png/60.png differ diff --git a/diylc-regression-data/input/cloud/png/61.png b/diylc-regression-data/input/cloud/png/61.png index 783aa88e..387952fa 100644 Binary files a/diylc-regression-data/input/cloud/png/61.png and b/diylc-regression-data/input/cloud/png/61.png differ diff --git a/diylc-regression-data/input/cloud/png/66.png b/diylc-regression-data/input/cloud/png/66.png index 1a00b013..4090a4fe 100644 Binary files a/diylc-regression-data/input/cloud/png/66.png and b/diylc-regression-data/input/cloud/png/66.png differ diff --git a/diylc-regression-data/input/cloud/png/67.png b/diylc-regression-data/input/cloud/png/67.png index 46be2786..14b29899 100644 Binary files a/diylc-regression-data/input/cloud/png/67.png and b/diylc-regression-data/input/cloud/png/67.png differ diff --git a/diylc-regression-data/input/cloud/png/68.png b/diylc-regression-data/input/cloud/png/68.png index 18f7e1bf..ddb80392 100644 Binary files a/diylc-regression-data/input/cloud/png/68.png and b/diylc-regression-data/input/cloud/png/68.png differ diff --git a/diylc-regression-data/input/cloud/png/69.png b/diylc-regression-data/input/cloud/png/69.png index 7cfc6af1..91979dbf 100644 Binary files a/diylc-regression-data/input/cloud/png/69.png and b/diylc-regression-data/input/cloud/png/69.png differ diff --git a/diylc-regression-data/input/cloud/png/70.png b/diylc-regression-data/input/cloud/png/70.png index 5885418a..8b7e6343 100644 Binary files a/diylc-regression-data/input/cloud/png/70.png and b/diylc-regression-data/input/cloud/png/70.png differ diff --git a/diylc-regression-data/input/cloud/png/71.png b/diylc-regression-data/input/cloud/png/71.png index 90f7d002..d3f1988f 100644 Binary files a/diylc-regression-data/input/cloud/png/71.png and b/diylc-regression-data/input/cloud/png/71.png differ diff --git a/diylc-regression-data/input/cloud/png/72.png b/diylc-regression-data/input/cloud/png/72.png index d5df20b6..820fd782 100644 Binary files a/diylc-regression-data/input/cloud/png/72.png and b/diylc-regression-data/input/cloud/png/72.png differ diff --git a/diylc-regression-data/input/cloud/png/73.png b/diylc-regression-data/input/cloud/png/73.png index 232fcd27..6ba3cae0 100644 Binary files a/diylc-regression-data/input/cloud/png/73.png and b/diylc-regression-data/input/cloud/png/73.png differ diff --git a/diylc-regression-data/input/cloud/png/77.png b/diylc-regression-data/input/cloud/png/77.png index d14b7df1..d8bfe37b 100644 Binary files a/diylc-regression-data/input/cloud/png/77.png and b/diylc-regression-data/input/cloud/png/77.png differ diff --git a/diylc-regression-data/input/cloud/png/78.png b/diylc-regression-data/input/cloud/png/78.png index 34b1fbcf..bfc62539 100644 Binary files a/diylc-regression-data/input/cloud/png/78.png and b/diylc-regression-data/input/cloud/png/78.png differ diff --git a/diylc-regression-data/input/cloud/png/79.png b/diylc-regression-data/input/cloud/png/79.png index acba5d9d..150a9f2b 100644 Binary files a/diylc-regression-data/input/cloud/png/79.png and b/diylc-regression-data/input/cloud/png/79.png differ diff --git a/diylc-regression-data/input/cloud/png/87.png b/diylc-regression-data/input/cloud/png/87.png index 90d46b1d..14ffbc1b 100644 Binary files a/diylc-regression-data/input/cloud/png/87.png and b/diylc-regression-data/input/cloud/png/87.png differ diff --git a/diylc-regression-data/input/cloud/png/88.png b/diylc-regression-data/input/cloud/png/88.png index 22cf58ae..9224612a 100644 Binary files a/diylc-regression-data/input/cloud/png/88.png and b/diylc-regression-data/input/cloud/png/88.png differ diff --git a/diylc-regression-data/input/cloud/png/89.png b/diylc-regression-data/input/cloud/png/89.png index a519a7d1..8ff176fb 100644 Binary files a/diylc-regression-data/input/cloud/png/89.png and b/diylc-regression-data/input/cloud/png/89.png differ diff --git a/diylc-regression-data/input/cloud/png/90.png b/diylc-regression-data/input/cloud/png/90.png index feac1f41..be2d2c54 100644 Binary files a/diylc-regression-data/input/cloud/png/90.png and b/diylc-regression-data/input/cloud/png/90.png differ diff --git a/diylc-regression-data/input/diy-fever/netlist/jfet boost_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/jfet boost_excl_switches.txt index 3b25409b..019950db 100644 --- a/diylc-regression-data/input/diy-fever/netlist/jfet boost_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/jfet boost_excl_switches.txt @@ -2,10 +2,8 @@ Switch setup: [Default] C1.1 <-> Q1.2 <-> R2.2 C1.1 <-> R2.2 - C1.2 <-> GND2 + C1.2 <-> C2.2 <-> GND <-> R2.2 C2.1 <-> R2.1 <-> R2.2 - C2.2 <-> GND3 - GND1 <-> R2.2 Q1.3 <-> R1.1 R2.1 <-> R2.2 diff --git a/diylc-regression-data/input/diy-fever/netlist/jfet boost_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/jfet boost_incl_switches.txt index 3b25409b..019950db 100644 --- a/diylc-regression-data/input/diy-fever/netlist/jfet boost_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/jfet boost_incl_switches.txt @@ -2,10 +2,8 @@ Switch setup: [Default] C1.1 <-> Q1.2 <-> R2.2 C1.1 <-> R2.2 - C1.2 <-> GND2 + C1.2 <-> C2.2 <-> GND <-> R2.2 C2.1 <-> R2.1 <-> R2.2 - C2.2 <-> GND3 - GND1 <-> R2.2 Q1.3 <-> R1.1 R2.1 <-> R2.2 diff --git a/diylc-regression-data/input/diy-fever/png/IIc+.png b/diylc-regression-data/input/diy-fever/png/IIc+.png index d97bc2b5..d3b072dd 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/jfet boost.png b/diylc-regression-data/input/diy-fever/png/jfet boost.png index 1793f802..4e58b210 100644 Binary files a/diylc-regression-data/input/diy-fever/png/jfet boost.png and b/diylc-regression-data/input/diy-fever/png/jfet boost.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 a198d4f2..21a25a36 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/splitter2.png b/diylc-regression-data/input/diy-fever/png/splitter2.png index ef5de71a..8cc33c70 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/timmy7.png b/diylc-regression-data/input/diy-fever/png/timmy7.png index e45c0883..4562d98e 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 eec6eb29..1ff96b3c 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,334 +1 @@ -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON1:.ON2:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1:.ON1:.ON1, .ON1:.ON1:.ON2:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON2:.ON1:.ON1, .ON1:.ON1:.ON2:.ON2:.ON1:.ON2, .ON2:.ON1:.ON1:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON1:.ON1:.ON2, .ON2:.ON1:.ON1:.ON2:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2:.ON1:.ON2, .ON2:.ON1:.ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON2:.ON1:.ON1:.ON2, .ON2:.ON1:.ON2:.ON2:.ON1:.ON1, .ON2:.ON1:.ON2:.ON2:.ON1:.ON2] - - .047 uF.1 <-> J1.2 - .047 uF.2 <-> 1 M.2 <-> R1.2 - .1 <-> C31.2 <-> R42.2 - .1 <-> R2.1 - .2 <-> 1 M.1 <-> 1N4007.1 <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> BASS-LEAD.2 <-> BASS-LEAD.3 <-> C1.2 <-> C2.1 <-> C20.1 <-> C20.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> CP RY.1 <-> D11.2 <-> D12.2 <-> D13.2 <-> D2.2 <-> D3.1 <-> D4.1 <-> D5.2 <-> D7.2 <-> J1.1 <-> J1.4 <-> 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 <-> R22.1 <-> R24.2 <-> R27.2 <-> R28.1 <-> R28.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.8 <-> TREBLE-LEAD.1 - .2 <-> R54.1 - 1N4007.2 <-> C8.1 <-> D7.1 <-> R15.2 - BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 - C1.1 <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 - 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.1 <-> 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 - C2.2 <-> R4.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 - 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.1 <-> C31.1 <-> C33.1 <-> D10.1 <-> D9.1 <-> J30.J30Sleeve <-> R43.1 <-> V1.4 <-> V1.5 - C30.2 <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 - C32.1 <-> J29.J29Sleeve - C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 - C34.2 <-> C5.2 <-> R6.1 - C4.1 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 - C6.2 <-> D2.2 <-> D3.1 - C7.1 <-> J59.J59Sleeve - C9.1 <-> R18.1 - C9.2 <-> R17.1 <-> R20.1 <-> V2.7 - CLEAN GAIN.2 <-> RY1.3 - D1.1 <-> D3.2 <-> D4.2 <-> D5.1 - D1.2 <-> D2.1 - D10.2 <-> D6.1 - D12.1 <-> R39.2 - D6.2 <-> D8.2 <-> FH2.1 - D8.1 <-> D9.2 - DUAL BASS 2--LEAD.1 <-> R24.1 - DUAL BASS-CLEAN.1 <-> R27.1 - FH1.1 <-> IEC1.3 - IEC1.1 <-> J32.J32Sleeve - J36.J36Sleeve <-> J60.4 <-> J61.4 <-> V5.8 - J38.J38Sleeve <-> V7.1 <-> V7.8 - J60.2 <-> J61.2 - 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 - R41.1 <-> R48.1 <-> V6.6 - 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 - R6.2 <-> R7.2 - V4.3 <-> V5.3 - V6.3 <-> V7.3 - -Switch setup: [.ON1:.ON1:.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON1:.ON1:.ON2:.ON2, .ON1:.ON1:.ON1:.ON2:.ON2:.ON1, .ON1:.ON1:.ON1:.ON2:.ON2:.ON2, .ON1:.ON1:.ON2:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON1:.ON2:.ON2, .ON1:.ON1:.ON2:.ON2:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2:.ON2:.ON2, .ON2:.ON1:.ON1:.ON1:.ON2:.ON1, .ON2:.ON1:.ON1:.ON1:.ON2:.ON2, .ON2:.ON1:.ON1:.ON2:.ON2:.ON1, .ON2:.ON1:.ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON1:.ON2:.ON2, .ON2:.ON1:.ON2:.ON2:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2:.ON2:.ON2] - - .047 uF.1 <-> J1.2 - .047 uF.2 <-> 1 M.2 <-> R1.2 - .1 <-> C31.2 <-> R42.2 - .1 <-> R2.1 - .2 <-> 1 M.1 <-> 1N4007.1 <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> BASS-LEAD.2 <-> BASS-LEAD.3 <-> C1.2 <-> C2.1 <-> C20.1 <-> C20.2 <-> C34.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> CP RY.1 <-> D11.2 <-> D12.2 <-> D13.2 <-> D2.2 <-> D3.1 <-> D4.1 <-> D5.2 <-> D7.2 <-> J1.1 <-> J1.4 <-> 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 <-> R22.1 <-> R24.2 <-> R27.2 <-> R28.1 <-> R28.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.8 <-> TREBLE-LEAD.1 - .2 <-> R54.1 - 1N4007.2 <-> C8.1 <-> D7.1 <-> R15.2 - BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 - C1.1 <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 - 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.1 <-> 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 - C2.2 <-> R4.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 - 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.1 <-> C31.1 <-> C33.1 <-> D10.1 <-> D9.1 <-> J30.J30Sleeve <-> R43.1 <-> V1.4 <-> V1.5 - C30.2 <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 - C32.1 <-> J29.J29Sleeve - C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 - C34.2 <-> C5.2 <-> R6.1 - C4.1 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 - C6.2 <-> D2.2 <-> D3.1 - C7.1 <-> J59.J59Sleeve - C9.1 <-> R18.1 - C9.2 <-> R17.1 <-> R20.1 <-> V2.7 - CLEAN GAIN.2 <-> RY1.3 - D1.1 <-> D3.2 <-> D4.2 <-> D5.1 - D1.2 <-> D2.1 - D10.2 <-> D6.1 - D12.1 <-> R39.2 - D6.2 <-> D8.2 <-> FH2.1 - D8.1 <-> D9.2 - DUAL BASS 2--LEAD.1 <-> R24.1 - DUAL BASS-CLEAN.1 <-> R27.1 - FH1.1 <-> IEC1.3 - IEC1.1 <-> J32.J32Sleeve - J36.J36Sleeve <-> J60.4 <-> J61.4 <-> V5.8 - J38.J38Sleeve <-> V7.1 <-> V7.8 - J60.2 <-> J61.2 - 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 - R41.1 <-> R48.1 <-> V6.6 - 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 - R6.2 <-> R7.2 - V4.3 <-> V5.3 - V6.3 <-> V7.3 - -Switch setup: [.ON1:.ON2:.ON1:.ON1:.ON1:.ON1, .ON1:.ON2:.ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2:.ON1:.ON2, .ON1:.ON2:.ON2:.ON1:.ON1:.ON1, .ON1:.ON2:.ON2:.ON1:.ON1:.ON2, .ON1:.ON2:.ON2:.ON2:.ON1:.ON1, .ON1:.ON2:.ON2:.ON2:.ON1:.ON2, .ON1:.OFF:.ON1:.ON1:.ON1:.ON1, .ON1:.OFF:.ON1:.ON1:.ON1:.ON2, .ON1:.OFF:.ON1:.ON2:.ON1:.ON1, .ON1:.OFF:.ON1:.ON2:.ON1:.ON2, .ON1:.OFF:.ON2:.ON1:.ON1:.ON1, .ON1:.OFF:.ON2:.ON1:.ON1:.ON2, .ON1:.OFF:.ON2:.ON2:.ON1:.ON1, .ON1:.OFF:.ON2:.ON2:.ON1:.ON2, .ON2:.ON2:.ON1:.ON1:.ON1:.ON1, .ON2:.ON2:.ON1:.ON1:.ON1:.ON2, .ON2:.ON2:.ON1:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2:.ON1:.ON2, .ON2:.ON2:.ON2:.ON1:.ON1:.ON1, .ON2:.ON2:.ON2:.ON1:.ON1:.ON2, .ON2:.ON2:.ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON2:.ON2:.ON1:.ON2, .ON2:.OFF:.ON1:.ON1:.ON1:.ON1, .ON2:.OFF:.ON1:.ON1:.ON1:.ON2, .ON2:.OFF:.ON1:.ON2:.ON1:.ON1, .ON2:.OFF:.ON1:.ON2:.ON1:.ON2, .ON2:.OFF:.ON2:.ON1:.ON1:.ON1, .ON2:.OFF:.ON2:.ON1:.ON1:.ON2, .ON2:.OFF:.ON2:.ON2:.ON1:.ON1, .ON2:.OFF:.ON2:.ON2:.ON1:.ON2] - - .047 uF.1 <-> J1.2 - .047 uF.2 <-> 1 M.2 <-> R1.2 - .1 <-> C31.2 <-> R42.2 - .1 <-> R2.1 - .2 <-> 1 M.1 <-> 1N4007.1 <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> BASS-LEAD.2 <-> BASS-LEAD.3 <-> C1.2 <-> C2.1 <-> C20.1 <-> C20.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.2 <-> D13.2 <-> D2.2 <-> D3.1 <-> D4.1 <-> D5.2 <-> D7.2 <-> J1.1 <-> J1.4 <-> 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 <-> R22.1 <-> R24.2 <-> R27.2 <-> R28.1 <-> R28.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.8 <-> TREBLE-LEAD.1 - .2 <-> R54.1 - 1N4007.2 <-> C8.1 <-> D7.1 <-> R15.2 - BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 - C1.1 <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 - 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.1 <-> 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 - C2.2 <-> R4.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 - 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.1 <-> C31.1 <-> C33.1 <-> D10.1 <-> D9.1 <-> J30.J30Sleeve <-> R43.1 <-> V1.4 <-> V1.5 - C30.2 <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 - C32.1 <-> J29.J29Sleeve - C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 - C34.2 <-> C5.2 <-> R6.1 - C4.1 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 - C6.2 <-> D2.2 <-> D3.1 - C7.1 <-> J59.J59Sleeve - C9.1 <-> R18.1 - C9.2 <-> R17.1 <-> R20.1 <-> V2.7 - CLEAN GAIN.2 <-> RY1.3 - CP RY.1 <-> D12.2 - D1.1 <-> D3.2 <-> D4.2 <-> D5.1 - D1.2 <-> D2.1 - D10.2 <-> D6.1 - D12.1 <-> R39.2 - D6.2 <-> D8.2 <-> FH2.1 - D8.1 <-> D9.2 - DUAL BASS 2--LEAD.1 <-> R24.1 - DUAL BASS-CLEAN.1 <-> R27.1 - FH1.1 <-> IEC1.3 - IEC1.1 <-> J32.J32Sleeve - J36.J36Sleeve <-> J60.4 <-> J61.4 <-> V5.8 - J38.J38Sleeve <-> V7.1 <-> V7.8 - J60.2 <-> J61.2 - 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 - R41.1 <-> R48.1 <-> V6.6 - 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 - R6.2 <-> R7.2 - V4.3 <-> V5.3 - V6.3 <-> V7.3 - -Switch setup: [.ON1:.ON2:.ON1:.ON1:.ON2:.ON1, .ON1:.ON2:.ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON1:.ON2:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1:.ON2:.ON1, .ON1:.ON2:.ON2:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2:.ON2:.ON2, .ON1:.OFF:.ON1:.ON1:.ON2:.ON1, .ON1:.OFF:.ON1:.ON1:.ON2:.ON2, .ON1:.OFF:.ON1:.ON2:.ON2:.ON1, .ON1:.OFF:.ON1:.ON2:.ON2:.ON2, .ON1:.OFF:.ON2:.ON1:.ON2:.ON1, .ON1:.OFF:.ON2:.ON1:.ON2:.ON2, .ON1:.OFF:.ON2:.ON2:.ON2:.ON1, .ON1:.OFF:.ON2:.ON2:.ON2:.ON2, .ON2:.ON2:.ON1:.ON1:.ON2:.ON1, .ON2:.ON2:.ON1:.ON1:.ON2:.ON2, .ON2:.ON2:.ON1:.ON2:.ON2:.ON1, .ON2:.ON2:.ON1:.ON2:.ON2:.ON2, .ON2:.ON2:.ON2:.ON1:.ON2:.ON1, .ON2:.ON2:.ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2:.ON2:.ON2, .ON2:.OFF:.ON1:.ON1:.ON2:.ON1, .ON2:.OFF:.ON1:.ON1:.ON2:.ON2, .ON2:.OFF:.ON1:.ON2:.ON2:.ON1, .ON2:.OFF:.ON1:.ON2:.ON2:.ON2, .ON2:.OFF:.ON2:.ON1:.ON2:.ON1, .ON2:.OFF:.ON2:.ON1:.ON2:.ON2, .ON2:.OFF:.ON2:.ON2:.ON2:.ON1, .ON2:.OFF:.ON2:.ON2:.ON2:.ON2] - - .047 uF.1 <-> J1.2 - .047 uF.2 <-> 1 M.2 <-> R1.2 - .1 <-> C31.2 <-> R42.2 - .1 <-> R2.1 - .2 <-> 1 M.1 <-> 1N4007.1 <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> BASS-LEAD.2 <-> BASS-LEAD.3 <-> C1.2 <-> C2.1 <-> C20.1 <-> C20.2 <-> C34.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> D11.2 <-> D13.2 <-> D2.2 <-> D3.1 <-> D4.1 <-> D5.2 <-> D7.2 <-> J1.1 <-> J1.4 <-> 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 <-> R22.1 <-> R24.2 <-> R27.2 <-> R28.1 <-> R28.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.8 <-> TREBLE-LEAD.1 - .2 <-> R54.1 - 1N4007.2 <-> C8.1 <-> D7.1 <-> R15.2 - BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 - C1.1 <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 - 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.1 <-> 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 - C2.2 <-> R4.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 - 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.1 <-> C31.1 <-> C33.1 <-> D10.1 <-> D9.1 <-> J30.J30Sleeve <-> R43.1 <-> V1.4 <-> V1.5 - C30.2 <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2 - C32.1 <-> J29.J29Sleeve - C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2 - C34.2 <-> C5.2 <-> R6.1 - C4.1 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7 - C6.2 <-> D2.2 <-> D3.1 - C7.1 <-> J59.J59Sleeve - C9.1 <-> R18.1 - C9.2 <-> R17.1 <-> R20.1 <-> V2.7 - CLEAN GAIN.2 <-> RY1.3 - CP RY.1 <-> D12.2 - D1.1 <-> D3.2 <-> D4.2 <-> D5.1 - D1.2 <-> D2.1 - D10.2 <-> D6.1 - D12.1 <-> R39.2 - D6.2 <-> D8.2 <-> FH2.1 - D8.1 <-> D9.2 - DUAL BASS 2--LEAD.1 <-> R24.1 - DUAL BASS-CLEAN.1 <-> R27.1 - FH1.1 <-> IEC1.3 - IEC1.1 <-> J32.J32Sleeve - J36.J36Sleeve <-> J60.4 <-> J61.4 <-> V5.8 - J38.J38Sleeve <-> V7.1 <-> V7.8 - J60.2 <-> J61.2 - 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 - R41.1 <-> R48.1 <-> V6.6 - 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 - R6.2 <-> R7.2 - V4.3 <-> V5.3 - V6.3 <-> V7.3 - +org.diylc.netlist.NetlistException: Maximum number of switching combinations exceeded. Allowed: 64, actual: 96 \ No newline at end of file diff --git a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt index 6adf18b7..5b302fb3 100644 --- a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt @@ -1,13 +1,12 @@ Switch setup: [Default] .1 <-> C6.1 - .2 <-> GND4 + .2 <-> 250K Lin.1 <-> 250K Lin.2 <-> C1.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C5.1 <-> C5.1 <-> C5.1 <-> C5.2 <-> C5.2 <-> GND <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.3 <-> Presence.3 <-> R21.1 <-> R25.1 <-> R25.2 <-> R28.2 <-> R29.1 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.3 <-> VR1.3 <-> VR1.3 .2 <-> V1.2 <-> Volume.2 .3 <-> C7.1 .4 <-> C6.2 .5 <-> Treble.2 <-> Volume.1 <-> VR1.2 .6 <-> C7.2 - 250K Lin.1 <-> 250K Lin.2 <-> C5.1 <-> C5.1 <-> C5.1 <-> GND3 <-> R28.2 <-> R29.1 250K Lin.3 <-> Bias.1 <-> Bias.1 Bass.1 <-> VR1.1 Bass.2 <-> C1.2 <-> C1.2 <-> Treble.3 <-> VR1.2 <-> VR1.3 @@ -18,7 +17,6 @@ Switch setup: [Default] C1.1 <-> C1.1 <-> C1.1 <-> R3.1 C1.1 <-> C1.1 <-> C3.2 <-> R16.2 C1.1 <-> C3.1 <-> R15.1 - C1.1 <-> C5.2 <-> C5.2 <-> GND2 <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.3 <-> Presence.3 <-> R21.1 <-> R25.1 <-> R25.2 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.3 <-> VR1.3 <-> VR1.3 C1.1 <-> R8.1 <-> V1.7 C1.1 <-> R9.2 <-> V1.2 C1.2 <-> C1.2 <-> R14.1 <-> R23.2 <-> R23.2 @@ -31,7 +29,6 @@ Switch setup: [Default] C2.1 <-> R1.2 <-> R2.1 <-> R4.2 C2.1 <-> R10.1 <-> R15.2 <-> R16.1 <-> R17.2 <-> R4.1 C2.1 <-> R17.1 <-> R18.2 <-> R24.1 <-> R24.1 - C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> GND1 C2.2 <-> R26.1 C3.1 <-> Treble.1 <-> VR1.1 C3.2 <-> R1.1 <-> R3.2 diff --git a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt index 9fe7506d..110debfb 100644 --- a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2] - 250K Lin.1 <-> 250K Lin.2 <-> C5.1 <-> C5.1 <-> C5.1 <-> GND3 <-> R28.2 <-> R29.1 + 250K Lin.1 <-> 250K Lin.2 <-> C1.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C5.1 <-> C5.1 <-> C5.1 <-> C5.2 <-> C5.2 <-> GND <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.3 <-> Presence.3 <-> R21.1 <-> R25.1 <-> R25.2 <-> R28.2 <-> R29.1 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.3 <-> VR1.3 <-> VR1.3 250K Lin.3 <-> Bias.1 <-> Bias.1 Bass.1 <-> VR1.1 Bass.2 <-> C1.2 <-> C1.2 <-> Treble.3 <-> VR1.2 <-> VR1.3 @@ -11,7 +11,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2] C1.1 <-> C1.1 <-> C1.1 <-> R3.1 C1.1 <-> C1.1 <-> C3.2 <-> R16.2 C1.1 <-> C3.1 <-> R15.1 - C1.1 <-> C5.2 <-> C5.2 <-> GND2 <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.3 <-> Presence.3 <-> R21.1 <-> R25.1 <-> R25.2 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.3 <-> VR1.3 <-> VR1.3 C1.1 <-> R8.1 <-> V1.7 C1.1 <-> R9.2 <-> V1.2 C1.2 <-> C1.2 <-> R14.1 <-> R23.2 <-> R23.2 @@ -24,7 +23,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2] C2.1 <-> R1.2 <-> R2.1 <-> R4.2 C2.1 <-> R10.1 <-> R15.2 <-> R16.1 <-> R17.2 <-> R4.1 C2.1 <-> R17.1 <-> R18.2 <-> R24.1 <-> R24.1 - C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> GND1 C2.2 <-> R26.1 C3.1 <-> Treble.1 <-> VR1.1 C3.2 <-> R1.1 <-> R3.2 @@ -60,7 +58,7 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2] Switch setup: [.ON2:.ON1, .ON2:.ON2] - 250K Lin.1 <-> 250K Lin.2 <-> C5.1 <-> C5.1 <-> C5.1 <-> GND3 <-> R28.2 <-> R29.1 + 250K Lin.1 <-> 250K Lin.2 <-> C1.1 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C5.1 <-> C5.1 <-> C5.1 <-> C5.2 <-> C5.2 <-> GND <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.3 <-> Presence.3 <-> R21.1 <-> R25.1 <-> R25.2 <-> R28.2 <-> R29.1 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.3 <-> VR1.3 <-> VR1.3 250K Lin.3 <-> Bias.1 <-> Bias.1 Bass.1 <-> VR1.1 Bass.2 <-> C1.2 <-> C1.2 <-> Treble.3 <-> VR1.2 <-> VR1.3 @@ -71,7 +69,6 @@ Switch setup: [.ON2:.ON1, .ON2:.ON2] C1.1 <-> C1.1 <-> C1.1 <-> R3.1 C1.1 <-> C1.1 <-> C3.2 <-> R16.2 C1.1 <-> C3.1 <-> R15.1 - C1.1 <-> C5.2 <-> C5.2 <-> GND2 <-> Input.Ring <-> Input.Sleeve <-> Input.Tip <-> Middle.3 <-> Presence.3 <-> R21.1 <-> R25.1 <-> R25.2 <-> R5.2 <-> R6.1 <-> V1.7 <-> Volume.3 <-> VR1.3 <-> VR1.3 C1.1 <-> R8.1 <-> V1.7 C1.1 <-> R9.2 <-> V1.2 C1.2 <-> C1.2 <-> R14.1 <-> R23.2 <-> R23.2 @@ -84,7 +81,6 @@ Switch setup: [.ON2:.ON1, .ON2:.ON2] C2.1 <-> R1.2 <-> R2.1 <-> R4.2 C2.1 <-> R10.1 <-> R15.2 <-> R16.1 <-> R17.2 <-> R4.1 C2.1 <-> R17.1 <-> R18.2 <-> R24.1 <-> R24.1 - C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> C2.2 <-> GND1 C2.2 <-> R26.1 C3.1 <-> Treble.1 <-> VR1.1 C3.2 <-> R1.1 <-> R3.2 diff --git a/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt index 25ac5822..60f26e71 100644 --- a/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt @@ -15,7 +15,7 @@ Switch setup: [Default] C10.2 <-> VR1.3 <-> VR7.2 C11.2 <-> VR8.1 C12.1 <-> R19.1 - C12.2 <-> GND5 + C12.2 <-> C17.2 <-> C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C44.2 <-> C46.1 <-> C56.2 <-> C57.2 <-> C59.2 <-> C6.1 <-> C61.2 <-> C8.2 <-> D7.1 <-> D9.1 <-> GND <-> R34.2 <-> R38.1 <-> R76.2 C13.1 <-> R9.2 C13.2 <-> VR2.2 C14.1 <-> R21.2 @@ -26,10 +26,8 @@ Switch setup: [Default] C16.2 <-> VR3.2 C17.1 <-> R26.1 <-> R28.1 C17.1 <-> R28.1 - C17.2 <-> GND10 C18.1 <-> D3.2 <-> D8.2 <-> R32.1 C18.1 <-> R32.1 - C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> D7.1 <-> D9.1 <-> GND13 <-> R34.2 <-> R76.2 C19.1 <-> R32.2 C2.1 <-> R1.2 <-> V1.2 C20.1 <-> R33.1 @@ -79,9 +77,7 @@ Switch setup: [Default] C43.1 <-> Cl Gain.2 C43.2 <-> Cl Gain.1 <-> V10.1 C44.1 <-> R11.1 <-> R89.1 <-> R91.1 - C44.2 <-> GND11 C45.1 <-> VR4.3 - C46.1 <-> GND1 <-> R38.1 C47.1 <-> R78.2 <-> V16.2 C47.2 <-> VR18.2 C49.2 <-> R86.1 @@ -90,23 +86,17 @@ Switch setup: [Default] C54.2 <-> R40.2 C54.2 <-> R40.2 <-> V23.3 C56.1 <-> R102.1 - C56.2 <-> GND8 C57.1 <-> R103.1 - C57.2 <-> GND7 C59.1 <-> R96.1 - C59.2 <-> GND12 - C6.1 <-> GND9 C6.2 <-> R73.1 C60.1 <-> R104.2 <-> R106.2 <-> R41.1 C60.2 <-> R108.2 <-> V25.1 C61.1 <-> C62.1 <-> L193.1 <-> L193.2 <-> L194.1 <-> R105.1 <-> R111.1 <-> R112.2 <-> V24.2 C61.1 <-> R111.1 - C61.2 <-> GND2 C62.2 <-> L195.2 <-> R110.2 <-> VR21.2 C7.1 <-> R27.2 <-> V15.2 C8.1 <-> R22.1 C8.1 <-> R22.1 <-> R5.1 <-> V22.2 - C8.2 <-> GND4 C9.1 <-> R25.2 <-> R92.1 <-> V22.4 <-> V22.5 Cl Gain.1 <-> V10.1 D3.1 <-> D7.2 diff --git a/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt index 25ac5822..60f26e71 100644 --- a/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt @@ -15,7 +15,7 @@ Switch setup: [Default] C10.2 <-> VR1.3 <-> VR7.2 C11.2 <-> VR8.1 C12.1 <-> R19.1 - C12.2 <-> GND5 + C12.2 <-> C17.2 <-> C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C44.2 <-> C46.1 <-> C56.2 <-> C57.2 <-> C59.2 <-> C6.1 <-> C61.2 <-> C8.2 <-> D7.1 <-> D9.1 <-> GND <-> R34.2 <-> R38.1 <-> R76.2 C13.1 <-> R9.2 C13.2 <-> VR2.2 C14.1 <-> R21.2 @@ -26,10 +26,8 @@ Switch setup: [Default] C16.2 <-> VR3.2 C17.1 <-> R26.1 <-> R28.1 C17.1 <-> R28.1 - C17.2 <-> GND10 C18.1 <-> D3.2 <-> D8.2 <-> R32.1 C18.1 <-> R32.1 - C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> D7.1 <-> D9.1 <-> GND13 <-> R34.2 <-> R76.2 C19.1 <-> R32.2 C2.1 <-> R1.2 <-> V1.2 C20.1 <-> R33.1 @@ -79,9 +77,7 @@ Switch setup: [Default] C43.1 <-> Cl Gain.2 C43.2 <-> Cl Gain.1 <-> V10.1 C44.1 <-> R11.1 <-> R89.1 <-> R91.1 - C44.2 <-> GND11 C45.1 <-> VR4.3 - C46.1 <-> GND1 <-> R38.1 C47.1 <-> R78.2 <-> V16.2 C47.2 <-> VR18.2 C49.2 <-> R86.1 @@ -90,23 +86,17 @@ Switch setup: [Default] C54.2 <-> R40.2 C54.2 <-> R40.2 <-> V23.3 C56.1 <-> R102.1 - C56.2 <-> GND8 C57.1 <-> R103.1 - C57.2 <-> GND7 C59.1 <-> R96.1 - C59.2 <-> GND12 - C6.1 <-> GND9 C6.2 <-> R73.1 C60.1 <-> R104.2 <-> R106.2 <-> R41.1 C60.2 <-> R108.2 <-> V25.1 C61.1 <-> C62.1 <-> L193.1 <-> L193.2 <-> L194.1 <-> R105.1 <-> R111.1 <-> R112.2 <-> V24.2 C61.1 <-> R111.1 - C61.2 <-> GND2 C62.2 <-> L195.2 <-> R110.2 <-> VR21.2 C7.1 <-> R27.2 <-> V15.2 C8.1 <-> R22.1 C8.1 <-> R22.1 <-> R5.1 <-> V22.2 - C8.2 <-> GND4 C9.1 <-> R25.2 <-> R92.1 <-> V22.4 <-> V22.5 Cl Gain.1 <-> V10.1 D3.1 <-> D7.2 diff --git a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt index c4ef449f..9d5c837b 100644 --- a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [Default] .1 <-> .1 - .1 <-> .1 <-> C1.2 <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.2 <-> C24.2 <-> C27.2 <-> C31.2 <-> C32.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C42.2 <-> C44.2 <-> C5.2 <-> D1.2 <-> GND1 <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R63.2 <-> R8.2 <-> Tone.3 + .1 <-> .1 <-> C1.2 <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.2 <-> C24.2 <-> C27.2 <-> C31.2 <-> C32.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C42.2 <-> C44.2 <-> C5.2 <-> D1.2 <-> GND <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R47.2 <-> R63.2 <-> R8.2 <-> Tone.3 <-> Vol.3 .1 <-> .2 .1 <-> .2 Bass.1 <-> R60.2 @@ -41,7 +41,6 @@ Switch setup: [Default] C38.1 <-> V8.3 C39.1 <-> R59.1 C40.1 <-> R27.2 <-> R59.2 - C41.2 <-> GND1 C42.1 <-> Choke.2 C43.1 <-> C46.2 C43.2 <-> Treble.2 @@ -55,8 +54,6 @@ Switch setup: [Default] C9.2 <-> R12.2 D1.1 <-> V5A.3 Dwell.1 <-> V2A.1 - GND4 <-> R47.2 - GND7 <-> Vol.3 Mix.1 <-> R42.1 NFB.2 <-> R1.2 R11.1 <-> V4A.3 diff --git a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt index c4ef449f..9d5c837b 100644 --- a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [Default] .1 <-> .1 - .1 <-> .1 <-> C1.2 <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.2 <-> C24.2 <-> C27.2 <-> C31.2 <-> C32.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C42.2 <-> C44.2 <-> C5.2 <-> D1.2 <-> GND1 <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R63.2 <-> R8.2 <-> Tone.3 + .1 <-> .1 <-> C1.2 <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.2 <-> C24.2 <-> C27.2 <-> C31.2 <-> C32.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C42.2 <-> C44.2 <-> C5.2 <-> D1.2 <-> GND <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R47.2 <-> R63.2 <-> R8.2 <-> Tone.3 <-> Vol.3 .1 <-> .2 .1 <-> .2 Bass.1 <-> R60.2 @@ -41,7 +41,6 @@ Switch setup: [Default] C38.1 <-> V8.3 C39.1 <-> R59.1 C40.1 <-> R27.2 <-> R59.2 - C41.2 <-> GND1 C42.1 <-> Choke.2 C43.1 <-> C46.2 C43.2 <-> Treble.2 @@ -55,8 +54,6 @@ Switch setup: [Default] C9.2 <-> R12.2 D1.1 <-> V5A.3 Dwell.1 <-> V2A.1 - GND4 <-> R47.2 - GND7 <-> Vol.3 Mix.1 <-> R42.1 NFB.2 <-> R1.2 R11.1 <-> V4A.3 diff --git a/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt index 21afd057..bf34f2b9 100644 --- a/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt @@ -48,10 +48,7 @@ Switch setup: [Default] .047uF 630v Coupling.2 <-> R1.2 .047uF 630v Coupling.2 <-> R1.2 .047uF 630v Coupling.2 <-> R1.2 - .047uF Class Y.1 <-> GND1 - .047uF Class Y.1 <-> GND1 - .047uF Class Y.1 <-> GND1 - .047uF Class Y.1 <-> GND1 + .047uF Class Y.1 <-> .047uF Class Y.1 <-> .047uF Class Y.1 <-> .047uF Class Y.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.1 <-> C1.2 <-> C1.2 <-> C1.2 <-> C1.2 <-> GND <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 .047uF Class Y.2 <-> .2 .047uF Class Y.2 <-> .2 .047uF Class Y.2 <-> .2 @@ -204,14 +201,6 @@ Switch setup: [Default] Bias Balance.3 <-> R1.2 Bias Balance.3 <-> R1.2 Bias Balance.3 <-> R1.2 - C1.1 <-> C1.1 <-> GND1 - C1.1 <-> C1.1 <-> GND1 - C1.1 <-> C1.1 <-> GND1 - C1.1 <-> C1.1 <-> GND1 - C1.1 <-> C1.2 <-> GND1 <-> R1.1 <-> R1.2 - C1.1 <-> C1.2 <-> GND1 <-> R1.1 <-> R1.2 - C1.1 <-> C1.2 <-> GND1 <-> R1.1 <-> R1.2 - C1.1 <-> C1.2 <-> GND1 <-> R1.1 <-> R1.2 C1.1 <-> C1.2 <-> R1.1 C1.1 <-> C1.2 <-> R1.1 C1.1 <-> C1.2 <-> R1.1 diff --git a/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_excl_switches.txt index c4c05e66..56ee894c 100644 --- a/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_excl_switches.txt @@ -1,23 +1,13 @@ Switch setup: [Default] C10.1 <-> R10.2 <-> R12.1 - C10.2 <-> GND14 + C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> C9.2 <-> GND <-> R1.2 <-> R11.2 <-> R2.2 <-> R3.2 <-> R7.2 <-> Tone.3 C11.1 <-> R12.2 - C11.2 <-> GND15 C3.1 <-> R4.1 <-> R5.2 - C3.2 <-> GND6 C5.2 <-> R13.1 C6.1 <-> R13.2 <-> R9.1 C8.1 <-> R8.2 - C8.2 <-> GND11 C9.1 <-> R10.1 - C9.2 <-> GND13 - GND1 <-> R1.2 - GND10 <-> R11.2 - GND2 <-> R2.2 - GND5 <-> R3.2 - GND8 <-> R7.2 - GND9 <-> Tone.3 R5.1 <-> R6.2 R6.1 <-> V2.2 V2.1 <-> Volume.1 diff --git a/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_incl_switches.txt index c4c05e66..56ee894c 100644 --- a/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Lectrolab schematic_incl_switches.txt @@ -1,23 +1,13 @@ Switch setup: [Default] C10.1 <-> R10.2 <-> R12.1 - C10.2 <-> GND14 + C10.2 <-> C11.2 <-> C3.2 <-> C8.2 <-> C9.2 <-> GND <-> R1.2 <-> R11.2 <-> R2.2 <-> R3.2 <-> R7.2 <-> Tone.3 C11.1 <-> R12.2 - C11.2 <-> GND15 C3.1 <-> R4.1 <-> R5.2 - C3.2 <-> GND6 C5.2 <-> R13.1 C6.1 <-> R13.2 <-> R9.1 C8.1 <-> R8.2 - C8.2 <-> GND11 C9.1 <-> R10.1 - C9.2 <-> GND13 - GND1 <-> R1.2 - GND10 <-> R11.2 - GND2 <-> R2.2 - GND5 <-> R3.2 - GND8 <-> R7.2 - GND9 <-> Tone.3 R5.1 <-> R6.2 R6.1 <-> V2.2 V2.1 <-> Volume.1 diff --git a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt index df2e3704..0b126a2d 100644 --- a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt @@ -5,7 +5,7 @@ Switch setup: [Default] Bass.2 <-> C3.1 <-> R7.2 Bass.3 <-> C4.1 <-> R60.1 C1.1 <-> V1a.5 - C10.1 <-> C8.2 <-> GND2 + C10.1 <-> C23.2 <-> C24.2 <-> C27.2 <-> C38.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C8.2 <-> GND <-> L3.1 <-> R23.2 <-> R3.2 <-> R36.2 C10.2 <-> C11.1 <-> R12.1 C12.1 <-> R14.2 C12.2 <-> C14.1 @@ -22,11 +22,8 @@ Switch setup: [Default] C21.1 <-> R23.1 <-> V2a.1 C22.1 <-> V2a.5 C23.1 <-> R26.1 - C23.2 <-> GND5 C24.1 <-> R27.1 - C24.2 <-> GND7 C25.2 <-> C26.1 <-> Speed.3 - C27.2 <-> GND9 C28.1 <-> R32.2 <-> R33.2 C28.2 <-> C29.1 C29.2 <-> V5a.1 @@ -42,22 +39,14 @@ Switch setup: [Default] C37.1 <-> R50.1 <-> V6b.2 C37.2 <-> R52.1 <-> R53.1 C38.1 <-> V8.3 - C38.2 <-> GND13 C39.1 <-> R59.1 - C39.2 <-> GND15 C40.1 <-> R59.2 - C40.2 <-> GND16 - C41.2 <-> GND18 C43.1 <-> Treble.2 C45.1 <-> Presence.1 C5.1 <-> V1b.5 C7.1 <-> Treble.3 C8.1 <-> V3b.3 C9.2 <-> R12.2 - GND1 <-> R3.2 - GND10 <-> R36.2 - GND11 <-> L3.1 - GND4 <-> R23.2 L5.1 <-> L6.1 L6.1 <-> L6.2 L6.1 <-> L6.2 diff --git a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt index 227218ab..a21240a2 100644 --- a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt @@ -4,7 +4,7 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2] Bass.2 <-> C3.1 <-> R7.2 Bass.3 <-> C4.1 <-> R60.1 C1.1 <-> V1a.5 - C10.1 <-> C8.2 <-> GND2 + C10.1 <-> C23.2 <-> C24.2 <-> C27.2 <-> C38.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C8.2 <-> GND <-> L3.1 <-> R23.2 <-> R3.2 <-> R36.2 C10.2 <-> C11.1 <-> R12.1 C12.1 <-> R14.2 C12.2 <-> C14.1 @@ -21,11 +21,8 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2] C21.1 <-> R23.1 <-> V2a.1 C22.1 <-> V2a.5 C23.1 <-> R26.1 - C23.2 <-> GND5 C24.1 <-> R27.1 - C24.2 <-> GND7 C25.2 <-> C26.1 <-> Speed.3 - C27.2 <-> GND9 C28.1 <-> R32.2 <-> R33.2 C28.2 <-> C29.1 C29.2 <-> V5a.1 @@ -41,22 +38,14 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2] C37.1 <-> R50.1 <-> V6b.2 C37.2 <-> R52.1 <-> R53.1 C38.1 <-> V8.3 - C38.2 <-> GND13 C39.1 <-> R59.1 - C39.2 <-> GND15 C40.1 <-> R59.2 - C40.2 <-> GND16 - C41.2 <-> GND18 C43.1 <-> Treble.2 C45.1 <-> Presence.1 C5.1 <-> V1b.5 C7.1 <-> Treble.3 C8.1 <-> V3b.3 C9.2 <-> R12.2 - GND1 <-> R3.2 - GND10 <-> R36.2 - GND11 <-> L3.1 - GND4 <-> R23.2 L5.1 <-> L6.1 L6.1 <-> L6.2 L6.1 <-> L6.2 diff --git a/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_excl_switches.txt index 5fa631cd..e38cf899 100644 --- a/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_excl_switches.txt @@ -9,40 +9,23 @@ Switch setup: [Default] .2 <-> Mid.2 1 M.1 <-> 1 M.2 1 MA.2 <-> Attenuator.1 <-> Coupling.1 - 1 MA.3 <-> GND3 + 1 MA.3 <-> 100K.2 <-> 10uF 100V.2 <-> 1M.2 <-> 20uf 500V.2 <-> 20uf 500V.2 <-> 20uf 500V.2 <-> 22uf 500V.2 <-> 39K .5W.1 <-> 50uf 100V.2 <-> 820.2 <-> C1.2 <-> Cathode.2 <-> GND <-> Grid Leak.2 <-> L3.1 <-> L3.2 <-> MV.3 <-> Presence Bypass.2 <-> R1.2 100.1 <-> 100.2 100K 1W.1 <-> 82K 1W.2 - 100K.2 <-> GND1 10K.1 <-> Balance.2 10K.1 <-> Balance.3 - 10uF 100V.2 <-> GND4 180K 2W.1 <-> 39K .5W.2 1K 5W.1 <-> V4 6V6GT.4 1K 5W.1 <-> V5 6V6GT.4 - 1M.2 <-> GND13 <-> GND6 - 20uf 500V.2 <-> GND5 - 20uf 500V.2 <-> GND5 - 20uf 500V.2 <-> GND5 - 22uf 500V.2 <-> GND5 - 39K .5W.1 <-> GND2 470.1 <-> PI Tail.2 5.6K 2W.1 <-> Grid Leak.1 5.6K 2W.2 <-> V4 6V6GT.1 5.6K 2W.2 <-> V5 6V6GT.1 - 50uf 100V.2 <-> GND9 7.5K.1 <-> Balance.1 7.5K.2 <-> R1.1 - 820.2 <-> GND1 Backup Diode.1 <-> Backup Diode.2 Backup Diode.1 <-> Backup Diode.2 - C1.2 <-> GND7 - Cathode.2 <-> GND1 Coupling.2 <-> Grid Leak.2 - GND1 <-> Grid Leak.2 - GND10 <-> Presence Bypass.2 - GND12 <-> R1.2 - GND16 <-> MV.3 - GND8 <-> L3.1 <-> L3.2 Grid Leak.1 <-> Grid Leak.1 J1.4 <-> J2.3 L1.1 <-> L1.2 diff --git a/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_incl_switches.txt index 5fa631cd..e38cf899 100644 --- a/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/RR2104_Master_Volume_6V6_Schematic_incl_switches.txt @@ -9,40 +9,23 @@ Switch setup: [Default] .2 <-> Mid.2 1 M.1 <-> 1 M.2 1 MA.2 <-> Attenuator.1 <-> Coupling.1 - 1 MA.3 <-> GND3 + 1 MA.3 <-> 100K.2 <-> 10uF 100V.2 <-> 1M.2 <-> 20uf 500V.2 <-> 20uf 500V.2 <-> 20uf 500V.2 <-> 22uf 500V.2 <-> 39K .5W.1 <-> 50uf 100V.2 <-> 820.2 <-> C1.2 <-> Cathode.2 <-> GND <-> Grid Leak.2 <-> L3.1 <-> L3.2 <-> MV.3 <-> Presence Bypass.2 <-> R1.2 100.1 <-> 100.2 100K 1W.1 <-> 82K 1W.2 - 100K.2 <-> GND1 10K.1 <-> Balance.2 10K.1 <-> Balance.3 - 10uF 100V.2 <-> GND4 180K 2W.1 <-> 39K .5W.2 1K 5W.1 <-> V4 6V6GT.4 1K 5W.1 <-> V5 6V6GT.4 - 1M.2 <-> GND13 <-> GND6 - 20uf 500V.2 <-> GND5 - 20uf 500V.2 <-> GND5 - 20uf 500V.2 <-> GND5 - 22uf 500V.2 <-> GND5 - 39K .5W.1 <-> GND2 470.1 <-> PI Tail.2 5.6K 2W.1 <-> Grid Leak.1 5.6K 2W.2 <-> V4 6V6GT.1 5.6K 2W.2 <-> V5 6V6GT.1 - 50uf 100V.2 <-> GND9 7.5K.1 <-> Balance.1 7.5K.2 <-> R1.1 - 820.2 <-> GND1 Backup Diode.1 <-> Backup Diode.2 Backup Diode.1 <-> Backup Diode.2 - C1.2 <-> GND7 - Cathode.2 <-> GND1 Coupling.2 <-> Grid Leak.2 - GND1 <-> Grid Leak.2 - GND10 <-> Presence Bypass.2 - GND12 <-> R1.2 - GND16 <-> MV.3 - GND8 <-> L3.1 <-> L3.2 Grid Leak.1 <-> Grid Leak.1 J1.4 <-> J2.3 L1.1 <-> L1.2 diff --git a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt index bf4b0eca..9bd1a1c7 100644 --- a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt @@ -1,15 +1,13 @@ Switch setup: [Default] C10.1 <-> D3.2 <-> D4.2 <-> R22.2 - C10.2 <-> C11.2 <-> C13.2 <-> C9.2 <-> GND3 <-> GND7 <-> SW2.1 <-> SW2.2 <-> SW2.3 + C10.2 <-> C11.2 <-> C12.2 <-> C13.2 <-> C15.2 <-> C9.2 <-> D5.2 <-> GND <-> J19.Shunt <-> J19.Sleeve <-> J24.Sleeve <-> R12.2 <-> R19.2 <-> R2.2 <-> R20.2 <-> R9.1 <-> Speed.1 <-> SW2.1 <-> SW2.2 <-> SW2.3 <-> Volume.3 C11.1 <-> R14.2 <-> R22.1 C12.1 <-> R15.1 - C12.2 <-> GND6 C13.1 <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 C14.1 <-> C17.1 <-> C4.1 <-> R13.1 <-> R8.2 <-> SW1.1 <-> SW1.2 <-> SW1.3 C14.2 <-> C17.2 <-> R7.1 <-> V2.1 C15.1 <-> R5.1 - C15.2 <-> GND1 <-> R19.2 <-> R2.2 <-> R20.2 C2.1 <-> R4.1 <-> V4.6 C2.2 <-> R20.1 <-> R21.1 C3.1 <-> Volume.1 @@ -21,10 +19,6 @@ Switch setup: [Default] D1.2 <-> D4.1 D2.2 <-> D3.1 D5.1 <-> R10.2 <-> V2.3 - D5.2 <-> GND2 <-> J24.Sleeve <-> R12.2 <-> R9.1 - GND4 <-> J19.Shunt <-> J19.Sleeve - GND5 <-> Volume.3 - GND8 <-> Speed.1 Intensity.1 <-> R19.1 Intensity.2 <-> R6.1 J19.Tip <-> R1.2 <-> R3.1 diff --git a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt index fb668a97..ce1afa0b 100644 --- a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt @@ -1,15 +1,13 @@ Switch setup: [SW1.ON1:SW2.ON1, SW1.ON1:SW2.ON2, SW1.ON2:SW2.ON1, SW1.ON2:SW2.ON2] C10.1 <-> D3.2 <-> D4.2 <-> R22.2 - C10.2 <-> C11.2 <-> C13.2 <-> C9.2 <-> GND3 <-> GND7 + C10.2 <-> C11.2 <-> C12.2 <-> C13.2 <-> C15.2 <-> C9.2 <-> D5.2 <-> GND <-> J19.Shunt <-> J19.Sleeve <-> J24.Sleeve <-> R12.2 <-> R19.2 <-> R2.2 <-> R20.2 <-> R9.1 <-> Speed.1 <-> Volume.3 C11.1 <-> R14.2 <-> R22.1 C12.1 <-> R15.1 - C12.2 <-> GND6 C13.1 <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 C14.1 <-> C17.1 <-> C4.1 <-> R13.1 <-> R8.2 C14.2 <-> C17.2 <-> R7.1 <-> V2.1 C15.1 <-> R5.1 - C15.2 <-> GND1 <-> R19.2 <-> R2.2 <-> R20.2 C2.1 <-> R4.1 <-> V4.6 C2.2 <-> R20.1 <-> R21.1 C3.1 <-> Volume.1 @@ -21,10 +19,6 @@ Switch setup: [SW1.ON1:SW2.ON1, SW1.ON1:SW2.ON2, SW1.ON2:SW2.ON1, SW1.ON2:SW2.ON D1.2 <-> D4.1 D2.2 <-> D3.1 D5.1 <-> R10.2 <-> V2.3 - D5.2 <-> GND2 <-> J24.Sleeve <-> R12.2 <-> R9.1 - GND4 <-> J19.Shunt <-> J19.Sleeve - GND5 <-> Volume.3 - GND8 <-> Speed.1 Intensity.1 <-> R19.1 Intensity.2 <-> R6.1 J19.Tip <-> R1.2 <-> R3.1 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 1f4692b2..d3e6e1d5 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 @@ -17,7 +17,7 @@ Switch setup: [Default] 100k.2 <-> 100k.2 <-> 22u 450v.1 <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2 100u 100v.1 <-> 270 3W.1 10k 2W.1 <-> 1k 2w.2 - 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 4k7.1 <-> 82k.2 D1.2 <-> D3.1 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 1f4692b2..d3e6e1d5 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 @@ -17,7 +17,7 @@ Switch setup: [Default] 100k.2 <-> 100k.2 <-> 22u 450v.1 <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2 100u 100v.1 <-> 270 3W.1 10k 2W.1 <-> 1k 2w.2 - 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 4k7.1 <-> 82k.2 D1.2 <-> D3.1 diff --git a/diylc-regression-data/input/user-files/png/6Y6 Express 2.png b/diylc-regression-data/input/user-files/png/6Y6 Express 2.png index f2387cf3..fd5b37eb 100644 Binary files a/diylc-regression-data/input/user-files/png/6Y6 Express 2.png and b/diylc-regression-data/input/user-files/png/6Y6 Express 2.png differ diff --git a/diylc-regression-data/input/user-files/png/AllTube Schem.png b/diylc-regression-data/input/user-files/png/AllTube Schem.png index f47242fe..1366d534 100644 Binary files a/diylc-regression-data/input/user-files/png/AllTube Schem.png and b/diylc-regression-data/input/user-files/png/AllTube Schem.png differ diff --git a/diylc-regression-data/input/user-files/png/BrownfaceReverb Schematic 2.png b/diylc-regression-data/input/user-files/png/BrownfaceReverb Schematic 2.png index a155801e..089e970f 100644 Binary files a/diylc-regression-data/input/user-files/png/BrownfaceReverb Schematic 2.png and b/diylc-regression-data/input/user-files/png/BrownfaceReverb Schematic 2.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 1406edf0..d52bc042 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/LM386 Voltage Converter.png b/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png index cf91a0db..ef342ba6 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 aeacd54c..3767fff2 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/Lectrolab schematic.png b/diylc-regression-data/input/user-files/png/Lectrolab schematic.png index 18dcea92..cf6f97b4 100644 Binary files a/diylc-regression-data/input/user-files/png/Lectrolab schematic.png and b/diylc-regression-data/input/user-files/png/Lectrolab schematic.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 d06fc1c5..aaf20ebb 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/RR2104_Master_Volume_6V6_Schematic.png b/diylc-regression-data/input/user-files/png/RR2104_Master_Volume_6V6_Schematic.png index 325bd1fc..42919f45 100644 Binary files a/diylc-regression-data/input/user-files/png/RR2104_Master_Volume_6V6_Schematic.png and b/diylc-regression-data/input/user-files/png/RR2104_Master_Volume_6V6_Schematic.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 1dd1b3c0..3d95deaa 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 1f0928a3..b4fe637b 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/Stack Pointer board.png b/diylc-regression-data/input/user-files/png/Stack Pointer board.png index 8e37b619..8fec274b 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 42e87e3b..942763c4 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/v1/png/1976_distortion+_pcb.png b/diylc-regression-data/input/v1/png/1976_distortion+_pcb.png index 80dfeaa2..89e22bd5 100644 Binary files a/diylc-regression-data/input/v1/png/1976_distortion+_pcb.png and b/diylc-regression-data/input/v1/png/1976_distortion+_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/1976_distortion+_perf.png b/diylc-regression-data/input/v1/png/1976_distortion+_perf.png index 0ec2c1e6..b4a76a45 100644 Binary files a/diylc-regression-data/input/v1/png/1976_distortion+_perf.png and b/diylc-regression-data/input/v1/png/1976_distortion+_perf.png differ diff --git a/diylc-regression-data/input/v1/png/1977_od_250.png b/diylc-regression-data/input/v1/png/1977_od_250.png index 7efd70e7..caf96229 100644 Binary files a/diylc-regression-data/input/v1/png/1977_od_250.png and b/diylc-regression-data/input/v1/png/1977_od_250.png differ diff --git a/diylc-regression-data/input/v1/png/3_legged_dog.png b/diylc-regression-data/input/v1/png/3_legged_dog.png index 9413dda9..f85c141b 100644 Binary files a/diylc-regression-data/input/v1/png/3_legged_dog.png and b/diylc-regression-data/input/v1/png/3_legged_dog.png differ diff --git a/diylc-regression-data/input/v1/png/9v_di_box.png b/diylc-regression-data/input/v1/png/9v_di_box.png index e02e87fc..a34e186e 100644 Binary files a/diylc-regression-data/input/v1/png/9v_di_box.png and b/diylc-regression-data/input/v1/png/9v_di_box.png differ diff --git a/diylc-regression-data/input/v1/png/atari_punk_console.png b/diylc-regression-data/input/v1/png/atari_punk_console.png index f164e687..a0d24a74 100644 Binary files a/diylc-regression-data/input/v1/png/atari_punk_console.png and b/diylc-regression-data/input/v1/png/atari_punk_console.png differ diff --git a/diylc-regression-data/input/v1/png/atari_punk_console_556.png b/diylc-regression-data/input/v1/png/atari_punk_console_556.png index a56a1e76..9a6aacaf 100644 Binary files a/diylc-regression-data/input/v1/png/atari_punk_console_556.png and b/diylc-regression-data/input/v1/png/atari_punk_console_556.png differ diff --git a/diylc-regression-data/input/v1/png/aussie_comp.png b/diylc-regression-data/input/v1/png/aussie_comp.png index c69917d4..2320e583 100644 Binary files a/diylc-regression-data/input/v1/png/aussie_comp.png and b/diylc-regression-data/input/v1/png/aussie_comp.png differ diff --git a/diylc-regression-data/input/v1/png/aussie_mart_pcb.png b/diylc-regression-data/input/v1/png/aussie_mart_pcb.png index ea944357..f43e25f5 100644 Binary files a/diylc-regression-data/input/v1/png/aussie_mart_pcb.png and b/diylc-regression-data/input/v1/png/aussie_mart_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/aussie_mart_perf.png b/diylc-regression-data/input/v1/png/aussie_mart_perf.png index 7bfddce4..95a33eeb 100644 Binary files a/diylc-regression-data/input/v1/png/aussie_mart_perf.png and b/diylc-regression-data/input/v1/png/aussie_mart_perf.png differ diff --git a/diylc-regression-data/input/v1/png/austin_gold.png b/diylc-regression-data/input/v1/png/austin_gold.png index b01c7faa..97c7fe03 100644 Binary files a/diylc-regression-data/input/v1/png/austin_gold.png and b/diylc-regression-data/input/v1/png/austin_gold.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 26777302..2b4b21da 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/big_muff_1977.png b/diylc-regression-data/input/v1/png/big_muff_1977.png index 22163bc5..43c367b2 100644 Binary files a/diylc-regression-data/input/v1/png/big_muff_1977.png and b/diylc-regression-data/input/v1/png/big_muff_1977.png differ diff --git a/diylc-regression-data/input/v1/png/big_muff_1978_tone_bypass.png b/diylc-regression-data/input/v1/png/big_muff_1978_tone_bypass.png index 1ee08171..7a272dfa 100644 Binary files a/diylc-regression-data/input/v1/png/big_muff_1978_tone_bypass.png and b/diylc-regression-data/input/v1/png/big_muff_1978_tone_bypass.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 f51427ca..be4e7191 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/blue_clipper_pcb.png b/diylc-regression-data/input/v1/png/blue_clipper_pcb.png index 40513f72..21da6d38 100644 Binary files a/diylc-regression-data/input/v1/png/blue_clipper_pcb.png and b/diylc-regression-data/input/v1/png/blue_clipper_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/blue_clipper_perf.png b/diylc-regression-data/input/v1/png/blue_clipper_perf.png index 86979c35..65e0e4fe 100644 Binary files a/diylc-regression-data/input/v1/png/blue_clipper_perf.png and b/diylc-regression-data/input/v1/png/blue_clipper_perf.png differ diff --git a/diylc-regression-data/input/v1/png/blues_breaker.png b/diylc-regression-data/input/v1/png/blues_breaker.png index bf4a5c2d..3c2b0eeb 100644 Binary files a/diylc-regression-data/input/v1/png/blues_breaker.png and b/diylc-regression-data/input/v1/png/blues_breaker.png differ diff --git a/diylc-regression-data/input/v1/png/boss_oc-2_tb.png b/diylc-regression-data/input/v1/png/boss_oc-2_tb.png index 71dbc48c..da0f761a 100644 Binary files a/diylc-regression-data/input/v1/png/boss_oc-2_tb.png and b/diylc-regression-data/input/v1/png/boss_oc-2_tb.png differ diff --git a/diylc-regression-data/input/v1/png/chaos.png b/diylc-regression-data/input/v1/png/chaos.png index 847d89f5..e5600125 100644 Binary files a/diylc-regression-data/input/v1/png/chaos.png and b/diylc-regression-data/input/v1/png/chaos.png differ diff --git a/diylc-regression-data/input/v1/png/dist+.png b/diylc-regression-data/input/v1/png/dist+.png index 041243af..24da3893 100644 Binary files a/diylc-regression-data/input/v1/png/dist+.png and b/diylc-regression-data/input/v1/png/dist+.png differ diff --git a/diylc-regression-data/input/v1/png/dod_comp_280a_pcb.png b/diylc-regression-data/input/v1/png/dod_comp_280a_pcb.png index 91d6aaa7..b0698409 100644 Binary files a/diylc-regression-data/input/v1/png/dod_comp_280a_pcb.png and b/diylc-regression-data/input/v1/png/dod_comp_280a_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/dod_comp_280a_perf.png b/diylc-regression-data/input/v1/png/dod_comp_280a_perf.png index 23740d43..53ebe7e3 100644 Binary files a/diylc-regression-data/input/v1/png/dod_comp_280a_perf.png and b/diylc-regression-data/input/v1/png/dod_comp_280a_perf.png differ diff --git a/diylc-regression-data/input/v1/png/dod_overdrive_250.png b/diylc-regression-data/input/v1/png/dod_overdrive_250.png index d8bdca7b..48280518 100644 Binary files a/diylc-regression-data/input/v1/png/dod_overdrive_250.png and b/diylc-regression-data/input/v1/png/dod_overdrive_250.png differ diff --git a/diylc-regression-data/input/v1/png/dod_overdrive_250_perf.png b/diylc-regression-data/input/v1/png/dod_overdrive_250_perf.png index 9d63071f..e0a48044 100644 Binary files a/diylc-regression-data/input/v1/png/dod_overdrive_250_perf.png and b/diylc-regression-data/input/v1/png/dod_overdrive_250_perf.png differ diff --git a/diylc-regression-data/input/v1/png/drive_master_tone_bb.png b/diylc-regression-data/input/v1/png/drive_master_tone_bb.png index e92a3373..85903e58 100644 Binary files a/diylc-regression-data/input/v1/png/drive_master_tone_bb.png and b/diylc-regression-data/input/v1/png/drive_master_tone_bb.png differ diff --git a/diylc-regression-data/input/v1/png/dyna_comp_pcb.png b/diylc-regression-data/input/v1/png/dyna_comp_pcb.png index 4866af57..2f47adbe 100644 Binary files a/diylc-regression-data/input/v1/png/dyna_comp_pcb.png and b/diylc-regression-data/input/v1/png/dyna_comp_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 62295db7..3271d096 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/dynamic_overhype.png b/diylc-regression-data/input/v1/png/dynamic_overhype.png index 5d48410c..3fe58d48 100644 Binary files a/diylc-regression-data/input/v1/png/dynamic_overhype.png and b/diylc-regression-data/input/v1/png/dynamic_overhype.png differ diff --git a/diylc-regression-data/input/v1/png/easyvibe.png b/diylc-regression-data/input/v1/png/easyvibe.png index 597c9029..9e16e28c 100644 Binary files a/diylc-regression-data/input/v1/png/easyvibe.png and b/diylc-regression-data/input/v1/png/easyvibe.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 e90a7a41..9222b77c 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 073bd0aa..ed619e34 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/flatline_comp_pcb.png b/diylc-regression-data/input/v1/png/flatline_comp_pcb.png index 0c85b748..07770758 100644 Binary files a/diylc-regression-data/input/v1/png/flatline_comp_pcb.png and b/diylc-regression-data/input/v1/png/flatline_comp_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/flatline_comp_perf.png b/diylc-regression-data/input/v1/png/flatline_comp_perf.png index 23353240..b4203c55 100644 Binary files a/diylc-regression-data/input/v1/png/flatline_comp_perf.png and b/diylc-regression-data/input/v1/png/flatline_comp_perf.png differ diff --git a/diylc-regression-data/input/v1/png/flatline_compressor_condensed_pcb.png b/diylc-regression-data/input/v1/png/flatline_compressor_condensed_pcb.png index 8bae64e6..8c8e4d94 100644 Binary files a/diylc-regression-data/input/v1/png/flatline_compressor_condensed_pcb.png and b/diylc-regression-data/input/v1/png/flatline_compressor_condensed_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/flatline_compressor_condensed_perf.png b/diylc-regression-data/input/v1/png/flatline_compressor_condensed_perf.png index db1e68e5..b8a765b1 100644 Binary files a/diylc-regression-data/input/v1/png/flatline_compressor_condensed_perf.png and b/diylc-regression-data/input/v1/png/flatline_compressor_condensed_perf.png differ diff --git a/diylc-regression-data/input/v1/png/gainy_ruby.png b/diylc-regression-data/input/v1/png/gainy_ruby.png index cc296c27..cc555dac 100644 Binary files a/diylc-regression-data/input/v1/png/gainy_ruby.png and b/diylc-regression-data/input/v1/png/gainy_ruby.png differ diff --git a/diylc-regression-data/input/v1/png/goldtone.png b/diylc-regression-data/input/v1/png/goldtone.png index 1e8f63ed..8fd45f3e 100644 Binary files a/diylc-regression-data/input/v1/png/goldtone.png and b/diylc-regression-data/input/v1/png/goldtone.png differ diff --git a/diylc-regression-data/input/v1/png/hao_rust_driver.png b/diylc-regression-data/input/v1/png/hao_rust_driver.png index 0215b1a7..bf21956f 100644 Binary files a/diylc-regression-data/input/v1/png/hao_rust_driver.png and b/diylc-regression-data/input/v1/png/hao_rust_driver.png differ diff --git a/diylc-regression-data/input/v1/png/hermida_zen_drive.png b/diylc-regression-data/input/v1/png/hermida_zen_drive.png index d13bde0f..c7586dd8 100644 Binary files a/diylc-regression-data/input/v1/png/hermida_zen_drive.png and b/diylc-regression-data/input/v1/png/hermida_zen_drive.png differ diff --git a/diylc-regression-data/input/v1/png/hot_harmonics.png b/diylc-regression-data/input/v1/png/hot_harmonics.png index ad5f4682..c66c29fd 100644 Binary files a/diylc-regression-data/input/v1/png/hot_harmonics.png and b/diylc-regression-data/input/v1/png/hot_harmonics.png differ diff --git a/diylc-regression-data/input/v1/png/ibanez_cyberdrive.png b/diylc-regression-data/input/v1/png/ibanez_cyberdrive.png index e0ab2986..bc1b2867 100644 Binary files a/diylc-regression-data/input/v1/png/ibanez_cyberdrive.png and b/diylc-regression-data/input/v1/png/ibanez_cyberdrive.png differ diff --git a/diylc-regression-data/input/v1/png/ic_buffer.png b/diylc-regression-data/input/v1/png/ic_buffer.png index 25f07a73..415190a4 100644 Binary files a/diylc-regression-data/input/v1/png/ic_buffer.png and b/diylc-regression-data/input/v1/png/ic_buffer.png differ diff --git a/diylc-regression-data/input/v1/png/jawari_sitar.png b/diylc-regression-data/input/v1/png/jawari_sitar.png index 3b2babb1..44013816 100644 Binary files a/diylc-regression-data/input/v1/png/jawari_sitar.png and b/diylc-regression-data/input/v1/png/jawari_sitar.png differ diff --git a/diylc-regression-data/input/v1/png/jfet_matcher_pcb.png b/diylc-regression-data/input/v1/png/jfet_matcher_pcb.png index 65a03dbc..7a271299 100644 Binary files a/diylc-regression-data/input/v1/png/jfet_matcher_pcb.png and b/diylc-regression-data/input/v1/png/jfet_matcher_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/jfet_matcher_perf.png b/diylc-regression-data/input/v1/png/jfet_matcher_perf.png index 4328375c..63841526 100644 Binary files a/diylc-regression-data/input/v1/png/jfet_matcher_perf.png and b/diylc-regression-data/input/v1/png/jfet_matcher_perf.png differ diff --git a/diylc-regression-data/input/v1/png/jfet_matcher_vero.png b/diylc-regression-data/input/v1/png/jfet_matcher_vero.png index f8d0ad78..5a80a424 100644 Binary files a/diylc-regression-data/input/v1/png/jfet_matcher_vero.png and b/diylc-regression-data/input/v1/png/jfet_matcher_vero.png differ diff --git a/diylc-regression-data/input/v1/png/klon_centaur.png b/diylc-regression-data/input/v1/png/klon_centaur.png index c9ec6dc7..3757b632 100644 Binary files a/diylc-regression-data/input/v1/png/klon_centaur.png and b/diylc-regression-data/input/v1/png/klon_centaur.png differ diff --git a/diylc-regression-data/input/v1/png/klon_centaur_true_bypass.png b/diylc-regression-data/input/v1/png/klon_centaur_true_bypass.png index f5daca18..099e2054 100644 Binary files a/diylc-regression-data/input/v1/png/klon_centaur_true_bypass.png and b/diylc-regression-data/input/v1/png/klon_centaur_true_bypass.png differ diff --git a/diylc-regression-data/input/v1/png/la_light.png b/diylc-regression-data/input/v1/png/la_light.png index c9754145..94bb760e 100644 Binary files a/diylc-regression-data/input/v1/png/la_light.png and b/diylc-regression-data/input/v1/png/la_light.png differ diff --git a/diylc-regression-data/input/v1/png/little_gem.png b/diylc-regression-data/input/v1/png/little_gem.png index f855ba73..15391550 100644 Binary files a/diylc-regression-data/input/v1/png/little_gem.png and b/diylc-regression-data/input/v1/png/little_gem.png differ diff --git a/diylc-regression-data/input/v1/png/little_gem_mk2.png b/diylc-regression-data/input/v1/png/little_gem_mk2.png index 8ff7766c..d3e1aa5d 100644 Binary files a/diylc-regression-data/input/v1/png/little_gem_mk2.png and b/diylc-regression-data/input/v1/png/little_gem_mk2.png differ diff --git a/diylc-regression-data/input/v1/png/lm741_dist.png b/diylc-regression-data/input/v1/png/lm741_dist.png index 529a52ef..e0bc5942 100644 Binary files a/diylc-regression-data/input/v1/png/lm741_dist.png and b/diylc-regression-data/input/v1/png/lm741_dist.png differ diff --git a/diylc-regression-data/input/v1/png/low_ride_bass.png b/diylc-regression-data/input/v1/png/low_ride_bass.png index dc37025d..f3a36887 100644 Binary files a/diylc-regression-data/input/v1/png/low_ride_bass.png and b/diylc-regression-data/input/v1/png/low_ride_bass.png differ diff --git a/diylc-regression-data/input/v1/png/lxh2_cab_sim.png b/diylc-regression-data/input/v1/png/lxh2_cab_sim.png index e4207819..19258b51 100644 Binary files a/diylc-regression-data/input/v1/png/lxh2_cab_sim.png and b/diylc-regression-data/input/v1/png/lxh2_cab_sim.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 d316091c..1f78f70b 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/mesa_boogie_triaxis_cabinet_simulator.png b/diylc-regression-data/input/v1/png/mesa_boogie_triaxis_cabinet_simulator.png index 881c591a..24d272fa 100644 Binary files a/diylc-regression-data/input/v1/png/mesa_boogie_triaxis_cabinet_simulator.png and b/diylc-regression-data/input/v1/png/mesa_boogie_triaxis_cabinet_simulator.png differ diff --git a/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png b/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png index f7bb077d..81e0acbc 100644 Binary files a/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png and b/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png differ diff --git a/diylc-regression-data/input/v1/png/mockman.png b/diylc-regression-data/input/v1/png/mockman.png index e461be77..e329cb42 100644 Binary files a/diylc-regression-data/input/v1/png/mockman.png and b/diylc-regression-data/input/v1/png/mockman.png differ diff --git a/diylc-regression-data/input/v1/png/morula.png b/diylc-regression-data/input/v1/png/morula.png index d5186bc0..ae39ddc3 100644 Binary files a/diylc-regression-data/input/v1/png/morula.png and b/diylc-regression-data/input/v1/png/morula.png differ diff --git a/diylc-regression-data/input/v1/png/mutron_micro_v.png b/diylc-regression-data/input/v1/png/mutron_micro_v.png index 6b1b3617..e884cc60 100644 Binary files a/diylc-regression-data/input/v1/png/mutron_micro_v.png and b/diylc-regression-data/input/v1/png/mutron_micro_v.png differ diff --git a/diylc-regression-data/input/v1/png/new_clipper.png b/diylc-regression-data/input/v1/png/new_clipper.png index aa09e53e..f5071f78 100644 Binary files a/diylc-regression-data/input/v1/png/new_clipper.png and b/diylc-regression-data/input/v1/png/new_clipper.png differ diff --git a/diylc-regression-data/input/v1/png/new_clipper_pcb.png b/diylc-regression-data/input/v1/png/new_clipper_pcb.png index 42c7f575..a95dff30 100644 Binary files a/diylc-regression-data/input/v1/png/new_clipper_pcb.png and b/diylc-regression-data/input/v1/png/new_clipper_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/new_clipper_perf.png b/diylc-regression-data/input/v1/png/new_clipper_perf.png index d7b24425..fa030d98 100644 Binary files a/diylc-regression-data/input/v1/png/new_clipper_perf.png and b/diylc-regression-data/input/v1/png/new_clipper_perf.png differ diff --git a/diylc-regression-data/input/v1/png/od_250.png b/diylc-regression-data/input/v1/png/od_250.png index c2038030..882f0264 100644 Binary files a/diylc-regression-data/input/v1/png/od_250.png and b/diylc-regression-data/input/v1/png/od_250.png differ diff --git a/diylc-regression-data/input/v1/png/orange_squeezer_pcb.png b/diylc-regression-data/input/v1/png/orange_squeezer_pcb.png index d2401d6f..3e22b851 100644 Binary files a/diylc-regression-data/input/v1/png/orange_squeezer_pcb.png and b/diylc-regression-data/input/v1/png/orange_squeezer_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/orange_squeezer_perf.png b/diylc-regression-data/input/v1/png/orange_squeezer_perf.png index 542ce9c4..0ac21ac7 100644 Binary files a/diylc-regression-data/input/v1/png/orange_squeezer_perf.png and b/diylc-regression-data/input/v1/png/orange_squeezer_perf.png differ diff --git a/diylc-regression-data/input/v1/png/para-q.png b/diylc-regression-data/input/v1/png/para-q.png index db9b7fbc..93ff0ac7 100644 Binary files a/diylc-regression-data/input/v1/png/para-q.png and b/diylc-regression-data/input/v1/png/para-q.png differ diff --git a/diylc-regression-data/input/v1/png/phuncgnosis.png b/diylc-regression-data/input/v1/png/phuncgnosis.png index ccc25df4..44d644a0 100644 Binary files a/diylc-regression-data/input/v1/png/phuncgnosis.png and b/diylc-regression-data/input/v1/png/phuncgnosis.png differ diff --git a/diylc-regression-data/input/v1/png/pig_booster.png b/diylc-regression-data/input/v1/png/pig_booster.png index 65ca794c..0e5198e4 100644 Binary files a/diylc-regression-data/input/v1/png/pig_booster.png and b/diylc-regression-data/input/v1/png/pig_booster.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 01f66dee..d4f51b29 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/rambler.png b/diylc-regression-data/input/v1/png/rambler.png index bb3c8b7a..b7d8f4b0 100644 Binary files a/diylc-regression-data/input/v1/png/rambler.png and b/diylc-regression-data/input/v1/png/rambler.png differ diff --git a/diylc-regression-data/input/v1/png/rebote_25.png b/diylc-regression-data/input/v1/png/rebote_25.png index ecc7891e..e6587e5a 100644 Binary files a/diylc-regression-data/input/v1/png/rebote_25.png and b/diylc-regression-data/input/v1/png/rebote_25.png differ diff --git a/diylc-regression-data/input/v1/png/red_llama_pcb.png b/diylc-regression-data/input/v1/png/red_llama_pcb.png index 3ac929bd..540c206d 100644 Binary files a/diylc-regression-data/input/v1/png/red_llama_pcb.png and b/diylc-regression-data/input/v1/png/red_llama_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/red_llama_perf.png b/diylc-regression-data/input/v1/png/red_llama_perf.png index 37703837..2f563882 100644 Binary files a/diylc-regression-data/input/v1/png/red_llama_perf.png and b/diylc-regression-data/input/v1/png/red_llama_perf.png differ diff --git a/diylc-regression-data/input/v1/png/rog_ubescreamer_vero.png b/diylc-regression-data/input/v1/png/rog_ubescreamer_vero.png index aef41d41..dcad1d51 100644 Binary files a/diylc-regression-data/input/v1/png/rog_ubescreamer_vero.png and b/diylc-regression-data/input/v1/png/rog_ubescreamer_vero.png differ diff --git a/diylc-regression-data/input/v1/png/ross_compressor_pcb.png b/diylc-regression-data/input/v1/png/ross_compressor_pcb.png index 5fb6c44b..e4af10eb 100644 Binary files a/diylc-regression-data/input/v1/png/ross_compressor_pcb.png and b/diylc-regression-data/input/v1/png/ross_compressor_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/ross_compressor_perf.png b/diylc-regression-data/input/v1/png/ross_compressor_perf.png index 27865ea8..ae45eefe 100644 Binary files a/diylc-regression-data/input/v1/png/ross_compressor_perf.png and b/diylc-regression-data/input/v1/png/ross_compressor_perf.png differ diff --git a/diylc-regression-data/input/v1/png/ross_distortion_pcb.png b/diylc-regression-data/input/v1/png/ross_distortion_pcb.png index 142e0e43..0a70f035 100644 Binary files a/diylc-regression-data/input/v1/png/ross_distortion_pcb.png and b/diylc-regression-data/input/v1/png/ross_distortion_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/ross_distortion_perf.png b/diylc-regression-data/input/v1/png/ross_distortion_perf.png index ce10c178..8deb9137 100644 Binary files a/diylc-regression-data/input/v1/png/ross_distortion_perf.png and b/diylc-regression-data/input/v1/png/ross_distortion_perf.png differ diff --git a/diylc-regression-data/input/v1/png/ross_distortion_usa_pcb.png b/diylc-regression-data/input/v1/png/ross_distortion_usa_pcb.png index 05ca1ca2..740bba8c 100644 Binary files a/diylc-regression-data/input/v1/png/ross_distortion_usa_pcb.png and b/diylc-regression-data/input/v1/png/ross_distortion_usa_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/ross_distortion_usa_perf.png b/diylc-regression-data/input/v1/png/ross_distortion_usa_perf.png index 63f36a6e..b9164504 100644 Binary files a/diylc-regression-data/input/v1/png/ross_distortion_usa_perf.png and b/diylc-regression-data/input/v1/png/ross_distortion_usa_perf.png differ diff --git a/diylc-regression-data/input/v1/png/ruby.png b/diylc-regression-data/input/v1/png/ruby.png index 94197abf..f6fda919 100644 Binary files a/diylc-regression-data/input/v1/png/ruby.png and b/diylc-regression-data/input/v1/png/ruby.png differ diff --git a/diylc-regression-data/input/v1/png/ruby1.png b/diylc-regression-data/input/v1/png/ruby1.png index d5249f3c..76402855 100644 Binary files a/diylc-regression-data/input/v1/png/ruby1.png and b/diylc-regression-data/input/v1/png/ruby1.png differ diff --git a/diylc-regression-data/input/v1/png/ruby2.png b/diylc-regression-data/input/v1/png/ruby2.png index 436093a2..712d8d29 100644 Binary files a/diylc-regression-data/input/v1/png/ruby2.png and b/diylc-regression-data/input/v1/png/ruby2.png differ diff --git a/diylc-regression-data/input/v1/png/ruby3.png b/diylc-regression-data/input/v1/png/ruby3.png index 771bab01..8ef5ce7e 100644 Binary files a/diylc-regression-data/input/v1/png/ruby3.png and b/diylc-regression-data/input/v1/png/ruby3.png differ diff --git a/diylc-regression-data/input/v1/png/ruby_amp.png b/diylc-regression-data/input/v1/png/ruby_amp.png index ef60eb70..514da8d8 100644 Binary files a/diylc-regression-data/input/v1/png/ruby_amp.png and b/diylc-regression-data/input/v1/png/ruby_amp.png differ diff --git a/diylc-regression-data/input/v1/png/ruby_mini_amp_perf.png b/diylc-regression-data/input/v1/png/ruby_mini_amp_perf.png index 1293359b..a8f30bb6 100644 Binary files a/diylc-regression-data/input/v1/png/ruby_mini_amp_perf.png and b/diylc-regression-data/input/v1/png/ruby_mini_amp_perf.png differ diff --git a/diylc-regression-data/input/v1/png/saffross_squeeze_pcb.png b/diylc-regression-data/input/v1/png/saffross_squeeze_pcb.png index e1ec8b8e..09c02cc9 100644 Binary files a/diylc-regression-data/input/v1/png/saffross_squeeze_pcb.png and b/diylc-regression-data/input/v1/png/saffross_squeeze_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/saffross_squeeze_perf.png b/diylc-regression-data/input/v1/png/saffross_squeeze_perf.png index 6cf27904..5dd95572 100644 Binary files a/diylc-regression-data/input/v1/png/saffross_squeeze_perf.png and b/diylc-regression-data/input/v1/png/saffross_squeeze_perf.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 7b89851e..24ec7267 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 bfc1537f..0018cbdd 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/slacktrem.png b/diylc-regression-data/input/v1/png/slacktrem.png index b9245fb1..63bd8384 100644 Binary files a/diylc-regression-data/input/v1/png/slacktrem.png and b/diylc-regression-data/input/v1/png/slacktrem.png differ diff --git a/diylc-regression-data/input/v1/png/smooth_drive.png b/diylc-regression-data/input/v1/png/smooth_drive.png index f614a85d..5088cee2 100644 Binary files a/diylc-regression-data/input/v1/png/smooth_drive.png and b/diylc-regression-data/input/v1/png/smooth_drive.png differ diff --git a/diylc-regression-data/input/v1/png/sonic_disto.png b/diylc-regression-data/input/v1/png/sonic_disto.png index 8ec618cf..5aaeccaa 100644 Binary files a/diylc-regression-data/input/v1/png/sonic_disto.png and b/diylc-regression-data/input/v1/png/sonic_disto.png differ diff --git a/diylc-regression-data/input/v1/png/soul_preacher_pcb.png b/diylc-regression-data/input/v1/png/soul_preacher_pcb.png index 31f19617..388ede44 100644 Binary files a/diylc-regression-data/input/v1/png/soul_preacher_pcb.png and b/diylc-regression-data/input/v1/png/soul_preacher_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/soul_preacher_perf.png b/diylc-regression-data/input/v1/png/soul_preacher_perf.png index a7d35308..0f212d78 100644 Binary files a/diylc-regression-data/input/v1/png/soul_preacher_perf.png and b/diylc-regression-data/input/v1/png/soul_preacher_perf.png differ diff --git a/diylc-regression-data/input/v1/png/sw_tripod.png b/diylc-regression-data/input/v1/png/sw_tripod.png index 367b39c8..5207e571 100644 Binary files a/diylc-regression-data/input/v1/png/sw_tripod.png and b/diylc-regression-data/input/v1/png/sw_tripod.png differ diff --git a/diylc-regression-data/input/v1/png/ts808_pcb.png b/diylc-regression-data/input/v1/png/ts808_pcb.png index 5217fdaa..f0654aba 100644 Binary files a/diylc-regression-data/input/v1/png/ts808_pcb.png and b/diylc-regression-data/input/v1/png/ts808_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/ts808_perf.png b/diylc-regression-data/input/v1/png/ts808_perf.png index 4bd8136e..5e9e8b92 100644 Binary files a/diylc-regression-data/input/v1/png/ts808_perf.png and b/diylc-regression-data/input/v1/png/ts808_perf.png differ diff --git a/diylc-regression-data/input/v1/png/voltage_doubler.png b/diylc-regression-data/input/v1/png/voltage_doubler.png index 4ab66b39..8651bd04 100644 Binary files a/diylc-regression-data/input/v1/png/voltage_doubler.png and b/diylc-regression-data/input/v1/png/voltage_doubler.png differ diff --git a/diylc-regression-data/input/v1/png/voodoo_lab_od_pcb.png b/diylc-regression-data/input/v1/png/voodoo_lab_od_pcb.png index 45a6ac79..a111a252 100644 Binary files a/diylc-regression-data/input/v1/png/voodoo_lab_od_pcb.png and b/diylc-regression-data/input/v1/png/voodoo_lab_od_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/voodoo_lab_od_perf.png b/diylc-regression-data/input/v1/png/voodoo_lab_od_perf.png index 1c87da8e..4c7dbab5 100644 Binary files a/diylc-regression-data/input/v1/png/voodoo_lab_od_perf.png and b/diylc-regression-data/input/v1/png/voodoo_lab_od_perf.png differ diff --git a/diylc-regression-data/input/v1/png/voodoo_lab_pcb.png b/diylc-regression-data/input/v1/png/voodoo_lab_pcb.png index 59162a74..e0ee5462 100644 Binary files a/diylc-regression-data/input/v1/png/voodoo_lab_pcb.png and b/diylc-regression-data/input/v1/png/voodoo_lab_pcb.png differ diff --git a/diylc-regression-data/input/v1/png/voodoo_modded_perf.png b/diylc-regression-data/input/v1/png/voodoo_modded_perf.png index c0e09304..d977f241 100644 Binary files a/diylc-regression-data/input/v1/png/voodoo_modded_perf.png and b/diylc-regression-data/input/v1/png/voodoo_modded_perf.png differ