Potentiometer bodies are no longer considered as conductive surfaces to avoid unwanted shorts

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

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

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

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
 

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
 

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

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

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

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