diff --git a/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt index 0242222f..55a6528f 100644 --- a/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt @@ -5,15 +5,17 @@ Switch setup: [Default] .4 <-> C2.2 .7 <-> Led.2 .8 <-> Gate.1 <-> Q3.1 <-> R5.2 <-> Volume.3 - C1.1 <-> Compress.1 <-> Compress.2 <-> Compress.3 <-> Drive.1 <-> Drive.3 <-> R3.2 <-> R4.1 <-> R7.1 <-> Stability.1 <-> Stability.2 + C1.1 <-> Compress.2 <-> Compress.3 <-> Drive.3 <-> R3.2 <-> Stability.2 C1.2 <-> Drive.2 C2.1 <-> Q3.2 <-> Q3.3 <-> R6.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R4.2 C3.2 <-> R3.1 <-> R6.1 C4.1 <-> Volume.2 + Compress.1 <-> Drive.1 <-> R4.1 Gate.2 <-> Gate.3 <-> R1.2 Led.1 <-> R7.2 Q1.1 <-> Q1.2 <-> R2.2 Q1.3 <-> Q2.1 <-> R1.1 R2.1 <-> Volume.1 + R7.1 <-> Stability.1 diff --git a/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt index cd635e7a..59e6999b 100644 --- a/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt @@ -1,32 +1,36 @@ Switch setup: [.ON1] - C1.1 <-> Compress.1 <-> Compress.2 <-> Compress.3 <-> Drive.1 <-> Drive.3 <-> R3.2 <-> R4.1 <-> R7.1 <-> Stability.1 <-> Stability.2 + C1.1 <-> Compress.2 <-> Compress.3 <-> Drive.3 <-> R3.2 <-> Stability.2 C1.2 <-> Drive.2 C2.1 <-> Q3.2 <-> Q3.3 <-> R6.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R4.2 C3.2 <-> R3.1 <-> R6.1 C4.1 <-> Volume.2 C4.2 <-> R5.1 + Compress.1 <-> Drive.1 <-> R4.1 Gate.1 <-> Led.2 <-> Q3.1 <-> R5.2 <-> Volume.3 Gate.2 <-> Gate.3 <-> R1.2 Led.1 <-> R7.2 Q1.1 <-> Q1.2 <-> R2.2 Q1.3 <-> Q2.1 <-> R1.1 R2.1 <-> Volume.1 + R7.1 <-> Stability.1 Switch setup: [.ON2] - C1.1 <-> Compress.1 <-> Compress.2 <-> Compress.3 <-> Drive.1 <-> Drive.3 <-> R3.2 <-> R4.1 <-> R7.1 <-> Stability.1 <-> Stability.2 + C1.1 <-> Compress.2 <-> Compress.3 <-> Drive.3 <-> R3.2 <-> Stability.2 C1.2 <-> Drive.2 C2.1 <-> Q3.2 <-> Q3.3 <-> R6.2 C3.1 <-> Q2.2 <-> Q2.3 <-> R4.2 C3.2 <-> R3.1 <-> R6.1 C4.1 <-> Volume.2 C4.2 <-> R5.1 + Compress.1 <-> Drive.1 <-> R4.1 Gate.1 <-> Q3.1 <-> R5.2 <-> Volume.3 Gate.2 <-> Gate.3 <-> R1.2 Led.1 <-> R7.2 Q1.1 <-> Q1.2 <-> R2.2 Q1.3 <-> Q2.1 <-> R1.1 R2.1 <-> Volume.1 + R7.1 <-> Stability.1 diff --git a/diylc-regression-data/input/cloud/netlist/196_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/196_excl_switches.txt index 1841af4c..52db58d3 100644 --- a/diylc-regression-data/input/cloud/netlist/196_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/196_excl_switches.txt @@ -2,8 +2,8 @@ Switch setup: [Default] .1 <-> C15.1 .1 <-> C15.1 - .2 <-> C12.2 <-> C7.2 <-> C9.2 <-> R11.1 <-> R2.1 <-> Tone.1 <-> Tone.2 <-> Tone.3 .2 <-> C9.2 <-> R2.1 + .2 <-> C9.2 <-> R2.1 <-> Tone.1 .3 <-> C16.1 .3 <-> C16.1 .4 <-> C15.2 @@ -14,15 +14,17 @@ Switch setup: [Default] .6 <-> C16.2 C1.1 <-> Q1.3 <-> R3.1 C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 <-> Volume.2 <-> Volume.3 + C1.2 <-> Volume.1 C10.2 <-> D2.2 <-> D3.1 C10.2 <-> D2.2 <-> D3.1 C11.1 <-> D2.1 <-> D3.2 C11.1 <-> D2.1 <-> D3.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 C12.2 <-> R11.1 + C12.2 <-> R11.1 <-> Tone.3 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 @@ -39,6 +41,7 @@ Switch setup: [Default] C6.2 <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C7.2 <-> Tone.2 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 Q1.1 <-> R7.2 diff --git a/diylc-regression-data/input/cloud/netlist/196_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/196_incl_switches.txt index ca7f43be..8f80f10b 100644 --- a/diylc-regression-data/input/cloud/netlist/196_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/196_incl_switches.txt @@ -2,7 +2,7 @@ Switch setup: [.ON1:.ON1] C1.1 <-> Q1.3 <-> R3.1 C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 <-> Volume.2 <-> Volume.3 + C1.2 <-> Volume.1 C10.1 <-> C15.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.1 <-> C15.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.2 <-> D2.2 <-> D3.1 @@ -11,9 +11,10 @@ Switch setup: [.ON1:.ON1] C11.1 <-> D2.1 <-> D3.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 - C12.2 <-> C15.1 <-> C7.2 <-> C9.2 <-> R11.1 <-> R2.1 <-> Tone.1 <-> Tone.2 <-> Tone.3 C12.2 <-> R11.1 + C12.2 <-> R11.1 <-> Tone.3 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 @@ -21,6 +22,7 @@ Switch setup: [.ON1:.ON1] C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 C15.1 <-> C9.2 <-> R2.1 + C15.1 <-> C9.2 <-> R2.1 <-> Tone.1 C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 C2.2 <-> R9.1 @@ -31,6 +33,7 @@ Switch setup: [.ON1:.ON1] C6.2 <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C7.2 <-> Tone.2 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 Q1.1 <-> R7.2 @@ -46,7 +49,7 @@ Switch setup: [.ON1:.ON2] C1.1 <-> Q1.3 <-> R3.1 C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 <-> Volume.2 <-> Volume.3 + C1.2 <-> Volume.1 C10.1 <-> C15.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.1 <-> C16.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.2 <-> D2.2 <-> D3.1 @@ -55,15 +58,17 @@ Switch setup: [.ON1:.ON2] C11.1 <-> D2.1 <-> D3.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 - C12.2 <-> C15.1 <-> C7.2 <-> C9.2 <-> R11.1 <-> R2.1 <-> Tone.1 <-> Tone.2 <-> Tone.3 C12.2 <-> R11.1 + C12.2 <-> R11.1 <-> Tone.3 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 + C15.1 <-> C9.2 <-> R2.1 <-> Tone.1 C16.1 <-> C9.2 <-> R2.1 C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 @@ -75,6 +80,7 @@ Switch setup: [.ON1:.ON2] C6.2 <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C7.2 <-> Tone.2 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 Q1.1 <-> R7.2 @@ -90,7 +96,7 @@ Switch setup: [.ON2:.ON1] C1.1 <-> Q1.3 <-> R3.1 C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 <-> Volume.2 <-> Volume.3 + C1.2 <-> Volume.1 C10.1 <-> C15.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.1 <-> C16.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.2 <-> D2.2 <-> D3.1 @@ -99,9 +105,10 @@ Switch setup: [.ON2:.ON1] C11.1 <-> D2.1 <-> D3.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 - C12.2 <-> C16.1 <-> C7.2 <-> C9.2 <-> R11.1 <-> R2.1 <-> Tone.1 <-> Tone.2 <-> Tone.3 C12.2 <-> R11.1 + C12.2 <-> R11.1 <-> Tone.3 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 @@ -109,6 +116,7 @@ Switch setup: [.ON2:.ON1] C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 C15.1 <-> C9.2 <-> R2.1 + C16.1 <-> C9.2 <-> R2.1 <-> Tone.1 C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 C2.2 <-> R9.1 @@ -119,6 +127,7 @@ Switch setup: [.ON2:.ON1] C6.2 <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C7.2 <-> Tone.2 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 Q1.1 <-> R7.2 @@ -134,7 +143,7 @@ Switch setup: [.ON2:.ON2] C1.1 <-> Q1.3 <-> R3.1 C1.1 <-> Q1.3 <-> R3.1 - C1.2 <-> C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.1 <-> Volume.2 <-> Volume.3 + C1.2 <-> Volume.1 C10.1 <-> C16.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.1 <-> C16.2 <-> C8.2 <-> C9.1 <-> Q2.3 <-> R11.2 <-> R16.2 <-> R17.2 C10.2 <-> D2.2 <-> D3.1 @@ -143,9 +152,10 @@ Switch setup: [.ON2:.ON2] C11.1 <-> D2.1 <-> D3.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 C11.2 <-> C14.2 <-> C5.1 <-> Q3.3 <-> R15.1 <-> R22.2 + C12.1 <-> C17.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R12.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R4.1 <-> R5.1 <-> R7.1 <-> Sustain.1 <-> Sustain.2 <-> Sustain.3 <-> Volume.3 C12.1 <-> C17.2 <-> C4.2 <-> R1.2 <-> R13.2 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R20.1 <-> R4.1 <-> R5.1 <-> R7.1 - C12.2 <-> C16.1 <-> C7.2 <-> C9.2 <-> R11.1 <-> R2.1 <-> Tone.1 <-> Tone.2 <-> Tone.3 C12.2 <-> R11.1 + C12.2 <-> R11.1 <-> Tone.3 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.1 <-> C2.1 <-> Q4.2 <-> R10.1 <-> R5.2 C13.2 <-> C3.1 <-> Q4.3 <-> R10.2 <-> R8.2 @@ -153,6 +163,7 @@ Switch setup: [.ON2:.ON2] C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 C14.1 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q3.2 <-> R13.1 <-> R22.1 C16.1 <-> C9.2 <-> R2.1 + C16.1 <-> C9.2 <-> R2.1 <-> Tone.1 C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 C17.1 <-> C4.1 <-> D1.2 <-> R15.2 <-> R16.1 <-> R3.2 <-> R6.1 <-> R8.1 C2.2 <-> R9.1 @@ -163,6 +174,7 @@ Switch setup: [.ON2:.ON2] C6.2 <-> R12.1 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 C7.1 <-> Q1.2 <-> R1.1 <-> R6.2 + C7.2 <-> Tone.2 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 C8.1 <-> D2.1 <-> D3.2 <-> Q2.2 <-> R17.1 <-> R18.2 <-> R21.1 Q1.1 <-> R7.2 diff --git a/diylc-regression-data/input/cloud/netlist/236_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/236_excl_switches.txt index bd539eea..e54cbf55 100644 --- a/diylc-regression-data/input/cloud/netlist/236_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/236_excl_switches.txt @@ -1,10 +1,10 @@ Switch setup: [Default] .1 <-> R8.2 - .2 <-> C2.2 <-> C4.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Depth (B).1 <-> Depth (B).2 <-> Depth (B).3 <-> IC1.1 <-> IC1.12 <-> IC1.14 <-> IC1.2 <-> IC1.5 <-> IC2.7 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.2 <-> R11.1 <-> R12.2 <-> R19.1 <-> R19.2 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R27.1 <-> R4.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> R9.2 + .2 <-> IC2.7 <-> R19.1 <-> R27.1 <-> R8.2 .3 <-> R8.2 C1.1 <-> C2.1 - C1.2 <-> C3.1 <-> C3.2 <-> C4.2 <-> C8.2 <-> C9.2 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.8 <-> IC1.9 <-> IC2.4 <-> IC3.6 <-> R11.2 <-> R13.1 <-> R2.1 <-> R2.2 <-> R29.1 <-> R3.1 <-> R3.2 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R8.2 <-> Rate (C).1 <-> Rate (C).2 <-> Rate (C).3 + C1.2 <-> IC1.13 <-> R3.1 <-> Rate (C).3 C10.1 <-> IC3.5 <-> IC3.7 C10.2 <-> IC3.16 <-> R28.2 <-> R29.2 <-> R30.2 C11.1 <-> IC2.3 <-> R10.1 @@ -12,12 +12,23 @@ Switch setup: [Default] C11.2 <-> IC2.1 <-> R31.2 <-> R8.1 <-> R8.1 <-> R8.1 C12.1 <-> R27.2 C12.2 <-> IC3.8 <-> R19.2 <-> R8.1 + C2.2 <-> IC1.14 <-> R1.1 <-> R6.2 + C3.1 <-> IC1.8 <-> R2.1 <-> R5.1 + C3.2 <-> IC1.9 <-> R11.2 + C4.1 <-> C6.1 <-> D1.1 <-> D2.2 <-> Depth (B).1 <-> IC1.1 <-> IC1.12 <-> IC1.2 <-> IC2.8 <-> R10.2 <-> R11.1 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R7.2 <-> R9.2 + C4.2 <-> C8.2 <-> C9.2 <-> IC1.11 <-> IC2.4 <-> IC3.6 <-> R13.1 <-> R29.1 <-> R4.2 <-> R8.2 C5.1 <-> C7.1 <-> IC2.6 <-> R8.1 + C5.2 <-> R19.2 + C6.2 <-> R12.2 + C7.2 <-> R4.1 C8.1 <-> IC1.3 <-> R13.2 <-> R14.1 C9.1 <-> IC1.4 <-> IC2.5 <-> IC3.14 <-> R14.2 <-> R16.1 <-> R20.2 <-> R24.2 <-> R26.2 + D1.2 <-> D2.1 <-> Depth (B).3 <-> R1.2 D3.1 <-> D4.1 <-> IC1.6 <-> R15.1 <-> R16.2 <-> R9.1 D3.2 <-> R17.1 D4.2 <-> R7.1 + Depth (B).2 <-> IC1.5 + IC1.10 <-> R5.2 <-> R6.1 IC1.7 <-> R15.2 <-> R17.2 <-> R18.2 <-> R19.2 IC2.2 <-> R12.1 <-> R8.2 IC3.1 <-> R18.1 @@ -28,4 +39,5 @@ Switch setup: [Default] IC3.3 <-> R25.2 IC3.4 <-> R19.1 <-> R23.2 <-> R28.1 IC3.9 <-> R19.1 + R2.2 <-> R3.2 <-> Rate (C).1 <-> Rate (C).2 diff --git a/diylc-regression-data/input/cloud/netlist/236_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/236_incl_switches.txt index dfca752d..303ca9f3 100644 --- a/diylc-regression-data/input/cloud/netlist/236_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/236_incl_switches.txt @@ -1,7 +1,7 @@ Switch setup: [.ON1] C1.1 <-> C2.1 - C1.2 <-> C3.1 <-> C3.2 <-> C4.2 <-> C8.2 <-> C9.2 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.8 <-> IC1.9 <-> IC2.4 <-> IC3.6 <-> R11.2 <-> R13.1 <-> R2.1 <-> R2.2 <-> R29.1 <-> R3.1 <-> R3.2 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R8.2 <-> Rate (C).1 <-> Rate (C).2 <-> Rate (C).3 + C1.2 <-> IC1.13 <-> R3.1 <-> Rate (C).3 C10.1 <-> IC3.5 <-> IC3.7 C10.2 <-> IC3.16 <-> R28.2 <-> R29.2 <-> R30.2 C11.1 <-> IC2.3 <-> R10.1 @@ -9,15 +9,26 @@ Switch setup: [.ON1] C11.2 <-> IC2.1 <-> R31.2 <-> R8.1 <-> R8.1 <-> R8.1 C12.1 <-> R27.2 C12.2 <-> IC3.8 <-> R19.2 <-> R8.1 - C2.2 <-> C4.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Depth (B).1 <-> Depth (B).2 <-> Depth (B).3 <-> IC1.1 <-> IC1.12 <-> IC1.14 <-> IC1.2 <-> IC1.5 <-> IC2.7 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.2 <-> R11.1 <-> R12.2 <-> R19.1 <-> R19.2 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R27.1 <-> R4.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> R8.2 <-> R9.2 + C2.2 <-> IC1.14 <-> R1.1 <-> R6.2 + C3.1 <-> IC1.8 <-> R2.1 <-> R5.1 + C3.2 <-> IC1.9 <-> R11.2 + C4.1 <-> C6.1 <-> D1.1 <-> D2.2 <-> Depth (B).1 <-> IC1.1 <-> IC1.12 <-> IC1.2 <-> IC2.8 <-> R10.2 <-> R11.1 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R7.2 <-> R9.2 + C4.2 <-> C8.2 <-> C9.2 <-> IC1.11 <-> IC2.4 <-> IC3.6 <-> R13.1 <-> R29.1 <-> R4.2 <-> R8.2 C5.1 <-> C7.1 <-> IC2.6 <-> R8.1 + C5.2 <-> R19.2 + C6.2 <-> R12.2 + C7.2 <-> R4.1 C8.1 <-> IC1.3 <-> R13.2 <-> R14.1 C9.1 <-> IC1.4 <-> IC2.5 <-> IC3.14 <-> R14.2 <-> R16.1 <-> R20.2 <-> R24.2 <-> R26.2 + D1.2 <-> D2.1 <-> Depth (B).3 <-> R1.2 D3.1 <-> D4.1 <-> IC1.6 <-> R15.1 <-> R16.2 <-> R9.1 D3.2 <-> R17.1 D4.2 <-> R7.1 + Depth (B).2 <-> IC1.5 + IC1.10 <-> R5.2 <-> R6.1 IC1.7 <-> R15.2 <-> R17.2 <-> R18.2 <-> R19.2 IC2.2 <-> R12.1 <-> R8.2 + IC2.7 <-> R19.1 <-> R27.1 <-> R8.2 <-> R8.2 IC3.1 <-> R18.1 IC3.10 <-> R20.1 IC3.11 <-> R21.2 @@ -26,11 +37,12 @@ Switch setup: [.ON1] IC3.3 <-> R25.2 IC3.4 <-> R19.1 <-> R23.2 <-> R28.1 IC3.9 <-> R19.1 + R2.2 <-> R3.2 <-> Rate (C).1 <-> Rate (C).2 Switch setup: [.ON2] C1.1 <-> C2.1 - C1.2 <-> C3.1 <-> C3.2 <-> C4.2 <-> C8.2 <-> C9.2 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.8 <-> IC1.9 <-> IC2.4 <-> IC3.6 <-> R11.2 <-> R13.1 <-> R2.1 <-> R2.2 <-> R29.1 <-> R3.1 <-> R3.2 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R8.2 <-> Rate (C).1 <-> Rate (C).2 <-> Rate (C).3 + C1.2 <-> IC1.13 <-> R3.1 <-> Rate (C).3 C10.1 <-> IC3.5 <-> IC3.7 C10.2 <-> IC3.16 <-> R28.2 <-> R29.2 <-> R30.2 C11.1 <-> IC2.3 <-> R10.1 @@ -38,15 +50,26 @@ Switch setup: [.ON2] C11.2 <-> IC2.1 <-> R31.2 <-> R8.1 <-> R8.1 <-> R8.1 C12.1 <-> R27.2 C12.2 <-> IC3.8 <-> R19.2 <-> R8.1 - C2.2 <-> C4.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Depth (B).1 <-> Depth (B).2 <-> Depth (B).3 <-> IC1.1 <-> IC1.12 <-> IC1.14 <-> IC1.2 <-> IC1.5 <-> IC2.7 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.2 <-> R11.1 <-> R12.2 <-> R19.1 <-> R19.2 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R27.1 <-> R4.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> R8.2 <-> R9.2 + C2.2 <-> IC1.14 <-> R1.1 <-> R6.2 + C3.1 <-> IC1.8 <-> R2.1 <-> R5.1 + C3.2 <-> IC1.9 <-> R11.2 + C4.1 <-> C6.1 <-> D1.1 <-> D2.2 <-> Depth (B).1 <-> IC1.1 <-> IC1.12 <-> IC1.2 <-> IC2.8 <-> R10.2 <-> R11.1 <-> R21.1 <-> R22.1 <-> R23.1 <-> R25.1 <-> R7.2 <-> R9.2 + C4.2 <-> C8.2 <-> C9.2 <-> IC1.11 <-> IC2.4 <-> IC3.6 <-> R13.1 <-> R29.1 <-> R4.2 <-> R8.2 C5.1 <-> C7.1 <-> IC2.6 <-> R8.1 + C5.2 <-> R19.2 + C6.2 <-> R12.2 + C7.2 <-> R4.1 C8.1 <-> IC1.3 <-> R13.2 <-> R14.1 C9.1 <-> IC1.4 <-> IC2.5 <-> IC3.14 <-> R14.2 <-> R16.1 <-> R20.2 <-> R24.2 <-> R26.2 + D1.2 <-> D2.1 <-> Depth (B).3 <-> R1.2 D3.1 <-> D4.1 <-> IC1.6 <-> R15.1 <-> R16.2 <-> R9.1 D3.2 <-> R17.1 D4.2 <-> R7.1 + Depth (B).2 <-> IC1.5 + IC1.10 <-> R5.2 <-> R6.1 IC1.7 <-> R15.2 <-> R17.2 <-> R18.2 <-> R19.2 IC2.2 <-> R12.1 <-> R8.2 + IC2.7 <-> R19.1 <-> R27.1 <-> R8.2 <-> R8.2 IC3.1 <-> R18.1 IC3.10 <-> R20.1 IC3.11 <-> R21.2 @@ -55,4 +78,5 @@ Switch setup: [.ON2] IC3.3 <-> R25.2 IC3.4 <-> R19.1 <-> R23.2 <-> R28.1 IC3.9 <-> R19.1 + R2.2 <-> R3.2 <-> Rate (C).1 <-> Rate (C).2 diff --git a/diylc-regression-data/input/cloud/netlist/246_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/246_excl_switches.txt index 4b031c29..00eb51b0 100644 --- a/diylc-regression-data/input/cloud/netlist/246_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/246_excl_switches.txt @@ -1,6 +1,7 @@ Switch setup: [Default] - .2 <-> .3 <-> .5 <-> .6 <-> J1.Sleeve <-> SW1.2 <-> SW1.4 <-> Volume.3 + .2 <-> SW1.2 + .3 <-> .5 <-> .6 <-> J1.Sleeve <-> SW1.4 <-> Volume.3 C1.1 <-> SW1.3 <-> Volume.1 C1.2 <-> R1.2 J1.Tip <-> R1.1 <-> Volume.2 diff --git a/diylc-regression-data/input/cloud/netlist/246_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/246_incl_switches.txt index 6cf29b39..80eb9e0d 100644 --- a/diylc-regression-data/input/cloud/netlist/246_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/246_incl_switches.txt @@ -1,4 +1,11 @@ -Switch setup: [.ON1:SW1.Treble, .ON2:SW1.Treble, .ON1:SW1.Middle, .ON2:SW1.Middle, .ON1:SW1.Rhythm, .ON2:SW1.Rhythm] +Switch setup: [.ON1:SW1.Treble] + + C1.1 <-> Volume.1 + C1.2 <-> R1.2 + J1.Sleeve <-> Volume.3 + J1.Tip <-> R1.1 <-> Volume.2 + +Switch setup: [.ON2:SW1.Treble, .ON1:SW1.Middle, .ON2:SW1.Middle, .ON1:SW1.Rhythm, .ON2:SW1.Rhythm] C1.1 <-> J1.Sleeve <-> Volume.1 <-> Volume.3 C1.2 <-> R1.2 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 88feb7f4..84bf122b 100644 --- a/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt @@ -6,7 +6,7 @@ Switch setup: [Default] .2 <-> J1.2 <-> R2.1 1,5nf.1 <-> TREBLE.3 1,5nf.2 <-> 100K.2 <-> 68nf.1 - 100K 2watt.1 <-> 100K 2Watt.1 <-> 32uF.1 <-> 32uF.2 + 100K 2Watt.1 <-> 100K 2watt.1 <-> 32uF.1 <-> 32uF.2 100K 2Watt.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 32uF.1 <-> 33K.2 100K 2watt.2 <-> 32uF.2 100K.1 <-> 100K.1 <-> 1nF.1 <-> 33K.1 <-> 33K.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 88feb7f4..84bf122b 100644 --- a/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt @@ -6,7 +6,7 @@ Switch setup: [Default] .2 <-> J1.2 <-> R2.1 1,5nf.1 <-> TREBLE.3 1,5nf.2 <-> 100K.2 <-> 68nf.1 - 100K 2watt.1 <-> 100K 2Watt.1 <-> 32uF.1 <-> 32uF.2 + 100K 2Watt.1 <-> 100K 2watt.1 <-> 32uF.1 <-> 32uF.2 100K 2Watt.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 32uF.1 <-> 33K.2 100K 2watt.2 <-> 32uF.2 100K.1 <-> 100K.1 <-> 1nF.1 <-> 33K.1 <-> 33K.1 diff --git a/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt index 08038ef9..11fa66c3 100644 --- a/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt @@ -7,17 +7,15 @@ Switch setup: [Default] C10.2 <-> C11.2 <-> R10.2 C11.1 <-> Q1.3 <-> R11.1 C12.1 <-> Q1.2 <-> R12.1 - C12.2 <-> Volume.1 C2.1 <-> C3.1 <-> D1.2 <-> OP07.6 <-> Q1.1 <-> R1.2 <-> R2.1 C4.1 <-> R4.2 C4.2 <-> R5.2 <-> R6.1 C5.1 <-> OP07.3 <-> R6.2 - C6.1 <-> Dist.1 <-> Dist.2 <-> OP07.2 <-> R7.1 <-> R8.1 + C6.1 <-> Dist.1 <-> OP07.2 <-> R7.1 <-> R8.1 C6.2 <-> C9.1 <-> Dist.3 <-> OP07.7 C7.1 <-> R8.2 C8.1 <-> R7.2 C9.2 <-> R9.1 - D2.2 <-> D3.1 <-> R9.2 <-> Tone.1 <-> Tone.2 + D2.2 <-> D3.1 <-> R9.2 <-> Tone.1 D4.1 <-> R13.1 - R10.1 <-> Tone.3 diff --git a/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt index 08038ef9..11fa66c3 100644 --- a/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt @@ -7,17 +7,15 @@ Switch setup: [Default] C10.2 <-> C11.2 <-> R10.2 C11.1 <-> Q1.3 <-> R11.1 C12.1 <-> Q1.2 <-> R12.1 - C12.2 <-> Volume.1 C2.1 <-> C3.1 <-> D1.2 <-> OP07.6 <-> Q1.1 <-> R1.2 <-> R2.1 C4.1 <-> R4.2 C4.2 <-> R5.2 <-> R6.1 C5.1 <-> OP07.3 <-> R6.2 - C6.1 <-> Dist.1 <-> Dist.2 <-> OP07.2 <-> R7.1 <-> R8.1 + C6.1 <-> Dist.1 <-> OP07.2 <-> R7.1 <-> R8.1 C6.2 <-> C9.1 <-> Dist.3 <-> OP07.7 C7.1 <-> R8.2 C8.1 <-> R7.2 C9.2 <-> R9.1 - D2.2 <-> D3.1 <-> R9.2 <-> Tone.1 <-> Tone.2 + D2.2 <-> D3.1 <-> R9.2 <-> Tone.1 D4.1 <-> R13.1 - R10.1 <-> Tone.3 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 f95c40dc..277e64e9 100644 --- a/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/289_excl_switches.txt @@ -1,7 +1,8 @@ Switch setup: [Default] - .1 <-> .2 <-> .3 <-> B1.B1.+ <-> J1.Ring + .1 <-> B1.B1.+ .2 <-> .2 <-> .2 + .2 <-> J1.Ring 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 a822974d..fe1a4f90 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,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, .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] +Switch setup: [.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:.ON1] B1.B1.+ <-> J1.Ring B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.3 J1.Tip <-> Volume.2 +Switch setup: [.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:.ON2] + + B1.B1.- <-> GND <-> J1.Sleeve <-> Volume.3 + J1.Tip <-> Volume.2 + diff --git a/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt index 0835c9d9..a3d4834d 100644 --- a/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt @@ -1,8 +1,7 @@ Switch setup: [Default] - .1 <-> C8.2 <-> R13.1 + .1 <-> C8.2 .2 <-> .3 - .3 <-> C9.2 <-> R14.2 C1-B.1 <-> R1.2 C2.1 <-> R2.2 C3.1 <-> R2.1 diff --git a/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt index 4094f871..64dfa0da 100644 --- a/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt @@ -5,8 +5,6 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1, .O C3.1 <-> R2.1 C3.2 <-> R5.2 <-> V1.1 C6.2 <-> R8.2 <-> V1.6 - C8.2 <-> R13.1 - C9.2 <-> R14.2 J1.1 <-> J1.4 <-> R3.1 R11.1 <-> V2.5 R4.2 <-> V1.2 diff --git a/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt index 59165c1f..59c5d711 100644 --- a/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt @@ -2,10 +2,11 @@ Switch setup: [Default] 1 KW.1 <-> IC2.1 <-> VR5.1 1 KW.2 <-> C5.2 <-> IC2.2 <-> IC2.6 - C4.1 <-> C5.1 <-> IC2.11 <-> IC2.4 <-> IC2.7 <-> IC2.8 <-> VR4.1 <-> VR4.2 <-> VR5.2 <-> VR5.3 <-> VR6.3 + C4.1 <-> C5.1 <-> IC2.7 <-> VR6.3 C4.2 <-> IC2.10 <-> IC2.9 <-> VR4.3 C6.1 <-> VR6.1 C6.2 <-> IC2.13 C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> R2.1 <-> R2.2 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.2 <-> VR9.3 + IC2.11 <-> IC2.4 <-> IC2.8 <-> VR4.1 <-> VR4.2 <-> VR5.2 <-> VR5.3 IC2.14 <-> IC2.5 diff --git a/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt index 59165c1f..59c5d711 100644 --- a/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt @@ -2,10 +2,11 @@ Switch setup: [Default] 1 KW.1 <-> IC2.1 <-> VR5.1 1 KW.2 <-> C5.2 <-> IC2.2 <-> IC2.6 - C4.1 <-> C5.1 <-> IC2.11 <-> IC2.4 <-> IC2.7 <-> IC2.8 <-> VR4.1 <-> VR4.2 <-> VR5.2 <-> VR5.3 <-> VR6.3 + C4.1 <-> C5.1 <-> IC2.7 <-> VR6.3 C4.2 <-> IC2.10 <-> IC2.9 <-> VR4.3 C6.1 <-> VR6.1 C6.2 <-> IC2.13 C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> R2.1 <-> R2.2 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.2 <-> VR9.3 + IC2.11 <-> IC2.4 <-> IC2.8 <-> VR4.1 <-> VR4.2 <-> VR5.2 <-> VR5.3 IC2.14 <-> IC2.5 diff --git a/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt index e3ca04a1..98db3e4f 100644 --- a/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt @@ -1,6 +1,7 @@ Switch setup: [Default] - .1 <-> .2 <-> .3 <-> 100 K.1 <-> C3.1 <-> Q1.1 <-> R1.1 + .1 <-> 100 K.1 <-> C3.1 <-> Q1.1 + .2 <-> .3 <-> R1.1 C3.2 <-> D1.1 Q1.2 <-> Q1.3 diff --git a/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt index e3ca04a1..98db3e4f 100644 --- a/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt @@ -1,6 +1,7 @@ Switch setup: [Default] - .1 <-> .2 <-> .3 <-> 100 K.1 <-> C3.1 <-> Q1.1 <-> R1.1 + .1 <-> 100 K.1 <-> C3.1 <-> Q1.1 + .2 <-> .3 <-> R1.1 C3.2 <-> D1.1 Q1.2 <-> Q1.3 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 9c1ccba6..3d2f7966 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,7 @@ Switch setup: [Default] - .1 <-> .1 <-> .1 <-> .2 <-> .2 <-> .3 <-> .4 <-> .5 <-> .5 <-> .6 <-> C2.2 <-> GND <-> J1.Sleeve <-> J1.Tip <-> VOL / TONE.3 + .1 <-> .1 <-> .2 <-> GND <-> J1.Sleeve <-> VOL / TONE.3 + .1 <-> .2 <-> .4 <-> .5 .1 <-> .2 <-> .4 <-> .5 .1 <-> .2 <-> .7 .1 <-> .2 <-> .8 <-> Bridge: South.South Finish @@ -10,8 +11,10 @@ Switch setup: [Default] .3 <-> .3 .3 <-> .3 .3 <-> .5 <-> .5 + .3 <-> .5 <-> J1.Tip .4 <-> C1.2 .4 <-> C2.1 <-> VOL / TONE.2 .6 <-> .6 .6 <-> .6 + .6 <-> C2.2 diff --git a/diylc-regression-data/input/cloud/netlist/319_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/319_excl_switches.txt index 3f7f45d4..aab9f6cc 100644 --- a/diylc-regression-data/input/cloud/netlist/319_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/319_excl_switches.txt @@ -5,7 +5,8 @@ Switch setup: [Default] 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 Bass.3 <-> Middle.1 - Bright Volume.1 <-> Bright Volume.2 <-> Brite Mica.1 <-> Brite Mica.2 <-> Coupling V1B.2 <-> Mixing.1 + Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 Bright Volume.3 <-> Preamp Master Volume.3 Bypass V1.1 <-> Cathode V1.2 <-> V1.3 Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 diff --git a/diylc-regression-data/input/cloud/netlist/319_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/319_incl_switches.txt index 3f7f45d4..aab9f6cc 100644 --- a/diylc-regression-data/input/cloud/netlist/319_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/319_incl_switches.txt @@ -5,7 +5,8 @@ Switch setup: [Default] 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 Bass.3 <-> Middle.1 - Bright Volume.1 <-> Bright Volume.2 <-> Brite Mica.1 <-> Brite Mica.2 <-> Coupling V1B.2 <-> Mixing.1 + Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 Bright Volume.3 <-> Preamp Master Volume.3 Bypass V1.1 <-> Cathode V1.2 <-> V1.3 Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.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 921790b9..aab9f6cc 100644 --- a/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/320_excl_switches.txt @@ -1,11 +1,12 @@ Switch setup: [Default] - Presence.1 <-> GND <-> Presence.1 + Presence.1 <-> 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 Bass.3 <-> Middle.1 - Bright Volume.1 <-> Bright Volume.2 <-> Brite Mica.1 <-> Brite Mica.2 <-> Coupling V1B.2 <-> Mixing.1 + Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 Bright Volume.3 <-> Preamp Master Volume.3 Bypass V1.1 <-> Cathode V1.2 <-> V1.3 Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 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 921790b9..aab9f6cc 100644 --- a/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/320_incl_switches.txt @@ -1,11 +1,12 @@ Switch setup: [Default] - Presence.1 <-> GND <-> Presence.1 + Presence.1 <-> 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 Bass.3 <-> Middle.1 - Bright Volume.1 <-> Bright Volume.2 <-> Brite Mica.1 <-> Brite Mica.2 <-> Coupling V1B.2 <-> Mixing.1 + Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 Bright Volume.3 <-> Preamp Master Volume.3 Bypass V1.1 <-> Cathode V1.2 <-> V1.3 Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 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 921790b9..aab9f6cc 100644 --- a/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/321_excl_switches.txt @@ -1,11 +1,12 @@ Switch setup: [Default] - Presence.1 <-> GND <-> Presence.1 + Presence.1 <-> 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 Bass.3 <-> Middle.1 - Bright Volume.1 <-> Bright Volume.2 <-> Brite Mica.1 <-> Brite Mica.2 <-> Coupling V1B.2 <-> Mixing.1 + Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 Bright Volume.3 <-> Preamp Master Volume.3 Bypass V1.1 <-> Cathode V1.2 <-> V1.3 Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 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 921790b9..aab9f6cc 100644 --- a/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/321_incl_switches.txt @@ -1,11 +1,12 @@ Switch setup: [Default] - Presence.1 <-> GND <-> Presence.1 + Presence.1 <-> 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 Bass.3 <-> Middle.1 - Bright Volume.1 <-> Bright Volume.2 <-> Brite Mica.1 <-> Brite Mica.2 <-> Coupling V1B.2 <-> Mixing.1 + Bright Volume.1 <-> Brite Mica.1 <-> Coupling V1B.2 + Bright Volume.2 <-> Brite Mica.2 <-> Mixing.1 Bright Volume.3 <-> Preamp Master Volume.3 Bypass V1.1 <-> Cathode V1.2 <-> V1.3 Bypass V1.2 <-> Cathode V1.1 <-> Cathode V2A.1 <-> Cathode V2B.1 <-> Filter Cap B+2.2 <-> Grid Stopper.1 <-> Input.1 <-> Input.2 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 0f1e92e4..cd2a25a3 100644 --- a/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/354_excl_switches.txt @@ -3,15 +3,15 @@ Switch setup: [Default] 1nf.1 <-> CRL Switch.2 <-> CRL Switch.7 <-> Volume.1 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 1nf.2 <-> CRL Switch.3 <-> Tone 2.1 1nf.2 <-> CRL Switch.5 <-> Tone 1.1 + 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 22nf.1 <-> 4.7k.1 22nf.2 <-> Tone 2.3 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 - 4.7k.2 <-> 4.7k.2 Br Plug Fem.4 <-> GND + Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish 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 42b5be3a..5226321e 100644 --- a/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/354_incl_switches.txt @@ -3,15 +3,15 @@ Switch setup: [CRL Switch.1] 1nf.1 <-> Bridge.North Start <-> Volume.1 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 + 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 1nf.2 <-> Tone 1.1 1nf.2 <-> Tone 2.1 22nf.1 <-> 4.7k.1 22nf.2 <-> Tone 2.3 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 - 4.7k.2 <-> 4.7k.2 Br Plug Fem.4 <-> GND + Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish J1.Tip <-> Plug Jill.3 Switch setup: [CRL Switch.2] @@ -19,14 +19,14 @@ Switch setup: [CRL Switch.2] 1nf.1 <-> 1nf.2 <-> Bridge.North Start <-> Middle.North Start <-> Tone 2.1 <-> Volume.1 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 + 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 1nf.2 <-> Tone 1.1 22nf.1 <-> 4.7k.1 22nf.2 <-> Tone 2.3 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 - 4.7k.2 <-> 4.7k.2 Br Plug Fem.4 <-> GND + Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish J1.Tip <-> Plug Jill.3 Switch setup: [CRL Switch.3] @@ -34,14 +34,14 @@ Switch setup: [CRL Switch.3] 1nf.1 <-> 1nf.2 <-> Middle.North Start <-> Tone 2.1 <-> Volume.1 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 + 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 1nf.2 <-> Tone 1.1 22nf.1 <-> 4.7k.1 22nf.2 <-> Tone 2.3 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 - 4.7k.2 <-> 4.7k.2 Br Plug Fem.4 <-> GND + Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish J1.Tip <-> Plug Jill.3 Switch setup: [CRL Switch.4] @@ -49,13 +49,13 @@ Switch setup: [CRL Switch.4] 1nf.1 <-> 1nf.2 <-> 1nf.2 <-> Middle.North Start <-> Neck.North Start <-> Tone 1.1 <-> Tone 2.1 <-> Volume.1 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 + 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 22nf.1 <-> 4.7k.1 22nf.2 <-> Tone 2.3 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 - 4.7k.2 <-> 4.7k.2 Br Plug Fem.4 <-> GND + Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish J1.Tip <-> Plug Jill.3 Switch setup: [CRL Switch.5] @@ -63,13 +63,13 @@ Switch setup: [CRL Switch.5] 1nf.1 <-> 1nf.2 <-> Neck.North Start <-> Tone 1.1 <-> Volume.1 1nf.1 <-> Tone 1.2 1nf.1 <-> Tone 2.2 - 1nf.2 <-> Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 + 1nf.2 <-> Plug Jack.3 <-> Volume.2 <-> Volume.3 1nf.2 <-> Tone 2.1 22nf.1 <-> 4.7k.1 22nf.2 <-> Tone 2.3 33nf.1 <-> 4.7k.1 33nf.2 <-> Tone 1.3 - 4.7k.2 <-> 4.7k.2 Br Plug Fem.4 <-> GND + Bridge.North Finish <-> Middle.North Finish <-> Neck.North Finish 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 a5dbb308..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,7 +1,4 @@ Switch setup: [Default] - .1 <-> SW1.2 - GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start <-> SW1.3 <-> SW2.3 <-> SW4.3 - SW3.1 <-> SW3.6 - SW3.3 <-> SW3.4 + 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 ab69c23e..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,8 +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] +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] GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start -Switch setup: [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] - - .1 <-> GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start - diff --git a/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt index 572ba3b4..cfa75ebb 100644 --- a/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt @@ -1,17 +1,20 @@ Switch setup: [Default] - .1 <-> C6.2 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2 .1 <-> PLC86.5 + .1 <-> R11.1 <-> R6.1 .2 <-> PLC86.4 .2 <-> PLC86.6 C1.2 <-> PLC86.9 <-> R2.1 C2.1 <-> R3.1 <-> R6.2 C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.1 <-> R12.3 <-> R4.1 <-> R5.1 C3.1 <-> R7.1 <-> R8.1 C3.2 <-> PLC86.1 <-> R3.2 C3.2 <-> PLC86.8 <-> R4.2 C5.1 <-> PLC86.3 <-> R9.1 C6.1 <-> PLC86.7 <-> R11.2 + C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 PLC86.2 <-> R8.2 + R10.1 <-> R9.2 + R12.1 <-> R12.2 diff --git a/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt index 1645fe39..f26e988e 100644 --- a/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt @@ -3,56 +3,68 @@ Switch setup: [.ON1:.ON1] C1.2 <-> PLC86.9 <-> R2.1 C2.1 <-> R3.1 <-> R6.2 C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.1 <-> R12.3 <-> R4.1 <-> R5.1 C3.1 <-> R7.1 <-> R8.1 C3.2 <-> PLC86.1 <-> R3.2 C3.2 <-> PLC86.8 <-> R4.2 C5.1 <-> PLC86.3 <-> R9.1 C6.1 <-> PLC86.7 <-> R11.2 - C6.2 <-> PLC86.4 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2 + C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 PLC86.2 <-> R8.2 + PLC86.4 <-> R11.1 <-> R6.1 PLC86.5 <-> PLC86.6 + R10.1 <-> R9.2 + R12.1 <-> R12.2 Switch setup: [.ON1:.ON2] C1.2 <-> PLC86.9 <-> R2.1 C2.1 <-> R3.1 <-> R6.2 C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.1 <-> R12.3 <-> R4.1 <-> R5.1 C3.1 <-> R7.1 <-> R8.1 C3.2 <-> PLC86.1 <-> R3.2 C3.2 <-> PLC86.8 <-> R4.2 C5.1 <-> PLC86.3 <-> R9.1 C6.1 <-> PLC86.7 <-> R11.2 - C6.2 <-> PLC86.4 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2 + C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 PLC86.2 <-> R8.2 + PLC86.4 <-> R11.1 <-> R6.1 + R10.1 <-> R9.2 + R12.1 <-> R12.2 Switch setup: [.ON2:.ON1] C1.2 <-> PLC86.9 <-> R2.1 C2.1 <-> R3.1 <-> R6.2 C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.1 <-> R12.3 <-> R4.1 <-> R5.1 C3.1 <-> R7.1 <-> R8.1 C3.2 <-> PLC86.1 <-> R3.2 C3.2 <-> PLC86.8 <-> R4.2 C5.1 <-> PLC86.3 <-> R9.1 C6.1 <-> PLC86.7 <-> R11.2 - C6.2 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2 + C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 PLC86.2 <-> R8.2 PLC86.5 <-> PLC86.6 + R10.1 <-> R9.2 + R11.1 <-> R6.1 + R12.1 <-> R12.2 Switch setup: [.ON2:.ON2] C1.2 <-> PLC86.9 <-> R2.1 C2.1 <-> R3.1 <-> R6.2 C2.2 <-> C5.2 <-> R7.2 - C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1 + C3.1 <-> R12.3 <-> R4.1 <-> R5.1 C3.1 <-> R7.1 <-> R8.1 C3.2 <-> PLC86.1 <-> R3.2 C3.2 <-> PLC86.8 <-> R4.2 C5.1 <-> PLC86.3 <-> R9.1 C6.1 <-> PLC86.7 <-> R11.2 - C6.2 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2 + C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2 PLC86.2 <-> R8.2 + R10.1 <-> R9.2 + R11.1 <-> R6.1 + R12.1 <-> R12.2 diff --git a/diylc-regression-data/input/cloud/netlist/380_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/380_excl_switches.txt index 87ca07b8..bcff7a7c 100644 --- a/diylc-regression-data/input/cloud/netlist/380_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/380_excl_switches.txt @@ -1,13 +1,11 @@ Switch setup: [Default] C1.1 <-> VR1.3 <-> VR2.3 - C1.2 <-> SW2.3 <-> SW2.6 - J1.Sleeve <-> PKP2.North Finish <-> SW1.3 <-> SW1.6 <-> VR3.3 + J1.Sleeve <-> PKP2.North Finish <-> VR3.3 J1.Tip <-> VR3.2 PKP1.North Start <-> SW1.4 PKP2.North Start <-> SW2.4 PKP3.North Start <-> SW3.4 SW1.5 <-> VR2.2 - SW3.3 <-> SW3.6 SW3.5 <-> VR1.2 diff --git a/diylc-regression-data/input/cloud/netlist/380_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/380_incl_switches.txt index b0f5fa26..08a1e2e5 100644 --- a/diylc-regression-data/input/cloud/netlist/380_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/380_incl_switches.txt @@ -16,13 +16,13 @@ Switch setup: [SW1.ON1:SW2.ON1:SW3.ON2, SW1.ON1:SW2.ON2:SW3.ON2] Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1, SW1.ON2:SW2.ON2:SW3.ON1] C1.1 <-> VR1.3 <-> VR2.3 - J1.Sleeve <-> PKP2.North Finish <-> VR2.2 <-> VR3.3 + J1.Sleeve <-> PKP2.North Finish <-> VR3.3 J1.Tip <-> VR3.2 PKP3.North Start <-> VR1.2 Switch setup: [SW1.ON2:SW2.ON1:SW3.ON2, SW1.ON2:SW2.ON2:SW3.ON2] C1.1 <-> VR1.3 <-> VR2.3 - J1.Sleeve <-> PKP2.North Finish <-> VR2.2 <-> VR3.3 + J1.Sleeve <-> PKP2.North Finish <-> VR3.3 J1.Tip <-> VR3.2 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 0df4f0cc..bf615bab 100644 --- a/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt @@ -4,5 +4,4 @@ Switch setup: [Default] C10.2 <-> C9.1 <-> PR6 (GAIN).3 <-> R10.2 C9.2 <-> INPUT.1 <-> R9.1 GND <-> PR6 (GAIN).1 <-> R10.1 - PR10 (VOLUME).2 <-> PR10 (VOLUME).3 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 0df4f0cc..bf615bab 100644 --- a/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt @@ -4,5 +4,4 @@ Switch setup: [Default] C10.2 <-> C9.1 <-> PR6 (GAIN).3 <-> R10.2 C9.2 <-> INPUT.1 <-> R9.1 GND <-> PR6 (GAIN).1 <-> R10.1 - PR10 (VOLUME).2 <-> PR10 (VOLUME).3 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 0e600d04..8a851d7d 100644 --- a/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt @@ -1,16 +1,19 @@ Switch setup: [Default] - (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C16.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).2 <-> 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 <-> 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 <-> PR8 (MID).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.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2 C11.2 <-> C9.2 <-> R8.1 <-> V2.6 C13.1 <-> R17.1 <-> V3.3 C14.1 <-> PR9 (HIGH).3 C14.2 <-> R19.2 + C15.1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR9 (HIGH).1 C15.2 <-> C16.2 <-> R19.1 + C16.1 <-> PR8 (MID).2 C17.2 <-> V1.7 C18.1 <-> SW1.3 C3.1 <-> R2.1 <-> V1.1 + PR7 (BASS).1 <-> PR8 (MID).3 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 bea6f818..970e5e63 100644 --- a/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt @@ -1,15 +1,18 @@ Switch setup: [SW1.ON1, SW1.OFF] - (MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C16.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).2 <-> 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 <-> 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 <-> PR8 (MID).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.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2 C11.2 <-> C9.2 <-> R8.1 <-> V2.6 C13.1 <-> R17.1 <-> V3.3 C14.1 <-> PR9 (HIGH).3 C14.2 <-> R19.2 + C15.1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR9 (HIGH).1 C15.2 <-> C16.2 <-> R19.1 + C16.1 <-> PR8 (MID).2 C17.2 <-> V1.7 C3.1 <-> R2.1 <-> V1.1 + PR7 (BASS).1 <-> PR8 (MID).3 R10.2 <-> V2.7 R12.1 <-> R13.1 R13.2 <-> V3.2 @@ -21,16 +24,19 @@ 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 <-> C16.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).2 <-> 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 <-> 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 <-> PR8 (MID).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.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2 C11.2 <-> C9.2 <-> R8.1 <-> V2.6 C13.1 <-> R17.1 <-> V3.3 C14.1 <-> PR9 (HIGH).3 C14.2 <-> R19.2 + C15.1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR9 (HIGH).1 C15.2 <-> C16.2 <-> R19.1 + C16.1 <-> PR8 (MID).2 C17.2 <-> V1.7 C3.1 <-> R2.1 <-> V1.1 + PR7 (BASS).1 <-> PR8 (MID).3 R10.2 <-> V2.7 R12.1 <-> R13.1 R13.2 <-> V3.2 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 f257d8bd..6f315f8b 100644 --- a/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt @@ -1,7 +1,6 @@ Switch setup: [Default] - C1.1 <-> C1.2 <-> C10.1 <-> 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 <-> 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 - C10.2 <-> R11.2 + 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 C14.2 <-> R12.2 <-> R13.1 C15.1 <-> R15.2 <-> V4.8 C15.2 <-> J4.2 <-> R17.1 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 f257d8bd..6f315f8b 100644 --- a/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt @@ -1,7 +1,6 @@ Switch setup: [Default] - C1.1 <-> C1.2 <-> C10.1 <-> 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 <-> 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 - C10.2 <-> R11.2 + 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 C14.2 <-> R12.2 <-> R13.1 C15.1 <-> R15.2 <-> V4.8 C15.2 <-> J4.2 <-> R17.1 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 d34af015..ff982972 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 <-> GND <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> SW1.3 <-> 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/407_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt index 553cca89..1b6d532a 100644 --- a/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt @@ -7,5 +7,4 @@ Switch setup: [Default] LesPaul 3 Pos Switch.3 <-> Presa Jack.Tip <-> TONE.2 LesPaul 3 Pos Switch.4 <-> VOL1.2 Push Pull.1 <-> Push Pull.4 - Push Pull.6 <-> VOL1.1 diff --git a/diylc-regression-data/input/cloud/netlist/416_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/416_excl_switches.txt index 1e1e6f47..54feb2dd 100644 --- a/diylc-regression-data/input/cloud/netlist/416_excl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/416_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - BRIDGE VOL.3 <-> CAP 0.22 uF.2 <-> CAP 0.22 uF.2 <-> LP NECK.South Start + BRIDGE VOL.3 <-> CAP 0.22 uF.2 CAP 0.22 uF.1 <-> NECK TONE.2 LP BRIDGE.North Finish <-> LP BRIDGE.South Finish LP NECK.North Finish <-> LP NECK.South Finish diff --git a/diylc-regression-data/input/cloud/netlist/416_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/416_incl_switches.txt index 3b6a0984..e7b2cf22 100644 --- a/diylc-regression-data/input/cloud/netlist/416_incl_switches.txt +++ b/diylc-regression-data/input/cloud/netlist/416_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [SW1.Treble, SW1.Middle, SW1.Rhythm] - BRIDGE VOL.3 <-> CAP 0.22 uF.2 <-> CAP 0.22 uF.2 <-> LP NECK.South Start + BRIDGE VOL.3 <-> CAP 0.22 uF.2 CAP 0.22 uF.1 <-> NECK TONE.2 LP BRIDGE.North Finish <-> LP BRIDGE.South Finish LP NECK.North Finish <-> LP NECK.South Finish diff --git a/diylc-regression-data/input/cloud/png/401.png b/diylc-regression-data/input/cloud/png/401.png index c5664319..d286314b 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/diy-fever/diy/standard strat.diy b/diylc-regression-data/input/diy-fever/diy/standard strat.diy index 0f1b4ad6..8851b673 100644 --- a/diylc-regression-data/input/diy-fever/diy/standard strat.diy +++ b/diylc-regression-data/input/diy-fever/diy/standard strat.diy @@ -1,1026 +1,617 @@ - + - 3 - 55 + 4 + 34 0 New Project Branislav Stojkovic - - 29.0 - cm - - - 21.0 - cm - - - 0.1 - in - + + + + 1 - + SW1 127 - + 0 - - - - - - - - + + + + + + + + - DEFAULT DP3T_5pos true - - + + Neck 127 Neck DEFAULT - - - - + + + + North - - 0 - 0 - 0 - 255 - - - 255 - 255 - 255 - 255 - - - 117 - 157 - 175 - 255 - - - 128 - 128 - 128 - 255 - + + + + Stratocaster Rods - - 224 - 192 - 76 - 255 - - - + + + Middle 127 Middle DEFAULT - - - - + + + + South - - 0 - 0 - 0 - 255 - - - 255 - 255 - 255 - 255 - - - 117 - 157 - 175 - 255 - - - 128 - 128 - 128 - 255 - + + + + Stratocaster Rods - - 224 - 192 - 76 - 255 - - - + + + Bridge 127 Bridge DEFAULT - - - - + + + + North - - 0 - 0 - 0 - 255 - - - 255 - 255 - 255 - 255 - - - 117 - 157 - 175 - 255 - - - 128 - 128 - 128 - 255 - + + + + Stratocaster Rods - - 224 - 192 - 76 - 255 - - - + + + Tone Neck 127 - - - + + + - - 250.0 - K - + _180 LIN - - 1.0 - in - - - 0.3 - in - - - 0.15 - in - - - 192 - 192 - 192 - 255 - - - - 203 - 213 - 219 - 255 - - - 205 - 133 - 0 - 255 - + + + + + + + ThroughHole false ShaftDown - - + + Tone Middle 127 - - - + + + - + _180 LIN - - - - - - - + + + + + + + ThroughHole false ShaftDown - - + + J1 127 - - - + + + DEFAULT + 0 MONO true - - + + Volume 127 - - - + + + - + _180 LIN - - 1.0 - in - - - 0.3 - in - - - 0.15 - in - - - 192 - 192 - 192 - 255 - - - 128 - 128 - 128 - 255 - - - 203 - 213 - 219 - 255 - - - 205 - 133 - 0 - 255 - + + + + + + + ThroughHole false ShaftDown - - + + W1 127 - - - - + + + + - - 51 - 51 - 51 - 255 - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W2 127 - - - - + + + + - + FOUR true -1 _22 false - - - + + + W2 127 - - - - + + + + - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W2 127 - - - - + + + + - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W3 127 - - - - + + + + - + FOUR true -1 _22 false - - - + + + W3 127 - - - - + + + + - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W3 127 - - - - + + + + - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W4 127 - - - - + + + + - - 204 - 204 - 204 - 255 - + FOUR true -1 _22 false - - - + + + W4 127 - - - - - - - + + + + + + + - + SEVEN true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W4 127 - - - - + + + + - - 204 - 204 - 204 - 255 - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W5 127 - - - - + + + + - - 51 - 51 - 255 - 255 - + FOUR true -1 _22 false - - - + + + W5 127 - - - - + + + + - - 51 - 51 - 255 - 255 - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W3 127 - - - - + + + + - - 51 - 51 - 51 - 255 - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W5 127 - - - - + + + + - - 0 - 204 - 51 - 255 - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W5 127 - - - - + + + + - - 51 - 51 - 255 - 255 - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + W5 127 - - - - + + + + - - 0 - 204 - 51 - 255 - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + Ct 127 - - 0.4 - in - - - 0.125 - in - + + - - + + + - - 240 - 230 - 140 - 255 - - - 168 - 161 - 98 - 255 - - - - 204 - 204 - 204 - 255 - + + + + VALUE false Directional - - 0.1 - in - - - 47.0 - nF - + false + + _63V - - + + W5 127 - - - - + + + + - - 0 - 204 - 51 - 255 - + FOUR true -1 _22 false - - 255 - 255 - 0 - 255 - - - + + + Rb 127 - - 0.5 - in - - - 0.125 - in - + + - - + + + - - 130 - 207 - 253 - 255 - - - 91 - 144 - 177 - 255 - - - 0 - 0 - 0 - 255 - - - 204 - 204 - 204 - 255 - + + + + VALUE false Directional - - 120.0 - K - + false + HALF _5_BAND Standard - - + + Cb 127 - - 0.3 - in - - - 0.125 - in - + + - - + + + - - 240 - 230 - 140 - 255 - - - 168 - 161 - 98 - 255 - - - + + + + VALUE false Directional - - 0.1 - in - - - 1.2 - nF - + false + + _63V - - + + W6 127 - - - - + + + + - - 204 - 204 - 204 - 255 - + FOUR true -1 _26 false - - 255 - 255 - 0 - 255 - - - + + + ELL1 127 - - + + - - 153 - 204 - 255 - 255 - - - 0 - 0 - 0 - 255 - - - 0.0 - mm - - - + + + + + ELL1 127 - - + + - - 153 - 204 - 255 - 255 - - - 0 - 0 - 0 - 255 - - - 0.0 - mm - - - + + + + + ELL1 127 - - + + - - 153 - 204 - 255 - 255 - - - 0 - 0 - 0 - 255 - - - 0.0 - mm - - + + + + + - - - - width - - - - transform - - - - superscript - - - - posture - - - - tracking - - - - weight - - - - size - 14.0 - - - family - Square721 BT - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/diylc-regression-data/input/diy-fever/netlist/IIc+_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/IIc+_excl_switches.txt index ac0749fa..b5a149e2 100644 --- a/diylc-regression-data/input/diy-fever/netlist/IIc+_excl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/IIc+_excl_switches.txt @@ -24,12 +24,13 @@ Switch setup: [Default] C24.1 <-> R20.1 <-> R9.1 <-> V1.3 C24.2 <-> VR3.3 C25.1 <-> C26.1 <-> R20.2 - C25.2 <-> C30.1 <-> R22.2 <-> R34.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR5.1 <-> VR6.3 <-> VR7.3 + C25.2 <-> VR3.1 <-> VR5.1 C26.2 <-> VR4.1 <-> VR5.2 <-> VR5.3 C27.2 <-> R35.1 C28.1 <-> R24.1 <-> V1.6 C29.1 <-> D6.2 <-> D7.2 <-> D8.2 <-> IC2.8 <-> IC3.8 <-> IC4.8 <-> Q2.3 <-> R37.1 C3.1 <-> D1.1 <-> Q1.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R8.2 <-> V3.4 <-> V3.8 + C30.1 <-> VR2.3 <-> VR3.2 C30.2 <-> V1.7 <-> VR2.2 C4.1 <-> D1.2 <-> D2.2 <-> D4.2 <-> Q1.1 C5.1 <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 @@ -46,6 +47,7 @@ Switch setup: [Default] IC4.9 <-> VR7.1 <-> VR7.2 Q1.3 <-> R1.1 <-> R4.1 R16.2 <-> R17.1 <-> R31.2 + R22.2 <-> R34.2 <-> VR6.3 <-> VR7.3 R23.1 <-> V3.1 R36.1 <-> VR1.3 diff --git a/diylc-regression-data/input/diy-fever/netlist/IIc+_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/IIc+_incl_switches.txt index e592384a..e811c613 100644 --- a/diylc-regression-data/input/diy-fever/netlist/IIc+_incl_switches.txt +++ b/diylc-regression-data/input/diy-fever/netlist/IIc+_incl_switches.txt @@ -24,12 +24,13 @@ Switch setup: [SW1.ON1] C24.1 <-> R20.1 <-> R9.1 <-> V1.3 C24.2 <-> VR3.3 C25.1 <-> C26.1 <-> R20.2 - C25.2 <-> C30.1 <-> R22.2 <-> R34.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR5.1 <-> VR6.3 <-> VR7.3 + C25.2 <-> VR3.1 <-> VR5.1 C26.2 <-> VR4.1 <-> VR5.2 <-> VR5.3 C27.2 <-> R35.1 C28.1 <-> R24.1 <-> V1.6 C29.1 <-> D6.2 <-> D7.2 <-> D8.2 <-> IC2.8 <-> IC3.8 <-> IC4.8 <-> Q2.3 <-> R37.1 C3.1 <-> D1.1 <-> Q1.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R8.2 <-> V3.4 <-> V3.8 + C30.1 <-> VR2.3 <-> VR3.2 C30.2 <-> V1.7 <-> VR2.2 C4.1 <-> D1.2 <-> D2.2 <-> D4.2 <-> Q1.1 C5.1 <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 @@ -45,6 +46,7 @@ Switch setup: [SW1.ON1] IC4.9 <-> VR7.1 <-> VR7.2 Q1.3 <-> R1.1 <-> R4.1 R16.2 <-> R17.1 <-> R31.2 + R22.2 <-> R34.2 <-> VR6.3 <-> VR7.3 R23.1 <-> V3.1 R36.1 <-> VR1.3 @@ -74,12 +76,13 @@ Switch setup: [SW1.ON2] C24.1 <-> R20.1 <-> R9.1 <-> V1.3 C24.2 <-> VR3.3 C25.1 <-> C26.1 <-> R20.2 - C25.2 <-> C30.1 <-> R22.2 <-> R34.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR5.1 <-> VR6.3 <-> VR7.3 + C25.2 <-> VR3.1 <-> VR5.1 C26.2 <-> VR4.1 <-> VR5.2 <-> VR5.3 C27.2 <-> R35.1 C28.1 <-> R24.1 <-> V1.6 C29.1 <-> D6.2 <-> D7.2 <-> D8.2 <-> IC2.8 <-> IC3.8 <-> IC4.8 <-> Q2.3 <-> R37.1 C3.1 <-> D1.1 <-> Q1.2 <-> R1.2 <-> R13.1 <-> R3.2 <-> R8.2 <-> V3.4 <-> V3.8 + C30.1 <-> VR2.3 <-> VR3.2 C30.2 <-> V1.7 <-> VR2.2 C4.1 <-> D1.2 <-> D2.2 <-> D4.2 <-> Q1.1 C5.1 <-> R14.1 <-> R15.1 <-> R5.1 <-> R8.1 @@ -96,6 +99,7 @@ Switch setup: [SW1.ON2] IC4.9 <-> VR7.1 <-> VR7.2 Q1.3 <-> R1.1 <-> R4.1 R16.2 <-> R17.1 <-> R31.2 + R22.2 <-> R34.2 <-> VR6.3 <-> VR7.3 R23.1 <-> V3.1 R36.1 <-> VR1.3 diff --git a/diylc-regression-data/input/diy-fever/png/standard strat.png b/diylc-regression-data/input/diy-fever/png/standard strat.png index e4c9bf81..4aca4900 100644 Binary files a/diylc-regression-data/input/diy-fever/png/standard strat.png and b/diylc-regression-data/input/diy-fever/png/standard strat.png differ diff --git a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt index 1574102e..8a5ff06b 100644 --- a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt @@ -2,7 +2,7 @@ Switch setup: [Default] .047 uF.1 <-> J1.2 .047 uF.2 <-> 1 M.2 <-> R1.2 - .1 <-> .2 <-> .2 <-> .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 <-> 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 + .1 <-> .2 <-> .2 <-> .2 <-> 1 M.1 <-> 1N4007.1 <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.2 <-> C2.1 <-> C20.2 <-> 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 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.6 <-> RY1.7 <-> RY1.8 <-> RY2.6 <-> RY2.8 .1 <-> C31.2 <-> R42.2 .1 <-> C5.1 .1 <-> IEC1.2 @@ -13,6 +13,7 @@ Switch setup: [Default] .5 <-> AUX RELAY HEATER TXR.1 1N4007.2 <-> C8.1 <-> D7.1 <-> R15.2 BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2 + BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.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 @@ -27,6 +28,7 @@ Switch setup: [Default] C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1 C18.2 <-> C23.1 <-> TREBLE-CLEAN.3 C19.1 <-> MIDDLE--CLEAN.2 + C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1 C21.2 <-> MIDDLE-LEAD.3 C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1 C23.2 <-> MIDDLE--CLEAN.3 diff --git a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt index d0ea2070..ca367ba2 100644 --- a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt @@ -8,7 +8,7 @@ Switch setup: [Default] C12.1 <-> R14.1 C12.2 <-> R16.1 C13.1 <-> R16.2 <-> VR1 Gain.1 - C13.2 <-> C28.2 <-> R12.2 <-> R28.1 <-> R47.2 <-> V1.2 <-> V3.7 <-> VR1 Gain.2 <-> VR1 Gain.3 <-> VR3 BASS.1 <-> VR5 VOLUME.3 <-> VR6 DWELL.1 <-> VR6 DWELL.2 <-> VR6 PRESENCE.1 <-> VR6 PRESENCE.2 <-> VR7 LEVEL.3 <-> VR8 TONE.3 + C13.2 <-> V3.7 <-> VR1 Gain.2 C14.1 <-> R18.1 <-> V3.8 C14.2 <-> R18.2 <-> R20.2 C15.1 <-> R17.1 <-> V3.6 @@ -30,6 +30,7 @@ Switch setup: [Default] C27.1 <-> R38.2 C27.2 <-> R40.1 <-> R42.1 C28.1 <-> R29.1 <-> VR5 VOLUME.2 + C28.2 <-> V1.2 <-> VR6 DWELL.1 <-> VR6 DWELL.2 C29.1 <-> R49.1 C3.1 <-> R3.1 C30.2 <-> R48.2 <-> V1.1 @@ -51,6 +52,7 @@ Switch setup: [Default] R11.1 <-> VR10 BIAS.3 R11.2 <-> R43.2 <-> R44.1 R12.1 <-> R13.2 + R12.2 <-> R28.1 <-> R47.2 <-> VR1 Gain.3 <-> VR3 BASS.1 <-> VR5 VOLUME.3 <-> VR6 PRESENCE.1 <-> VR6 PRESENCE.2 <-> VR7 LEVEL.3 <-> VR8 TONE.3 R14.2 <-> R17.2 R21.1 <-> V2.2 R21.2 <-> VR3 MID.2 diff --git a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt index d0ea2070..ca367ba2 100644 --- a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt @@ -8,7 +8,7 @@ Switch setup: [Default] C12.1 <-> R14.1 C12.2 <-> R16.1 C13.1 <-> R16.2 <-> VR1 Gain.1 - C13.2 <-> C28.2 <-> R12.2 <-> R28.1 <-> R47.2 <-> V1.2 <-> V3.7 <-> VR1 Gain.2 <-> VR1 Gain.3 <-> VR3 BASS.1 <-> VR5 VOLUME.3 <-> VR6 DWELL.1 <-> VR6 DWELL.2 <-> VR6 PRESENCE.1 <-> VR6 PRESENCE.2 <-> VR7 LEVEL.3 <-> VR8 TONE.3 + C13.2 <-> V3.7 <-> VR1 Gain.2 C14.1 <-> R18.1 <-> V3.8 C14.2 <-> R18.2 <-> R20.2 C15.1 <-> R17.1 <-> V3.6 @@ -30,6 +30,7 @@ Switch setup: [Default] C27.1 <-> R38.2 C27.2 <-> R40.1 <-> R42.1 C28.1 <-> R29.1 <-> VR5 VOLUME.2 + C28.2 <-> V1.2 <-> VR6 DWELL.1 <-> VR6 DWELL.2 C29.1 <-> R49.1 C3.1 <-> R3.1 C30.2 <-> R48.2 <-> V1.1 @@ -51,6 +52,7 @@ Switch setup: [Default] R11.1 <-> VR10 BIAS.3 R11.2 <-> R43.2 <-> R44.1 R12.1 <-> R13.2 + R12.2 <-> R28.1 <-> R47.2 <-> VR1 Gain.3 <-> VR3 BASS.1 <-> VR5 VOLUME.3 <-> VR6 PRESENCE.1 <-> VR6 PRESENCE.2 <-> VR7 LEVEL.3 <-> VR8 TONE.3 R14.2 <-> R17.2 R21.1 <-> V2.2 R21.2 <-> VR3 MID.2 diff --git a/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_excl_switches.txt index d142e5bc..d8e66307 100644 --- a/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_excl_switches.txt @@ -1,6 +1,7 @@ Switch setup: [Default] - Balance.1 <-> Balance.2 <-> Balance.3 <-> C1.1 <-> Output Jack.Sleeve <-> Volume.1 <-> Volume.3 <-> VR2.1 <-> VR2.3 + Balance.1 <-> Balance.2 <-> C1.1 <-> Output Jack.Sleeve <-> Volume.3 <-> VR2.3 + Balance.3 <-> Volume.1 <-> VR2.1 C1.2 <-> Tone.3 Tone.2 <-> Volume.2 diff --git a/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_incl_switches.txt index d142e5bc..d8e66307 100644 --- a/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Ibanez Balance-Master Mod_incl_switches.txt @@ -1,6 +1,7 @@ Switch setup: [Default] - Balance.1 <-> Balance.2 <-> Balance.3 <-> C1.1 <-> Output Jack.Sleeve <-> Volume.1 <-> Volume.3 <-> VR2.1 <-> VR2.3 + Balance.1 <-> Balance.2 <-> C1.1 <-> Output Jack.Sleeve <-> Volume.3 <-> VR2.3 + Balance.3 <-> Volume.1 <-> VR2.1 C1.2 <-> Tone.3 Tone.2 <-> Volume.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 e9107236..3acc5619 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,13 +1,14 @@ Switch setup: [Default] C10.1 <-> D3.2 <-> D4.2 <-> R22.2 - 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 + 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.2 <-> Volume.3 C11.1 <-> R14.2 <-> R22.1 C12.1 <-> R15.1 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.1 <-> C4.1 <-> R8.2 <-> SW1.2 C14.2 <-> C17.2 <-> R7.1 <-> V2.1 C15.1 <-> R5.1 + C17.1 <-> SW1.1 C2.1 <-> R4.1 <-> V4.6 C2.2 <-> R20.1 <-> R21.1 C3.1 <-> Volume.1 @@ -24,6 +25,7 @@ Switch setup: [Default] J19.Tip <-> R1.2 <-> R3.1 R1.1 <-> V4.9 R12.1 <-> R13.2 <-> R8.1 <-> Speed.2 <-> Speed.3 + R13.1 <-> SW1.3 R18.1 <-> Volume.2 R18.2 <-> V4.2 R2.1 <-> V4.8 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 d27b5e5a..40c9e794 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,11 +1,46 @@ -Switch setup: [SW1.ON1:SW2.ON1, SW1.ON1:SW2.ON2, SW1.ON2:SW2.ON1, SW1.ON2:SW2.ON2] +Switch setup: [SW1.ON1:SW2.ON1, SW1.ON1:SW2.ON2] C10.1 <-> D3.2 <-> D4.2 <-> R22.2 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 C13.1 <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 - C14.1 <-> C17.1 <-> C4.1 <-> R13.1 <-> R8.2 + C14.1 <-> C17.1 <-> C4.1 <-> R8.2 + C14.2 <-> C17.2 <-> R7.1 <-> V2.1 + C15.1 <-> R5.1 + C2.1 <-> R4.1 <-> V4.6 + C2.2 <-> R20.1 <-> R21.1 + C3.1 <-> Volume.1 + C3.2 <-> R17.1 <-> V4.1 + C4.2 <-> C5.2 <-> J24.Tip <-> R10.1 + C5.1 <-> R9.2 + C9.1 <-> R14.1 + D1.1 <-> D2.1 <-> R27.1 + D1.2 <-> D4.1 + D2.2 <-> D3.1 + D5.1 <-> R10.2 <-> V2.3 + Intensity.1 <-> R19.1 + Intensity.2 <-> R6.1 + J19.Tip <-> R1.2 <-> R3.1 + R1.1 <-> V4.9 + R12.1 <-> R13.2 <-> R8.1 <-> Speed.2 <-> Speed.3 + R18.1 <-> Volume.2 + R18.2 <-> V4.2 + R2.1 <-> V4.8 + R21.2 <-> V1.2 + R24.1 <-> V1.9 + R26.1 <-> R27.2 + R6.2 <-> V2.8 + R7.2 <-> V2.6 + +Switch setup: [SW1.ON2:SW2.ON1, SW1.ON2:SW2.ON2] + + C10.1 <-> D3.2 <-> D4.2 <-> R22.2 + 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 + C13.1 <-> R16.1 <-> R17.2 <-> R4.2 <-> R5.2 + C14.1 <-> C4.1 <-> R13.1 <-> R8.2 C14.2 <-> C17.2 <-> R7.1 <-> V2.1 C15.1 <-> R5.1 C2.1 <-> R4.1 <-> V4.6 diff --git a/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_excl_switches.txt index 3df46e27..7c9d3c4b 100644 --- a/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_excl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - .1 <-> .1 <-> .2 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R37.2 <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> V4.7 + .1 <-> .1 <-> .2 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> V4.7 .1 <-> .2 <-> .3 <-> FH1.1 .1 <-> .2 <-> C14.1 <-> R35.1 <-> V7.5 <-> V8.5 .1 <-> FH1.2 @@ -53,7 +53,7 @@ Switch setup: [Default] C7.1 <-> R14 Bass Ch 2.1 <-> R15.1 C8.1 <-> R18 Treb Ch 1.1 C9.1 <-> R19 Treb Ch 2.1 - C9.2 <-> R13.2 <-> R15.2 <-> R21 Vol Ch 2.2 <-> R21 Vol Ch 2.3 <-> R37.3 <-> R52.2 <-> R55.3 + C9.2 <-> R13.2 <-> R15.2 <-> R21 Vol Ch 2.3 <-> R37.3 <-> R52.2 <-> R55.3 J11.Tip <-> R55.2 <-> V2.2 J12.Tip <-> R4.1 J14.Tip <-> R3.1 diff --git a/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_incl_switches.txt index b92eb105..b395019e 100644 --- a/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_incl_switches.txt +++ b/diylc-regression-data/input/user-files/netlist/Silvertone 1484 v6f_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1, .ON1:.ON2:.ON1:.ON2, .ON2:.ON1:.ON1:.ON1, .ON2:.ON1:.ON1:.ON2, .ON2:.ON2:.ON1:.ON1, .ON2:.ON2:.ON1:.ON2] - .1 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R37.2 <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> V4.7 + .1 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> V4.7 306-2H.1 <-> C25.4 <-> R59.2 <-> R7.1 <-> R8.2 C1.1 <-> R6.2 C1.1 <-> V2.1 @@ -51,7 +51,7 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1, .O C7.1 <-> R14 Bass Ch 2.1 <-> R15.1 C8.1 <-> R18 Treb Ch 1.1 C9.1 <-> R19 Treb Ch 2.1 - C9.2 <-> R13.2 <-> R15.2 <-> R21 Vol Ch 2.2 <-> R21 Vol Ch 2.3 <-> R37.3 <-> R52.2 <-> R55.3 + C9.2 <-> R13.2 <-> R15.2 <-> R21 Vol Ch 2.3 <-> R37.3 <-> R52.2 <-> R55.3 J11.Tip <-> R55.2 <-> V2.2 J12.Tip <-> R4.1 J14.Tip <-> R3.1 @@ -82,7 +82,7 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON2:.ON1:.ON1, .O Switch setup: [.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1, .ON1:.ON2:.ON2:.ON2, .ON2:.ON1:.ON2:.ON1, .ON2:.ON1:.ON2:.ON2, .ON2:.ON2:.ON2:.ON1, .ON2:.ON2:.ON2:.ON2] - .1 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R37.2 <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> V4.7 + .1 <-> .2 <-> J11.Ring <-> J11.Sleeve <-> R38.2 <-> R40.1 <-> R41.1 <-> R42.1 <-> R?.1 <-> R?.2 <-> V4.7 306-2H.1 <-> C25.4 <-> R59.2 <-> R7.1 <-> R8.2 C1.1 <-> R6.2 C1.1 <-> V2.1 @@ -133,7 +133,7 @@ Switch setup: [.ON1:.ON1:.ON2:.ON1, .ON1:.ON1:.ON2:.ON2, .ON1:.ON2:.ON2:.ON1, .O C7.1 <-> R14 Bass Ch 2.1 <-> R15.1 C8.1 <-> R18 Treb Ch 1.1 C9.1 <-> R19 Treb Ch 2.1 - C9.2 <-> R13.2 <-> R15.2 <-> R21 Vol Ch 2.2 <-> R21 Vol Ch 2.3 <-> R37.3 <-> R52.2 <-> R55.3 + C9.2 <-> R13.2 <-> R15.2 <-> R21 Vol Ch 2.3 <-> R37.3 <-> R52.2 <-> R55.3 J11.Tip <-> R55.2 <-> V2.2 J12.Tip <-> R4.1 J14.Tip <-> R3.1 diff --git a/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png b/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png index a1f685a0..8f96ed5a 100644 Binary files a/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png and b/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png differ diff --git a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt index 6fd93682..81f67ae2 100644 --- a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [Default] - C1.1 <-> P1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R LED Current.1 <-> R1.1 + C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1 C1.2 <-> P2.2 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> RP.1 <-> S1.4 @@ -10,6 +10,7 @@ Switch setup: [Default] C4.2 <-> P5.2 D1.1 <-> R LED Current.2 D1.2 <-> S1.8 + P1.1 <-> R LED Current.1 P2.1 <-> P3.1 P4.1 <-> P5.3 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2 <-> S1.7 P4.2 <-> P4.3 <-> R4.1 diff --git a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt index 7a425f38..4645324c 100644 --- a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt +++ b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt @@ -1,6 +1,6 @@ Switch setup: [S1.ON1] - C1.1 <-> P1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R LED Current.1 <-> R1.1 + C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1 C1.2 <-> P2.2 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> RP.1 @@ -10,6 +10,7 @@ Switch setup: [S1.ON1] C4.2 <-> P5.2 D1.1 <-> R LED Current.2 D1.2 <-> P4.1 <-> P5.3 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2 + P1.1 <-> R LED Current.1 P2.1 <-> P3.1 P4.2 <-> P4.3 <-> R4.1 P5.1 <-> R6.1 @@ -18,7 +19,7 @@ Switch setup: [S1.ON1] Switch setup: [S1.ON2] - C1.1 <-> P1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R LED Current.1 <-> R1.1 + C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1 C1.2 <-> P2.2 C2.1 <-> Q1.3 <-> R2.2 C2.2 <-> RP.1 @@ -27,6 +28,7 @@ Switch setup: [S1.ON2] C4.1 <-> R5.2 C4.2 <-> P5.2 D1.1 <-> R LED Current.2 + P1.1 <-> R LED Current.1 P2.1 <-> P3.1 P4.1 <-> P5.3 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2 P4.2 <-> P4.3 <-> R4.1 diff --git a/diylc-regression-data/reports/2022-11-24T09_15_02.796-V4_34_0.csv b/diylc-regression-data/reports/2022-11-24T09_15_02.796-V4_34_0.csv new file mode 100644 index 00000000..a3ec8b8d --- /dev/null +++ b/diylc-regression-data/reports/2022-11-24T09_15_02.796-V4_34_0.csv @@ -0,0 +1,17 @@ +OK,Failed,Total Time,Avg Time +0,12,19177,1598 + + +File,Status,Message,Time +IIc+.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,6469 +deacy.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,2198 +jfet boost.diy,FAILED,,0 +lp switch + pots.diy,FAILED,,0 +rangemaster.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,507 +ruby.diy,FAILED,Images do not match!,765 +slo2.diy,FAILED,Images do not match!,4531 +splitter2.diy,FAILED,,0 +standard strat.diy,FAILED,,0 +tda1521a-2.diy,FAILED,Images do not match!,1889 +timmy7.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,2818 +travelcaster3 (new format).diy,FAILED,,0 diff --git a/diylc-regression-data/reports/2022-11-24T18_36_18.401-V4_34_0.csv b/diylc-regression-data/reports/2022-11-24T18_36_18.401-V4_34_0.csv new file mode 100644 index 00000000..4cc09da3 --- /dev/null +++ b/diylc-regression-data/reports/2022-11-24T18_36_18.401-V4_34_0.csv @@ -0,0 +1,17 @@ +OK,Failed,Total Time,Avg Time +0,12,16479,1373 + + +File,Status,Message,Time +IIc+.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,5475 +deacy.diy,FAILED,Images do not match!,1728 +jfet boost.diy,FAILED,,0 +lp switch + pots.diy,FAILED,,0 +rangemaster.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,472 +ruby.diy,FAILED,Images do not match!,650 +slo2.diy,FAILED,Images do not match!,3770 +splitter2.diy,FAILED,,0 +standard strat.diy,FAILED,,0 +tda1521a-2.diy,FAILED,Images do not match!,1730 +timmy7.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,2654 +travelcaster3 (new format).diy,FAILED,,0 diff --git a/diylc-regression-data/reports/2022-11-24T22_39_10.235-V4_34_0.csv b/diylc-regression-data/reports/2022-11-24T22_39_10.235-V4_34_0.csv new file mode 100644 index 00000000..c2361456 --- /dev/null +++ b/diylc-regression-data/reports/2022-11-24T22_39_10.235-V4_34_0.csv @@ -0,0 +1,17 @@ +OK,Failed,Total Time,Avg Time +0,12,3581,298 + + +File,Status,Message,Time +IIc+.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,3310 +deacy.diy,FAILED,,0 +jfet boost.diy,FAILED,,0 +lp switch + pots.diy,FAILED,,0 +rangemaster.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,271 +ruby.diy,FAILED,,0 +slo2.diy,FAILED,,0 +splitter2.diy,FAILED,,0 +standard strat.diy,FAILED,,0 +tda1521a-2.diy,FAILED,,0 +timmy7.diy,FAILED,,0 +travelcaster3 (new format).diy,FAILED,,0 diff --git a/diylc-regression-data/reports/2022-11-25T18_16_59.104-V4_34_0.csv b/diylc-regression-data/reports/2022-11-25T18_16_59.104-V4_34_0.csv new file mode 100644 index 00000000..2a816eb6 --- /dev/null +++ b/diylc-regression-data/reports/2022-11-25T18_16_59.104-V4_34_0.csv @@ -0,0 +1,17 @@ +OK,Failed,Total Time,Avg Time +0,12,5266,438 + + +File,Status,Message,Time +IIc+.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,3229 +deacy.diy,FAILED,,0 +jfet boost.diy,FAILED,,0 +lp switch + pots.diy,FAILED,,0 +rangemaster.diy,FAILED,,0 +ruby.diy,FAILED,,0 +slo2.diy,FAILED,,0 +splitter2.diy,FAILED,,0 +standard strat.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,2037 +tda1521a-2.diy,FAILED,,0 +timmy7.diy,FAILED,,0 +travelcaster3 (new format).diy,FAILED,,0 diff --git a/diylc-regression-data/reports/2022-11-25T18_41_03.886-V4_34_0.csv b/diylc-regression-data/reports/2022-11-25T18_41_03.886-V4_34_0.csv new file mode 100644 index 00000000..01de2371 --- /dev/null +++ b/diylc-regression-data/reports/2022-11-25T18_41_03.886-V4_34_0.csv @@ -0,0 +1,17 @@ +OK,Failed,Total Time,Avg Time +0,12,13096,1091 + + +File,Status,Message,Time +IIc+.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,3227 +deacy.diy,FAILED,,0 +jfet boost.diy,FAILED,,0 +lp switch + pots.diy,FAILED,,0 +rangemaster.diy,FAILED,,0 +ruby.diy,FAILED,,0 +slo2.diy,FAILED,,0 +splitter2.diy,FAILED,,0 +standard strat.diy,FAILED,Images do not match!,9869 +tda1521a-2.diy,FAILED,,0 +timmy7.diy,FAILED,,0 +travelcaster3 (new format).diy,FAILED,,0 diff --git a/diylc-regression-data/reports/2022-11-25T18_45_37.094-V4_34_0.csv b/diylc-regression-data/reports/2022-11-25T18_45_37.094-V4_34_0.csv new file mode 100644 index 00000000..64a31350 --- /dev/null +++ b/diylc-regression-data/reports/2022-11-25T18_45_37.094-V4_34_0.csv @@ -0,0 +1,17 @@ +OK,Failed,Total Time,Avg Time +10,2,24506,2042 + + +File,Status,Message,Time +IIc+.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,3858 +deacy.diy,OK,,1116 +jfet boost.diy,OK,,165 +lp switch + pots.diy,OK,,1928 +rangemaster.diy,OK,,266 +ruby.diy,OK,,397 +slo2.diy,OK,,2281 +splitter2.diy,OK,,1486 +standard strat.diy,FAILED,Images do not match!,10001 +tda1521a-2.diy,OK,,907 +timmy7.diy,OK,,1479 +travelcaster3 (new format).diy,OK,,622 diff --git a/diylc/diylc-core/src/org/diylc/netlist/NetlistBuilder.java b/diylc/diylc-core/src/org/diylc/netlist/NetlistBuilder.java index 3fe7feaa..6acfa74e 100644 --- a/diylc/diylc-core/src/org/diylc/netlist/NetlistBuilder.java +++ b/diylc/diylc-core/src/org/diylc/netlist/NetlistBuilder.java @@ -353,7 +353,7 @@ public class NetlistBuilder { areaTree.search(area.getArea()).stream().filter(graphNode -> { if (graphNode.getArea() != null && graphNode.getArea() != area - && graphNode.getArea().getLayerId() == area.getLayerId()) { + && (graphNode.getArea().getLayerId() == 0 || area.getLayerId() == 0 || graphNode.getArea().getLayerId() == area.getLayerId())) { Area a = new Area(graphNode.getArea().getArea()); a.intersect(area.getArea()); return !a.isEmpty(); @@ -366,8 +366,7 @@ public class NetlistBuilder { areaTree.insert(area.getArea(), areaNode); } - for (Map.Entry> entry : nodeMapByPoint.entrySet()) { - + for (Map.Entry> entry : nodeMapByPoint.entrySet()) { final Point2D point = entry.getKey(); List candidateAreaNodes = areaTree.search(point, eps).stream() @@ -381,16 +380,20 @@ public class NetlistBuilder { for (ProjectGraphNode pointNode : entry.getValue()) { - List areaNodesBelowPoint = candidateAreaNodes.stream() - .filter(x -> x.getArea().getZIndex() <= pointNode.getZIndex()) - .sorted(Comparator.comparing(x -> x.getArea().getZIndex(), Comparator.reverseOrder())) - .collect(Collectors.toList()); +// List areaNodes = candidateAreaNodes.stream() +// .filter(x -> x.getArea().getZIndex() <= pointNode.getZIndex()) +//// .sorted(Comparator.comparing(x -> x.getArea().getZIndex(), Comparator.reverseOrder())) +// .collect(Collectors.toList()); - if (areaNodesBelowPoint.isEmpty()) { - builder.putEdge(pointNode, candidateAreaNodes.get(0)); - } else { - builder.putEdge(pointNode, areaNodesBelowPoint.get(0)); + for (ProjectGraphNode areaNode : candidateAreaNodes) { + builder.putEdge(pointNode, areaNode); } + +// if (areaNodesBelowPoint.isEmpty()) { +// builder.putEdge(pointNode, candidateAreaNodes.get(0)); +// } else { +// builder.putEdge(pointNode, areaNodesBelowPoint.get(0)); +// } } } diff --git a/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java b/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java index f00b1940..7a0f6550 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java +++ b/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java @@ -720,7 +720,7 @@ public class DrawingManager { if (component instanceof ILayer) { layerId = ((ILayer)component).getLayerId(); } else { - layerId = component.hashCode(); + layerId = 0; } Collection positiveAreas = a.getContinuityPositiveAreas(); diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 0e82d8a7..a5668f5f 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -4190,6 +4190,10 @@ IMPROVEMENT Circuit analysis algorithm that supports netlist extraction, 'Highlight connected Areas' and 'Guitar Wiring Analyzer' features improved to take PCB trace layer and component z-order into account for better accuracy + + IMPROVEMENT + Potentiometer bodies are no longer considered as conductive surfaces to avoid unwanted shorts + BUG_FIX Do not apply any user-default property values when creating a standard datasheet model (e.g. a capacitor) diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index c667c737..8cebd825 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java index 5cf87a44..f6a9a8cf 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java @@ -40,6 +40,7 @@ import org.diylc.components.transform.MiniToggleSwitchTransformer; import org.diylc.core.ComponentState; import org.diylc.core.IDIYComponent; import org.diylc.core.IDrawingObserver; +import org.diylc.core.ILayer; import org.diylc.core.ISwitch; import org.diylc.core.Project; import org.diylc.core.Theme; @@ -54,7 +55,7 @@ import org.diylc.utils.Constants; @ComponentDescriptor(name = "Mini Toggle Switch", category = "Electro-Mechanical", author = "Branislav Stojkovic", description = "Panel mounted mini toggle switch", zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "SW", autoEdit = false, enableCache = true, transformer = MiniToggleSwitchTransformer.class) -public class MiniToggleSwitch extends AbstractTransparentComponent implements ISwitch { +public class MiniToggleSwitch extends AbstractTransparentComponent implements ISwitch, ILayer { private static final long serialVersionUID = 1L; @@ -309,10 +310,10 @@ public class MiniToggleSwitch extends AbstractTransparentComponent= 3 && i <= 6) - drawingObserver.startTrackingContinuityArea(true); +// if (i >= 3 && i <= 6) +// drawingObserver.startTrackingContinuityArea(true); g2d.fill(shape); - if (i >= 3 && i <= 6) - drawingObserver.stopTrackingContinuityArea(); +// if (i >= 3 && i <= 6) +// drawingObserver.stopTrackingContinuityArea(); } g2d.setComposite(oldComposite); Color finalBorderColor; @@ -502,6 +503,11 @@ public class PotentiometerPanel extends AbstractPotentiometer { @Override public boolean canPointMoveFreely(int pointIndex) { return false; + } + + @Override + public int getLayerId() { + return hashCode(); } public enum Type { diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index c667c737..8cebd825 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 4302820b..f2801c32 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ diff --git a/diylc/diylc-swing/test/org/diylc/RegressionTestRunner.java b/diylc/diylc-swing/test/org/diylc/RegressionTestRunner.java index d6df47b8..a4325e39 100644 --- a/diylc/diylc-swing/test/org/diylc/RegressionTestRunner.java +++ b/diylc/diylc-swing/test/org/diylc/RegressionTestRunner.java @@ -65,8 +65,6 @@ public class RegressionTestRunner { List collect = visit(inputsDir, basePath, command, filter).collect(Collectors.toList()); - - try { if ("TEST".equalsIgnoreCase(command)) { createReport(collect, basePath); @@ -451,6 +449,7 @@ public class RegressionTestRunner { public RegressionTestResult(String fileName) { this.fileName = fileName; startTime = System.currentTimeMillis(); + ok = true; } public RegressionTestResult succedded() {