Copper keeps its 'Layer' property in the editor, the term PCB tools use for copper, while still counting as a Board Side component in code

# Conflicts:
#	diylc/diylc-core/src/main/resources/update.xml

diylc-regression-data/input/cloud/netlist/562_incl_switches.txt

@@ -1,39 +1,3 @@
-Switch setup: [ 3-Way-Switch.Middle:Push Pull.ON1:Rhythm Circuit.ON1 ]
-
-	Bridge.South Finish <-> Lead Tone.1 <-> Lead Volume.3 <-> Neck.North Finish
-	Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1
-	Lead Tone Cap.1 <-> Lead Tone.2
-	Lead Volume.2 <-> Output.Tip
-	RC Tone Cap.2 <-> RC Tone.2
-	RC Tone.1 <-> RC Volume.3
-
-Switch setup: [ 3-Way-Switch.Middle:Push Pull.ON1:Rhythm Circuit.ON2 ]
-
-	Bridge.South Finish <-> Neck.North Finish <-> RC Tone.1 <-> RC Volume.3
-	Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1
-	Lead Tone Cap.1 <-> Lead Tone.2
-	Lead Tone.1 <-> Lead Volume.3
-	Output.Tip <-> RC Volume.2
-	RC Tone Cap.2 <-> RC Tone.2
-
-Switch setup: [ 3-Way-Switch.Rhythm:Push Pull.ON1:Rhythm Circuit.ON1 ]
-
-	Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1
-	Lead Tone Cap.1 <-> Lead Tone.2
-	Lead Tone.1 <-> Lead Volume.3 <-> Neck.North Finish
-	Lead Volume.2 <-> Output.Tip
-	RC Tone Cap.2 <-> RC Tone.2
-	RC Tone.1 <-> RC Volume.3
-
-Switch setup: [ 3-Way-Switch.Rhythm:Push Pull.ON1:Rhythm Circuit.ON2 ]
-
-	Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1
-	Lead Tone Cap.1 <-> Lead Tone.2
-	Lead Tone.1 <-> Lead Volume.3
-	Neck.North Finish <-> RC Tone.1 <-> RC Volume.3
-	Output.Tip <-> RC Volume.2
-	RC Tone Cap.2 <-> RC Tone.2
-
 Switch setup: [ 3-Way-Switch.Treble:Push Pull.ON1:Rhythm Circuit.ON1 ]
 
 	Bridge.South Finish <-> Lead Tone.1 <-> Lead Volume.3
@@ -72,3 +36,39 @@ Switch setup: [ Push Pull.ON2:Rhythm Circuit.ON2 ]
 	Output.Tip <-> RC Volume.2
 	RC Tone Cap.2 <-> RC Tone.2
 
+Switch setup: [ 3-Way-Switch.Middle:Push Pull.ON1:Rhythm Circuit.ON1 ]
+
+	Bridge.South Finish <-> Lead Tone.1 <-> Lead Volume.3 <-> Neck.North Finish
+	Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1
+	Lead Tone Cap.1 <-> Lead Tone.2
+	Lead Volume.2 <-> Output.Tip
+	RC Tone Cap.2 <-> RC Tone.2
+	RC Tone.1 <-> RC Volume.3
+
+Switch setup: [ 3-Way-Switch.Middle:Push Pull.ON1:Rhythm Circuit.ON2 ]
+
+	Bridge.South Finish <-> Neck.North Finish <-> RC Tone.1 <-> RC Volume.3
+	Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1
+	Lead Tone Cap.1 <-> Lead Tone.2
+	Lead Tone.1 <-> Lead Volume.3
+	Output.Tip <-> RC Volume.2
+	RC Tone Cap.2 <-> RC Tone.2
+
+Switch setup: [ 3-Way-Switch.Rhythm:Push Pull.ON1:Rhythm Circuit.ON1 ]
+
+	Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1
+	Lead Tone Cap.1 <-> Lead Tone.2
+	Lead Tone.1 <-> Lead Volume.3 <-> Neck.North Finish
+	Lead Volume.2 <-> Output.Tip
+	RC Tone Cap.2 <-> RC Tone.2
+	RC Tone.1 <-> RC Volume.3
+
+Switch setup: [ 3-Way-Switch.Rhythm:Push Pull.ON1:Rhythm Circuit.ON2 ]
+
+	Bridge.South Start <-> GND <-> Lead Tone Cap.2 <-> Lead Volume.1 <-> Neck.North Start <-> Output.Sleeve <-> RC Tone Cap.1 <-> RC Volume.1
+	Lead Tone Cap.1 <-> Lead Tone.2
+	Lead Tone.1 <-> Lead Volume.3
+	Neck.North Finish <-> RC Tone.1 <-> RC Volume.3
+	Output.Tip <-> RC Volume.2
+	RC Tone Cap.2 <-> RC Tone.2
+

diylc-regression-data/input/diy-fever/netlist/lp switch + pots_incl_switches.txt

@@ -1,3 +1,20 @@
+Switch setup: [ SW1.Treble:SW2.ON1 ]
+
+	Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1
+	Bucker.South Start <-> VR1.3
+	C1.1 <-> VR3.2
+	J1.Tip <-> VR1.2 <-> VR3.1
+	Single.North Finish <-> VR2.3
+
+Switch setup: [ SW1.Treble:SW2.ON2 ]
+
+	Bucker.North Finish <-> Bucker.South Finish
+	Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1
+	Bucker.South Start <-> VR1.3
+	C1.1 <-> VR3.2
+	J1.Tip <-> VR1.2 <-> VR3.1
+	Single.North Finish <-> VR2.3
+
 Switch setup: [ SW1.Middle:SW2.ON1 ]
 
 	Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1
@@ -32,20 +49,3 @@ Switch setup: [ SW1.Rhythm:SW2.ON2 ]
 	J1.Tip <-> VR2.2 <-> VR3.1
 	Single.North Finish <-> VR2.3
 
-Switch setup: [ SW1.Treble:SW2.ON1 ]
-
-	Bucker.North Finish <-> Bucker.North Start <-> Bucker.South Finish <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1
-	Bucker.South Start <-> VR1.3
-	C1.1 <-> VR3.2
-	J1.Tip <-> VR1.2 <-> VR3.1
-	Single.North Finish <-> VR2.3
-
-Switch setup: [ SW1.Treble:SW2.ON2 ]
-
-	Bucker.North Finish <-> Bucker.South Finish
-	Bucker.North Start <-> C1.2 <-> J1.Sleeve <-> Single.North Start <-> VR1.1 <-> VR2.1
-	Bucker.South Start <-> VR1.3
-	C1.1 <-> VR3.2
-	J1.Tip <-> VR1.2 <-> VR3.1
-	Single.North Finish <-> VR2.3
-

diylc-regression-data/input/diy-fever/netlist/splitter2_excl_switches.txt

@@ -1,7 +1,7 @@
 Switch setup: [ ALL ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> SW1.1

diylc-regression-data/input/diy-fever/netlist/splitter2_incl_switches.txt

@@ -1,7 +1,7 @@
 Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> J4.Tip
@@ -16,7 +16,54 @@ Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1 ]
 Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> J4.Tip
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	J2.Sleeve <-> L4.2
+	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
+	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
+
+Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> J4.Tip
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	Impedance.2 <-> J2.Tip
+	J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1
+	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
+	L4.2 <-> Level.3
+
+Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> J4.Tip
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	Impedance.2 <-> J2.Sleeve
+	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
+	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
+	L4.2 <-> Level.3
+
+Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> TL072.1 <-> TL072.2
@@ -27,136 +74,125 @@ Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2 ]
 	J2.Tip <-> L4.2
 	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
 
-Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> J4.Tip
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	J2.Tip <-> L4.2
-	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-
-Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	J2.Tip <-> L4.2
-	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
-
-Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> J4.Tip
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1
-	J2.Tip <-> L7.2
-	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-
 Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1
+	J2.Sleeve <-> L4.2
-	J2.Tip <-> L7.2
+	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
 	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
 
 Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> J4.Tip
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	J2.Tip <-> L7.2
-	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-
-Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	J2.Tip <-> L7.2
-	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
-
-Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
 	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	J2.Sleeve <-> L4.2
+	Impedance.2 <-> J2.Tip
+	J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1
+	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+	L4.2 <-> Level.3
+
+Switch setup: [ SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	Impedance.2 <-> J2.Sleeve
 	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
+	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+	L4.2 <-> Level.3
+
+Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> J4.Tip
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	J2.Tip <-> L4.2
 	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
 
 Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	J2.Sleeve <-> L4.2
 	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
-	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
 
 Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
+	Impedance.2 <-> J2.Tip
 	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
+	L4.2 <-> Level.3
 
 Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> J4.Tip
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
+	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
+	L4.2 <-> Level.3
+
+Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	J2.Tip <-> L4.2
+	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+
+Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> TL072.1 <-> TL072.2
@@ -166,142 +202,128 @@ Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2 ]
 	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
 	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
 
-Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> J4.Tip
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	J2.Sleeve <-> L7.2
-	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
-	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-
-Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	J2.Sleeve <-> L7.2
-	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
-	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
-
 Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
+	Impedance.2 <-> J2.Tip
-	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
+	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+	L4.2 <-> Level.3
 
 Switch setup: [ SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
 	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
 	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+	L4.2 <-> Level.3
 
 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON1 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Tip
 	J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1
+	J2.Tip <-> L7.2
 	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-	L4.2 <-> Level.3
 
 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Tip
+	J2.Sleeve <-> L7.2
-	J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1
+	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
-	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-	L4.2 <-> Level.3
 
 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON1 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
 	Impedance.2 <-> J2.Tip
+	J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1
 	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-	L4.2 <-> Level.3
+	L7.2 <-> Level.3
 
 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> L4.1 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Tip
+	Impedance.2 <-> J2.Sleeve
-	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
-	L4.2 <-> Level.3
+	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
+	L7.2 <-> Level.3
 
 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON1 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
 	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Tip
 	J2.Sleeve <-> L4.1 <-> L7.1 <-> Level.1
-	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
+	J2.Tip <-> L7.2
-	L7.2 <-> Level.3
+	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
 
 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	J2.Sleeve <-> L7.2
+	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
+	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+
+Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> TL072.1 <-> TL072.2
@@ -313,130 +335,68 @@ Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1:SW1.ON2 ]
 	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
 	L7.2 <-> Level.3
 
-Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON1 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> J4.Tip
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Tip
-	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-	L7.2 <-> Level.3
-
 Switch setup: [ SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Tip
+	Impedance.2 <-> J2.Sleeve
+	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
 	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
 	L7.2 <-> Level.3
 
 Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON1 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Sleeve
+	J2.Tip <-> L7.2
-	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
 	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-	L4.2 <-> Level.3
 
 Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Sleeve
 	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
-	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-	L4.2 <-> Level.3
 
 Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON1 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> J4.Tip
 	C1.2 <-> TL072.1 <-> TL072.2
 	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
 	Impedance.1 <-> Level.2
-	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
+	Impedance.2 <-> J2.Tip
 	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-	L4.2 <-> Level.3
+	L7.2 <-> Level.3
 
 Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> Impedance.2 <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L3.2 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
-	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
-	L4.2 <-> Level.3
-
-Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> J4.Tip
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Sleeve
-	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
-	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
-	L7.2 <-> Level.3
-
-Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
-	C1.1 <-> R1.1 <-> R1.1
-	C1.1 <-> R1.1 <-> TL072.3
-	C1.2 <-> TL072.1 <-> TL072.2
-	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
-	C2.- <-> C2.- <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> R1.1 <-> R1.2 <-> TL072.4
-	Impedance.1 <-> Level.2
-	Impedance.2 <-> J2.Sleeve
-	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
-	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
-	L7.2 <-> Level.3
-
-Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ]
-
-	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> J4.Tip
@@ -448,10 +408,50 @@ Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ]
 	J5.Tip <-> L3.1 <-> L6.1 <-> R1.2
 	L7.2 <-> Level.3
 
+Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON1 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	J2.Tip <-> L7.2
+	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+
+Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1:SW1.ON2 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L6.2 <-> L7.2 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	J2.Tip <-> L4.1 <-> L7.1 <-> Level.1
+	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+
+Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON1 ]
+
+	4001.A <-> C2.+ <-> J6.Sleeve
+	4001.K <-> R1.1 <-> TL072.8
+	C1.1 <-> R1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> TL072.3
+	C1.2 <-> TL072.1 <-> TL072.2
+	C2.+ <-> R1.2 <-> R1.2 <-> R1.2
+	C2.- <-> C2.- <-> J2.Sleeve <-> J4.Sleeve <-> J5.Sleeve <-> J6.Center <-> L4.1 <-> L6.2 <-> L7.1 <-> Level.1 <-> R1.1 <-> R1.2 <-> TL072.4
+	Impedance.1 <-> Level.2
+	Impedance.2 <-> J2.Tip
+	J4.Tip <-> J5.Tip <-> L3.1 <-> L6.1
+	L7.2 <-> Level.3
+
 Switch setup: [ SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2:SW1.ON2 ]
 
 	4001.A <-> C2.+ <-> J6.Sleeve
-	4001.K <-> R1.1 <-> TL072.5
+	4001.K <-> R1.1 <-> TL072.8
 	C1.1 <-> R1.1 <-> R1.1
 	C1.1 <-> R1.1 <-> TL072.3
 	C1.2 <-> TL072.1 <-> TL072.2

diylc-regression-data/input/diy-fever/netlist/travelcaster3 (new format)_incl_switches.txt

@@ -1,3 +1,12 @@
+Switch setup: [ Split.ON1:SW1.Treble ]
+
+	Bridge.North Finish <-> Bridge.South Finish
+	Bridge.North Start <-> Cbleed.1 <-> Volume.3
+	Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.1
+	Cbleed.2 <-> Rbleed.2
+	J1.Tip <-> Rbleed.1 <-> Volume.2
+	Neck.North Start <-> Neck.South Start
+
 Switch setup: [ Split.ON1:SW1.Middle ]
 
 	Bridge.North Finish <-> Bridge.South Finish
@@ -16,14 +25,12 @@ Switch setup: [ Split.ON1:SW1.Rhythm ]
 	J1.Tip <-> Rbleed.1 <-> Volume.2
 	Neck.North Start <-> Neck.South Start
 
-Switch setup: [ Split.ON1:SW1.Treble ]
+Switch setup: [ Split.ON2:SW1.Treble ]
 
-	Bridge.North Finish <-> Bridge.South Finish
+	Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.1
 	Bridge.North Start <-> Cbleed.1 <-> Volume.3
-	Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Volume.1
 	Cbleed.2 <-> Rbleed.2
 	J1.Tip <-> Rbleed.1 <-> Volume.2
-	Neck.North Start <-> Neck.South Start
 
 Switch setup: [ Split.ON2:SW1.Middle ]
 
@@ -39,10 +46,3 @@ Switch setup: [ Split.ON2:SW1.Rhythm ]
 	Cbleed.2 <-> Rbleed.2
 	J1.Tip <-> Rbleed.1 <-> Volume.2
 
-Switch setup: [ Split.ON2:SW1.Treble ]
-
-	Bridge.North Finish <-> Bridge.South Finish <-> Bridge.South Start <-> J1.Sleeve <-> Neck.North Finish <-> Neck.North Start <-> Neck.South Start <-> Volume.1
-	Bridge.North Start <-> Cbleed.1 <-> Volume.3
-	Cbleed.2 <-> Rbleed.2
-	J1.Tip <-> Rbleed.1 <-> Volume.2
-

diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_incl_switches.txt

@@ -1,3 +1,173 @@
+Switch setup: [ SW1.ON1:SW6.ON1 ]
+
+	.047 uF.1 <-> J1.Tip
+	.047 uF.2 <-> 1 M.2 <-> R1.2
+	.1 <-> R2.1
+	.2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> CP RY.Coil1 <-> D11.K <-> D12.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.Sleeve <-> J1.Tip Switch <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.COM2 <-> RY1.NC2 <-> RY1.NO2 <-> RY2.COM2 <-> RY2.NC2 <-> RY2.NO2
+	.A <-> C31.- <-> R42.2
+	.K <-> R54.1
+	1N4007.K <-> C8.1 <-> D7.A <-> R15.2
+	BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2
+	BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2
+	C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9
+	C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6
+	C10.2 <-> DUAL BASS 2--LEAD.3
+	C11.1 <-> C14.2 <-> R23.2
+	C11.2 <-> R22.2
+	C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1
+	C13.2 <-> C21.1 <-> TREBLE-LEAD.3
+	C14.1 <-> MIDDLE-LEAD.2
+	C15.2 <-> DUAL BASS-CLEAN.3
+	C16.1 <-> C19.2 <-> R26.2
+	C16.2 <-> R25.2
+	C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1
+	C18.2 <-> C23.1 <-> TREBLE-CLEAN.3
+	C19.1 <-> MIDDLE--CLEAN.2
+	C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1
+	C21.2 <-> MIDDLE-LEAD.3
+	C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1
+	C23.2 <-> MIDDLE--CLEAN.3
+	C24.1 <-> MASTER VOL.2
+	C24.2 <-> R30.2
+	C25.1 <-> R32.2 <-> V3.7
+	C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1
+	C26.1 <-> R36.2
+	C26.2 <-> C28.1 <-> R34.1
+	C27.1 <-> R37.2
+	C27.2 <-> C28.2 <-> R35.1
+	C29.1 <-> PRESENCE.2
+	C29.2 <-> PRESENCE.1
+	C3.1 <-> R8.2 <-> R9.2
+	C3.2 <-> C4.2 <-> R5.2 <-> V1.6
+	C30.+ <-> C31.+ <-> C33.- <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5
+	C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2
+	C32.+1 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2
+	C32.+2 <-> R41.1 <-> R48.1 <-> V6.6
+	C32.- <-> J29.J29Sleeve
+	C33.+1 <-> C33.+2 <-> D6.K <-> D8.K <-> FH2.1
+	C34.2 <-> C5.2 <-> R6.1 <-> RY1.COM1
+	C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3
+	C4.1 <-> C7.+1 <-> C7.+2 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7
+	C7.- <-> J59.J59Sleeve
+	C9.1 <-> R18.1
+	C9.2 <-> R17.1 <-> R20.1 <-> V2.7
+	CLEAN GAIN.2 <-> RY1.NC1
+	D1.A <-> D3.K <-> D4.K <-> D5.A
+	D1.K <-> D2.A
+	D10.K <-> D6.A
+	D12.A <-> R39.2
+	D8.A <-> D9.K
+	DUAL BASS 2--LEAD.1 <-> R24.1
+	DUAL BASS-CLEAN.1 <-> R27.1
+	FEEDBACK (NFB).1 <-> R38.2
+	FH1.1 <-> IEC1.Neutral
+	IEC1.Earth <-> J32.J32Sleeve
+	J36.J36Sleeve <-> J60.Sleeve <-> J61.Sleeve <-> V5.8
+	J38.J38Sleeve <-> V7.1 <-> V7.8
+	J60.Tip <-> J61.Tip
+	LEAD GAIN.2 <-> RY1.NO1
+	LEAD VOL.2 <-> R16.1
+	R13.2 <-> R14.1
+	R14.2 <-> R15.1 <-> R16.2 <-> R17.2
+	R30.1 <-> R31.1 <-> R32.1 <-> R33.1
+	R31.2 <-> V3.8
+	R46.1 <-> R47.1
+	R46.2 <-> V4.4
+	R47.2 <-> V5.4
+	R48.2 <-> V6.4
+	R50.2 <-> R51.2
+	R51.1 <-> V4.5
+	R52.1 <-> V6.5
+	R52.2 <-> R53.2
+	RY2.NO1 <-> TREBLE-LEAD.2
+	V4.3 <-> V5.3
+	V6.3 <-> V7.3
+
+Switch setup: [ SW1.ON1:SW6.ON2 ]
+
+	.047 uF.1 <-> J1.Tip
+	.047 uF.2 <-> 1 M.2 <-> R1.2
+	.1 <-> R2.1
+	.2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C34.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> CP RY.Coil1 <-> D11.K <-> D12.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.Sleeve <-> J1.Tip Switch <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.COM2 <-> RY1.NC2 <-> RY1.NO2 <-> RY2.COM2 <-> RY2.NC2 <-> RY2.NO2
+	.A <-> C31.- <-> R42.2
+	.K <-> R54.1
+	1N4007.K <-> C8.1 <-> D7.A <-> R15.2
+	BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2
+	BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2
+	C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9
+	C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6
+	C10.2 <-> DUAL BASS 2--LEAD.3
+	C11.1 <-> C14.2 <-> R23.2
+	C11.2 <-> R22.2
+	C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1
+	C13.2 <-> C21.1 <-> TREBLE-LEAD.3
+	C14.1 <-> MIDDLE-LEAD.2
+	C15.2 <-> DUAL BASS-CLEAN.3
+	C16.1 <-> C19.2 <-> R26.2
+	C16.2 <-> R25.2
+	C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1
+	C18.2 <-> C23.1 <-> TREBLE-CLEAN.3
+	C19.1 <-> MIDDLE--CLEAN.2
+	C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1
+	C21.2 <-> MIDDLE-LEAD.3
+	C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1
+	C23.2 <-> MIDDLE--CLEAN.3
+	C24.1 <-> MASTER VOL.2
+	C24.2 <-> R30.2
+	C25.1 <-> R32.2 <-> V3.7
+	C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1
+	C26.1 <-> R36.2
+	C26.2 <-> C28.1 <-> R34.1
+	C27.1 <-> R37.2
+	C27.2 <-> C28.2 <-> R35.1
+	C29.1 <-> PRESENCE.2
+	C29.2 <-> PRESENCE.1
+	C3.1 <-> R8.2 <-> R9.2
+	C3.2 <-> C4.2 <-> R5.2 <-> V1.6
+	C30.+ <-> C31.+ <-> C33.- <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5
+	C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2
+	C32.+1 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2
+	C32.+2 <-> R41.1 <-> R48.1 <-> V6.6
+	C32.- <-> J29.J29Sleeve
+	C33.+1 <-> C33.+2 <-> D6.K <-> D8.K <-> FH2.1
+	C34.2 <-> C5.2 <-> R6.1 <-> RY1.COM1
+	C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3
+	C4.1 <-> C7.+1 <-> C7.+2 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7
+	C7.- <-> J59.J59Sleeve
+	C9.1 <-> R18.1
+	C9.2 <-> R17.1 <-> R20.1 <-> V2.7
+	CLEAN GAIN.2 <-> RY1.NC1
+	D1.A <-> D3.K <-> D4.K <-> D5.A
+	D1.K <-> D2.A
+	D10.K <-> D6.A
+	D12.A <-> R39.2
+	D8.A <-> D9.K
+	DUAL BASS 2--LEAD.1 <-> R24.1
+	DUAL BASS-CLEAN.1 <-> R27.1
+	FEEDBACK (NFB).1 <-> R38.2
+	FH1.1 <-> IEC1.Neutral
+	IEC1.Earth <-> J32.J32Sleeve
+	J36.J36Sleeve <-> J60.Sleeve <-> J61.Sleeve <-> V5.8
+	J38.J38Sleeve <-> V7.1 <-> V7.8
+	J60.Tip <-> J61.Tip
+	LEAD GAIN.2 <-> RY1.NO1
+	LEAD VOL.2 <-> R16.1
+	R13.2 <-> R14.1
+	R14.2 <-> R15.1 <-> R16.2 <-> R17.2
+	R30.1 <-> R31.1 <-> R32.1 <-> R33.1
+	R31.2 <-> V3.8
+	R46.1 <-> R47.1
+	R46.2 <-> V4.4
+	R47.2 <-> V5.4
+	R48.2 <-> V6.4
+	R50.2 <-> R51.2
+	R51.1 <-> V4.5
+	R52.1 <-> V6.5
+	R52.2 <-> R53.2
+	RY2.NO1 <-> TREBLE-LEAD.2
+	V4.3 <-> V5.3
+	V6.3 <-> V7.3
+
 Switch setup: [ SW1.OFF:SW6.ON1, SW1.ON2:SW6.ON1 ]
 
 	.047 uF.1 <-> J1.Tip
@@ -170,173 +340,3 @@ Switch setup: [ SW1.OFF:SW6.ON2,SW1.ON2:SW6.ON2 ]
 	V4.3 <-> V5.3
 	V6.3 <-> V7.3
 
-Switch setup: [ SW1.ON1:SW6.ON1 ]
-
-	.047 uF.1 <-> J1.Tip
-	.047 uF.2 <-> 1 M.2 <-> R1.2
-	.1 <-> R2.1
-	.2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> CP RY.Coil1 <-> D11.K <-> D12.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.Sleeve <-> J1.Tip Switch <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.COM2 <-> RY1.NC2 <-> RY1.NO2 <-> RY2.COM2 <-> RY2.NC2 <-> RY2.NO2
-	.A <-> C31.- <-> R42.2
-	.K <-> R54.1
-	1N4007.K <-> C8.1 <-> D7.A <-> R15.2
-	BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2
-	BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2
-	C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9
-	C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6
-	C10.2 <-> DUAL BASS 2--LEAD.3
-	C11.1 <-> C14.2 <-> R23.2
-	C11.2 <-> R22.2
-	C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1
-	C13.2 <-> C21.1 <-> TREBLE-LEAD.3
-	C14.1 <-> MIDDLE-LEAD.2
-	C15.2 <-> DUAL BASS-CLEAN.3
-	C16.1 <-> C19.2 <-> R26.2
-	C16.2 <-> R25.2
-	C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1
-	C18.2 <-> C23.1 <-> TREBLE-CLEAN.3
-	C19.1 <-> MIDDLE--CLEAN.2
-	C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1
-	C21.2 <-> MIDDLE-LEAD.3
-	C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1
-	C23.2 <-> MIDDLE--CLEAN.3
-	C24.1 <-> MASTER VOL.2
-	C24.2 <-> R30.2
-	C25.1 <-> R32.2 <-> V3.7
-	C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1
-	C26.1 <-> R36.2
-	C26.2 <-> C28.1 <-> R34.1
-	C27.1 <-> R37.2
-	C27.2 <-> C28.2 <-> R35.1
-	C29.1 <-> PRESENCE.2
-	C29.2 <-> PRESENCE.1
-	C3.1 <-> R8.2 <-> R9.2
-	C3.2 <-> C4.2 <-> R5.2 <-> V1.6
-	C30.+ <-> C31.+ <-> C33.- <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5
-	C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2
-	C32.+1 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2
-	C32.+2 <-> R41.1 <-> R48.1 <-> V6.6
-	C32.- <-> J29.J29Sleeve
-	C33.+1 <-> C33.+2 <-> D6.K <-> D8.K <-> FH2.1
-	C34.2 <-> C5.2 <-> R6.1 <-> RY1.COM1
-	C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3
-	C4.1 <-> C7.+1 <-> C7.+2 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7
-	C7.- <-> J59.J59Sleeve
-	C9.1 <-> R18.1
-	C9.2 <-> R17.1 <-> R20.1 <-> V2.7
-	CLEAN GAIN.2 <-> RY1.NC1
-	D1.A <-> D3.K <-> D4.K <-> D5.A
-	D1.K <-> D2.A
-	D10.K <-> D6.A
-	D12.A <-> R39.2
-	D8.A <-> D9.K
-	DUAL BASS 2--LEAD.1 <-> R24.1
-	DUAL BASS-CLEAN.1 <-> R27.1
-	FEEDBACK (NFB).1 <-> R38.2
-	FH1.1 <-> IEC1.Neutral
-	IEC1.Earth <-> J32.J32Sleeve
-	J36.J36Sleeve <-> J60.Sleeve <-> J61.Sleeve <-> V5.8
-	J38.J38Sleeve <-> V7.1 <-> V7.8
-	J60.Tip <-> J61.Tip
-	LEAD GAIN.2 <-> RY1.NO1
-	LEAD VOL.2 <-> R16.1
-	R13.2 <-> R14.1
-	R14.2 <-> R15.1 <-> R16.2 <-> R17.2
-	R30.1 <-> R31.1 <-> R32.1 <-> R33.1
-	R31.2 <-> V3.8
-	R46.1 <-> R47.1
-	R46.2 <-> V4.4
-	R47.2 <-> V5.4
-	R48.2 <-> V6.4
-	R50.2 <-> R51.2
-	R51.1 <-> V4.5
-	R52.1 <-> V6.5
-	R52.2 <-> R53.2
-	RY2.NO1 <-> TREBLE-LEAD.2
-	V4.3 <-> V5.3
-	V6.3 <-> V7.3
-
-Switch setup: [ SW1.ON1:SW6.ON2 ]
-
-	.047 uF.1 <-> J1.Tip
-	.047 uF.2 <-> 1 M.2 <-> R1.2
-	.1 <-> R2.1
-	.2 <-> 1 M.1 <-> 1N4007.A <-> BASS-CLEAN.1 <-> BASS-LEAD.1 <-> C1.- <-> C2.1 <-> C20.2 <-> C34.1 <-> C6.1 <-> C6.2 <-> C8.2 <-> CLEAN GAIN.1 <-> CLEAN GAIN.3 <-> CP RY.Coil1 <-> D11.K <-> D12.K <-> D13.K <-> D2.K <-> D3.A <-> D4.A <-> D5.K <-> D7.K <-> J1.Sleeve <-> J1.Tip Switch <-> LEAD GAIN.1 <-> LEAD GAIN.3 <-> LEAD VOL.1 <-> LEAD VOL.3 <-> MASTER VOL.1 <-> MIDDLE--CLEAN.1 <-> MIDDLE-LEAD.1 <-> R11.1 <-> R12.1 <-> R2.2 <-> R20.2 <-> R21.2 <-> R24.2 <-> R27.2 <-> R3.2 <-> R39.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> RY1.COM2 <-> RY1.NC2 <-> RY1.NO2 <-> RY2.COM2 <-> RY2.NC2 <-> RY2.NO2
-	.A <-> C31.- <-> R42.2
-	.K <-> R54.1
-	1N4007.K <-> C8.1 <-> D7.A <-> R15.2
-	BASS-CLEAN.2 <-> BASS-CLEAN.3 <-> R29.2
-	BASS-LEAD.2 <-> BASS-LEAD.3 <-> R28.2
-	C1.+ <-> C2.2 <-> R3.1 <-> R4.1 <-> V1.8 <-> V1.9
-	C10.1 <-> C12.2 <-> C15.1 <-> C17.2 <-> R19.1 <-> V2.6
-	C10.2 <-> DUAL BASS 2--LEAD.3
-	C11.1 <-> C14.2 <-> R23.2
-	C11.2 <-> R22.2
-	C12.1 <-> C13.1 <-> DUAL BASS 2--LEAD.2 <-> R23.1
-	C13.2 <-> C21.1 <-> TREBLE-LEAD.3
-	C14.1 <-> MIDDLE-LEAD.2
-	C15.2 <-> DUAL BASS-CLEAN.3
-	C16.1 <-> C19.2 <-> R26.2
-	C16.2 <-> R25.2
-	C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1
-	C18.2 <-> C23.1 <-> TREBLE-CLEAN.3
-	C19.1 <-> MIDDLE--CLEAN.2
-	C20.1 <-> R22.1 <-> R28.1 <-> TREBLE-LEAD.1
-	C21.2 <-> MIDDLE-LEAD.3
-	C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1
-	C23.2 <-> MIDDLE--CLEAN.3
-	C24.1 <-> MASTER VOL.2
-	C24.2 <-> R30.2
-	C25.1 <-> R32.2 <-> V3.7
-	C25.2 <-> R33.2 <-> R38.1 <-> RESONANCE.1
-	C26.1 <-> R36.2
-	C26.2 <-> C28.1 <-> R34.1
-	C27.1 <-> R37.2
-	C27.2 <-> C28.2 <-> R35.1
-	C29.1 <-> PRESENCE.2
-	C29.2 <-> PRESENCE.1
-	C3.1 <-> R8.2 <-> R9.2
-	C3.2 <-> C4.2 <-> R5.2 <-> V1.6
-	C30.+ <-> C31.+ <-> C33.- <-> D10.A <-> D9.A <-> J30.J30Sleeve <-> R43.1 <-> V1.5
-	C30.- <-> R36.1 <-> R37.1 <-> R42.1 <-> R43.2
-	C32.+1 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2
-	C32.+2 <-> R41.1 <-> R48.1 <-> V6.6
-	C32.- <-> J29.J29Sleeve
-	C33.+1 <-> C33.+2 <-> D6.K <-> D8.K <-> FH2.1
-	C34.2 <-> C5.2 <-> R6.1 <-> RY1.COM1
-	C35.1 <-> PRESENCE.3 <-> RESONANCE.2 <-> RESONANCE.3
-	C4.1 <-> C7.+1 <-> C7.+2 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7
-	C7.- <-> J59.J59Sleeve
-	C9.1 <-> R18.1
-	C9.2 <-> R17.1 <-> R20.1 <-> V2.7
-	CLEAN GAIN.2 <-> RY1.NC1
-	D1.A <-> D3.K <-> D4.K <-> D5.A
-	D1.K <-> D2.A
-	D10.K <-> D6.A
-	D12.A <-> R39.2
-	D8.A <-> D9.K
-	DUAL BASS 2--LEAD.1 <-> R24.1
-	DUAL BASS-CLEAN.1 <-> R27.1
-	FEEDBACK (NFB).1 <-> R38.2
-	FH1.1 <-> IEC1.Neutral
-	IEC1.Earth <-> J32.J32Sleeve
-	J36.J36Sleeve <-> J60.Sleeve <-> J61.Sleeve <-> V5.8
-	J38.J38Sleeve <-> V7.1 <-> V7.8
-	J60.Tip <-> J61.Tip
-	LEAD GAIN.2 <-> RY1.NO1
-	LEAD VOL.2 <-> R16.1
-	R13.2 <-> R14.1
-	R14.2 <-> R15.1 <-> R16.2 <-> R17.2
-	R30.1 <-> R31.1 <-> R32.1 <-> R33.1
-	R31.2 <-> V3.8
-	R46.1 <-> R47.1
-	R46.2 <-> V4.4
-	R47.2 <-> V5.4
-	R48.2 <-> V6.4
-	R50.2 <-> R51.2
-	R51.1 <-> V4.5
-	R52.1 <-> V6.5
-	R52.2 <-> R53.2
-	RY2.NO1 <-> TREBLE-LEAD.2
-	V4.3 <-> V5.3
-	V6.3 <-> V7.3
-

diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt

@@ -13,7 +13,7 @@ Switch setup: [ ALL ]
 	100k.1 <-> 150p.1
 	100k.2 <-> 100k.2 <-> 22u 450v.+ <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2
 	100u 100v.+ <-> 270 3W.1
-	10k 2W.1 <-> 1k 2w.2 <-> 1k 2W.2 <-> L2.1
+	10k 2W.1 <-> 1k 2W.2 <-> 1k 2w.2 <-> L2.1
 	1k5.2 <-> 1k5.2
 	D1.K <-> D3.A
 	D2.K <-> D4.A

diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt

@@ -13,7 +13,7 @@ Switch setup: [ ALL ]
 	100k.1 <-> 150p.1
 	100k.2 <-> 100k.2 <-> 22u 450v.+ <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2
 	100u 100v.+ <-> 270 3W.1
-	10k 2W.1 <-> 1k 2w.2 <-> 1k 2W.2 <-> L2.1
+	10k 2W.1 <-> 1k 2W.2 <-> 1k 2w.2 <-> L2.1
 	1k5.2 <-> 1k5.2
 	D1.K <-> D3.A
 	D2.K <-> D4.A

diylc-regression-data/reports/2026-11-04T16_54_22.967621-V6_10_0.csv

@@ -0,0 +1,102 @@
+OK,Failed,Total Time,Avg Time
+38,59,278979,2876
+
+
+File,Status,Message,Time
+12v_supply.diy,OK,,3351
+211.diy,FAILED,Images do not match!,1890
+255.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,3323
+2555X BOARD LAYOUT RESaddTSRELAYnew.diy,FAILED,Images do not match!;Netlists do not match with switches,18596
+259.diy,FAILED,Images do not match!,3580
+291.diy,OK,,998
+315.diy,OK,,4401
+331.diy,FAILED,Images do not match!,1607
+360.diy,OK,,498
+367.diy,FAILED,Images do not match!,3097
+374.diy,FAILED,Images do not match!,2103
+414.diy,OK,,490
+419.diy,FAILED,Images do not match!,2224
+448.diy,OK,,1509
+451.diy,FAILED,Images do not match!,5089
+480.diy,OK,,893
+523.diy,OK,,1088
+537.diy,FAILED,Images do not match!,1706
+543.diy,FAILED,Images do not match!,1238
+546.diy,OK,,283
+548.diy,OK,,1104
+560.diy,OK,,1155
+562.diy,FAILED,Netlists do not match with switches,2258
+565.diy,OK,,1002
+578.diy,FAILED,Images do not match!,3484
+580.diy,FAILED,Images do not match!,3701
+581.diy,FAILED,Images do not match!,10362
+606.diy,FAILED,Images do not match!,2130
+610.diy,OK,,1311
+614.diy,OK,,982
+6Y6 Express 2.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,2895
+801.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,450
+9V_supply_regulated.diy,FAILED,Images do not match!,2301
+ALU board with interface.diy,OK,,1149
+AllTube Schem.diy,OK,,4021
+Blue 7.diy,OK,,257
+BrownfaceReverb Schematic 2.diy,OK,,1449
+Bus decoder board (RL,Z2,Z1,Z0).diy,FAILED,Images do not match!,4038
+DR18Tagstrip.diy,FAILED,Images do not match!,7686
+Deluxe_Micro_EF80_Layout.diy,FAILED,Images do not match!,4101
+Fender_Bassman_5F6_5F6A.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,544
+IIc+.diy,FAILED,Images do not match!,2567
+Ibanez Balance-Master Mod.diy,OK,,991
+LM386 Voltage Converter.diy,FAILED,Images do not match!,1709
+LargeBandMaster.diy,FAILED,Images do not match!,50814
+Lectrolab schematic.diy,OK,,2194
+PCF DI Cable Diagram.diy,OK,,1320
+ProTremoVerb Schematic.diy,OK,,2041
+RAM board 2.diy,FAILED,Images do not match!,6668
+RR2104_Master_Volume_6V6_Schematic.diy,OK,,878
+Radio Amp Noval.diy,FAILED,Images do not match!,2495
+Register board (LSB).diy,FAILED,Images do not match!,3256
+Rix 18 watt.diy,OK,,247
+Rix AC15 Xlite.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,202
+Rix Baby Blue.diy,OK,,256
+Rix Bassman.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,1838
+Rix JD stout.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,210
+Rix Junior AB763.diy,OK,,696
+Rix Junior.diy,OK,,242
+Rix Plexi 6V6.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,368
+Rix Pro Jr.diy,OK,,235
+Silvertone 1484 v6f.diy,FAILED,Images do not match!,16076
+Stack Pointer board.diy,FAILED,Images do not match!,3606
+Synth Oscllator_v1.diy,FAILED,Images do not match!,3241
+Thunderbolt Mk3.diy,OK,,233
+antiquity_fuzz.diy,FAILED,Images do not match!,1833
+b_blender.diy,FAILED,Images do not match!,1749
+bixonix_expandora.diy,FAILED,Images do not match!,2173
+dallas_rangemaster_pcb.diy,FAILED,Images do not match!,2082
+deacy.diy,FAILED,Images do not match!,527
+dist_layout.diy,FAILED,Images do not match!,2051
+dyna_comp_perf.diy,FAILED,Images do not match!,2149
+eh_octave_multiplexer.diy,FAILED,Images do not match!,1875
+fetzer_ruby.diy,FAILED,Images do not match!,1795
+fetzer_valve.diy,FAILED,Images do not match!,1934
+fetzer_valve_deluxe_2.diy,FAILED,Images do not match!,4194
+fetzer_valve_deluxe_perf.diy,FAILED,Images do not match!,2301
+flexi_clip.diy,FAILED,Images do not match!,2916
+ga5t_preamp.diy,FAILED,Images do not match!,2591
+jfet boost.diy,OK,,56
+lp switch + pots.diy,FAILED,Netlists do not match with switches,1232
+lxh2_marshall_amp_sim.diy,FAILED,Images do not match!,2460
+orange_treble_bass_booster_2.diy,FAILED,Images do not match!,2055
+puzzle87_comp.diy,FAILED,Images do not match!,2224
+rangemaster.diy,FAILED,Images do not match!,344
+roger_mayer_octavia_vero.diy,FAILED,Images do not match!,1839
+ruby.diy,FAILED,Images do not match!,360
+shaka_hv.diy,FAILED,Images do not match!,2100
+signal_gen.diy,FAILED,Images do not match!,1743
+slo2.diy,FAILED,Images do not match!,5183
+soapdodger2.diy,FAILED,Images do not match!,3172
+splitter2.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,2225
+standard strat.diy,OK,,1619
+tda1521a-2.diy,FAILED,Images do not match!,879
+timmy7.diy,FAILED,Images do not match!,1942
+travelcaster3 (new format).diy,FAILED,Netlists do not match with switches,392
+wah2.diy,FAILED,Images do not match!,2257

diylc-regression-data/reports/2026-11-04T20_51_25.979041-V6_10_0.csv

@@ -0,0 +1,102 @@
+OK,Failed,Total Time,Avg Time
+97,0,166731,1718
+
+
+File,Status,Message,Time
+12v_supply.diy,OK,,3536
+211.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,1793
+255.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,4205
+2555X BOARD LAYOUT RESaddTSRELAYnew.diy,OK,,6859
+259.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,2890
+291.diy,OK,,1282
+315.diy,OK,,4164
+331.diy,OK,,896
+360.diy,OK,,668
+367.diy,OK,,1104
+374.diy,OK,,1980
+414.diy,OK,,486
+419.diy,OK,,1433
+448.diy,OK,,3171
+451.diy,OK,,2006
+480.diy,OK,,994
+523.diy,OK,,960
+537.diy,OK,,963
+543.diy,OK,,892
+546.diy,OK,,338
+548.diy,OK,,1017
+560.diy,OK,,1216
+562.diy,OK,,1746
+565.diy,OK,,1049
+578.diy,OK,,2598
+580.diy,OK,,1719
+581.diy,OK,,4322
+606.diy,OK,,1386
+610.diy,OK,,1561
+614.diy,OK,,1179
+6Y6 Express 2.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,3103
+801.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,678
+9V_supply_regulated.diy,OK,<html>File was opened, but there were some issues with it:<br><br>Could not recognize component type Transformer<br></html,2332
+ALU board with interface.diy,OK,,1288
+AllTube Schem.diy,OK,,2148
+Blue 7.diy,OK,,202
+BrownfaceReverb Schematic 2.diy,OK,,1385
+Bus decoder board (RL,Z2,Z1,Z0).diy,OK,,1452
+DR18Tagstrip.diy,OK,,2783
+Deluxe_Micro_EF80_Layout.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,1274
+Fender_Bassman_5F6_5F6A.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,588
+IIc+.diy,OK,,1639
+Ibanez Balance-Master Mod.diy,OK,,1395
+LM386 Voltage Converter.diy,OK,,888
+LargeBandMaster.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,14763
+Lectrolab schematic.diy,OK,,1388
+PCF DI Cable Diagram.diy,OK,,895
+ProTremoVerb Schematic.diy,OK,,2463
+RAM board 2.diy,OK,,3320
+RR2104_Master_Volume_6V6_Schematic.diy,OK,,1574
+Radio Amp Noval.diy,OK,,1871
+Register board (LSB).diy,OK,,1097
+Rix 18 watt.diy,OK,,273
+Rix AC15 Xlite.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,383
+Rix Baby Blue.diy,OK,,266
+Rix Bassman.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,889
+Rix JD stout.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,249
+Rix Junior AB763.diy,OK,,295
+Rix Junior.diy,OK,,301
+Rix Plexi 6V6.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,459
+Rix Pro Jr.diy,OK,,475
+Silvertone 1484 v6f.diy,OK,,5147
+Stack Pointer board.diy,OK,,1385
+Synth Oscllator_v1.diy,OK,,4212
+Thunderbolt Mk3.diy,OK,,289
+antiquity_fuzz.diy,OK,,1113
+b_blender.diy,OK,<html>File was opened, but there were some issues with it:<br><br>Could not recognize component type Jack<br></html,1346
+bixonix_expandora.diy,OK,,1136
+dallas_rangemaster_pcb.diy,OK,,1415
+deacy.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,445
+dist_layout.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,1192
+dyna_comp_perf.diy,OK,,1117
+eh_octave_multiplexer.diy,OK,,1344
+fetzer_ruby.diy,OK,,1757
+fetzer_valve.diy,OK,,1914
+fetzer_valve_deluxe_2.diy,OK,,1194
+fetzer_valve_deluxe_perf.diy,OK,,1290
+flexi_clip.diy,OK,<html>File was opened, but there were some issues with it:<br><br>Unsupported toggle switch dimensions<br></html,1714
+ga5t_preamp.diy,OK,,1100
+jfet boost.diy,OK,,59
+lp switch + pots.diy,OK,,2001
+lxh2_marshall_amp_sim.diy,OK,,1296
+orange_treble_bass_booster_2.diy,OK,<html>File was opened, but there were some issues with it:<br><br>Could not recognize component type Jack<br></html,1646
+puzzle87_comp.diy,OK,<html>File was opened, but there were some issues with it:<br><br>Could not recognize component type Jack<br></html,1186
+rangemaster.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,134
+roger_mayer_octavia_vero.diy,OK,,1024
+ruby.diy,OK,,267
+shaka_hv.diy,OK,,1461
+signal_gen.diy,OK,<html>File was opened, but there were some issues with it:<br><br>Could not recognize component type Jack<br></html,1151
+slo2.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,3912
+soapdodger2.diy,OK,<html>File was opened, but there were some issues with it:<br><br>Could not recognize component type Jack<br></html,3460
+splitter2.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,2201
+standard strat.diy,OK,,3600
+tda1521a-2.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,629
+timmy7.diy,OK,<html>File was opened, but there were some issues with it:<br><br>The project references unknown component properties, most likely because it was created with a newer version of DIYLC.<br></html,1049
+travelcaster3 (new format).diy,OK,,632
+wah2.diy,OK,,1384

diylc/.claude/skills/regression-test/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: regression-test
-description: Run the DIYLC end-to-end regression suite, which renders ~700 sample .diy projects and compares PNG exports and netlists against reference outputs. Use after any change to rendering, component drawing, serialization, netlist or analyzer logic, or when asked to check for regressions or regenerate reference files.
+description: Run the DIYLC end-to-end regression suite, which renders just under 100 sample .diy projects and compares PNG exports and netlists against reference outputs. Use after any change to rendering, component drawing, serialization, netlist or analyzer logic, or when asked to check for regressions or regenerate reference files.
 ---
 
 # Running the DIYLC regression suite
@@ -29,16 +29,18 @@ already has the arguments and JVM flags. Offer that first.
 
 The runner needs the `--add-opens` / `--add-exports` flags and a classpath spanning all three
 modules; `mvn exec:java` will not work because it runs in Maven's own classloader and fails to find
-Reflections. Build a classpath and fork a JVM:
+Reflections. Build a classpath and fork a JVM.
+
+The classpath has to be built in the same reactor run as the compile. Running
+`dependency:build-classpath` on a single module fails with a `DependencyResolutionException`,
+because `diylc-processor` is not installed in the local repository and the plugin can only resolve
+it from the reactor. The relative `outputFile` gives each module its own `target/cp.txt`:
 
 ```bash
 cd diylc
-SP=/tmp   # or the session scratchpad
 
-mvn -q -pl diylc-swing -am test-compile
+mvn -q -pl diylc-swing -am test-compile dependency:build-classpath \
-mvn -q -pl diylc-swing   dependency:build-classpath -Dmdep.outputFile=$SP/cp-swing.txt -Dmdep.includeScope=test
+  -Dmdep.outputFile=target/cp.txt -Dmdep.includeScope=test
-mvn -q -pl diylc-core    dependency:build-classpath -Dmdep.outputFile=$SP/cp-core.txt  -Dmdep.includeScope=test
-mvn -q -pl diylc-library dependency:build-classpath -Dmdep.outputFile=$SP/cp-lib.txt   -Dmdep.includeScope=test
 
 java \
   --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED \
@@ -49,19 +51,20 @@ java \
   --add-opens java.desktop/java.awt=ALL-UNNAMED \
   --add-opens java.desktop/java.awt.font=ALL-UNNAMED \
   --add-opens java.desktop/java.awt.geom=ALL-UNNAMED \
-  -cp "diylc-swing/target/test-classes:diylc-swing/target/classes:diylc-core/target/classes:diylc-library/target/classes:$(cat $SP/cp-swing.txt):$(cat $SP/cp-core.txt):$(cat $SP/cp-lib.txt)" \
+  -cp "diylc-swing/target/test-classes:diylc-swing/target/classes:diylc-core/target/classes:diylc-library/target/classes:$(cat diylc-swing/target/cp.txt):$(cat diylc-core/target/cp.txt):$(cat diylc-library/target/cp.txt)" \
   org.diylc.RegressionTestRunner \
   "$(cd .. && pwd)/diylc-regression-data" TEST [filter]
 ```
 
-Sanity-check the log line `Presenter - Current DIYLC version: 6.4.0` near the end. If it reports
+Sanity-check the log line `Presenter - Current DIYLC version: ...`. It should report the newest
-`5.0.0`, the `--add-opens` flags are missing and the run is invalid.
+version in `diylc-core/src/main/resources/update.xml`; if it reports `5.0.0`, the `--add-opens`
+flags are missing and the run is invalid.
 
 ### Arguments
 
 1. Path to `diylc-regression-data`
 2. `TEST` or `PREPARE`
-3. Optional filter — a substring matched against file paths. **Use it.** The full suite is ~700
+3. Optional filter — a substring matched against file paths. The full suite is just under 100
    projects; while narrowing down an issue, run one file or one directory at a time
    (e.g. `splitter2`, or `guitar`).
 

diylc/CLAUDE.md

@@ -210,6 +210,14 @@ logic, netlist and analyzer behaviour, datasheet parsing, core utilities. Compon
 user interaction are covered by the regression suite instead, not by unit tests. Test classes are
 named `*Test` or `*Tests` and carry the license header like any other file.
 
+## Changelog
+
+User-facing changes are listed in `diylc-core/src/main/resources/update.xml`, one `Version` block
+per release. Within a block, all `NEW_FEATURE` entries come first, then `IMPROVEMENT`, then
+`BUG_FIX`; keep the existing order inside each group and add a new entry at the end of its own
+group, not at the end of the block. After a merge that brings entries in from both sides, sort the
+unreleased block again. Released blocks stay exactly as they shipped.
+
 ## Git
 
 **Do not commit or push.** Make the change in the working tree and stop; the maintainer reviews and

diylc/catalog_index.json

@@ -1,10 +1,10 @@
 {
-  "version" : "6.9.0",
+  "version" : "6.11.0",
   "categories" : {
     "Boards" : [ {
       "name" : "Blank Board",
       "className" : "boards.BlankBoard",
-      "notes" : [ "Use this board as a base of PCB, eyelet and turret boards unless asked otherwise" ]
+      "notes" : [ "Use this board as a base of PCB, eyelet and turret boards unless asked otherwise", "When the board needs mounting holes, because the request asks for them or the board goes into an enclosure, also select Drill Hole and use one Drill Hole per hole" ]
     }, {
       "name" : "Breadboard",
       "className" : "boards.Breadboard"
@@ -174,9 +174,6 @@
     }, {
       "name" : "9V Battery Snap",
       "className" : "electromechanical.BatterySnap9V"
-    }, {
-      "name" : "Chassis Panel",
-      "className" : "chassis.ChassisPanel"
     }, {
       "name" : "Cliff 1/4\" Jack",
       "className" : "electromechanical.CliffJack1_4"
@@ -189,12 +186,6 @@
     }, {
       "name" : "DIP Switch",
       "className" : "electromechanical.DIPSwitch"
-    }, {
-      "name" : "Drill Hole",
-      "className" : "electromechanical.DrillHole"
-    }, {
-      "name" : "Elliptical Cutout",
-      "className" : "chassis.EllipticalCutout"
     }, {
       "name" : "Fuse Holder (Panel)",
       "className" : "electromechanical.FuseHolderPanel"
@@ -225,15 +216,9 @@
     }, {
       "name" : "Plastic DC Jack",
       "className" : "electromechanical.PlasticDCJack"
-    }, {
-      "name" : "Polygonal Cutout",
-      "className" : "chassis.PolygonalCutout"
     }, {
       "name" : "RCA Jack",
       "className" : "electromechanical.RCAJack"
-    }, {
-      "name" : "Rectangular Cutout",
-      "className" : "chassis.RectangularCutout"
     }, {
       "name" : "Rotary Selector Switch",
       "className" : "electromechanical.RotarySelectorSwitch"
@@ -293,6 +278,27 @@
       "name" : "Stingray Bass Pickup",
       "className" : "guitar.StingrayBassPickup"
     } ],
+    "Hardware" : [ {
+      "name" : "Dial Scale",
+      "className" : "chassis.DialScale"
+    }, {
+      "name" : "Drill Hole",
+      "className" : "electromechanical.DrillHole",
+      "notes" : [ "Use for round holes: the mounting holes of a Blank Board, and the holes for jacks, pots, switches and LEDs in an Enclosure; for other openings in an Enclosure use the Rectangular, Elliptical or Polygonal Cutout" ]
+    }, {
+      "name" : "Elliptical Cutout",
+      "className" : "chassis.EllipticalCutout"
+    }, {
+      "name" : "Enclosure",
+      "className" : "chassis.ChassisPanel",
+      "notes" : [ "One Enclosure draws a whole box, so use one per box rather than one per side. Also select Drill Hole for the round holes of its jacks, pots, switches and LEDs, and the Rectangular, Elliptical or Polygonal Cutout for any other openings" ]
+    }, {
+      "name" : "Polygonal Cutout",
+      "className" : "chassis.PolygonalCutout"
+    }, {
+      "name" : "Rectangular Cutout",
+      "className" : "chassis.RectangularCutout"
+    } ],
     "Misc" : [ {
       "name" : "Auto-Wrap Label",
       "className" : "misc.WrapLabel"
@@ -302,9 +308,6 @@
     }, {
       "name" : "Common Node",
       "className" : "misc.CommonNode"
-    }, {
-      "name" : "Dial Scale",
-      "className" : "chassis.DialScale"
     }, {
       "name" : "Image",
       "className" : "misc.Image"

diylc/diylc-core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.diylc</groupId>
         <artifactId>diylc-parent</artifactId>
-        <version>6.9.0</version>
+        <version>6.10.0</version>
     </parent>
     
     <artifactId>diylc-core</artifactId>

diylc/diylc-core/src/main/java/org/diylc/common/BuildingBlock.java

@@ -21,6 +21,7 @@
 */
 package org.diylc.common;
 
+import java.time.LocalDateTime;
 import java.util.Collection;
 
 import org.diylc.core.IDIYComponent;
@@ -29,6 +30,10 @@ public class BuildingBlock {
 
   private String name;
   private Collection<IDIYComponent<?>> components;
+  // the dates are set only on factory blocks in import-defaults/blocks.xml, and a withdrawn
+  // factory block carries nothing but its name and deletedOn
+  private LocalDateTime createdOn;
+  private LocalDateTime deletedOn;
 
   public BuildingBlock(String name, Collection<IDIYComponent<?>> components) {
     super();
@@ -52,6 +57,22 @@ public class BuildingBlock {
     this.components = components;
   }
 
+  public LocalDateTime getCreatedOn() {
+    return createdOn;
+  }
+
+  public void setCreatedOn(LocalDateTime createdOn) {
+    this.createdOn = createdOn;
+  }
+
+  public LocalDateTime getDeletedOn() {
+    return deletedOn;
+  }
+
+  public void setDeletedOn(LocalDateTime deletedOn) {
+    this.deletedOn = deletedOn;
+  }
+
   @Override
   public String toString() {
     return name;