BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 17:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

4P5T and DP5T guitar switches were not properly configured for internal

Browse Source 
pin connections
This commit is contained in:
bancika
2020-03-27 17:18:27 +01:00
parent 55ab31f8e2
commit fd079f44be
5 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/test/org/diylc/netlist/GuitarNetlistAnalyzerTests.java
+44
View File
@@ -22,9 +22,16 @@
package org.diylc.netlist;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Arrays;
import java.util.Collections;
import org.diylc.components.electromechanical.OpenJack1_4;
import org.diylc.components.guitar.HumbuckerPickup;
import org.diylc.components.guitar.LeverSwitch;
import org.diylc.components.guitar.LeverSwitch.LeverSwitchType;
import org.diylc.components.guitar.SingleCoilPickup;
import org.diylc.components.passive.PotentiometerPanel;
import org.diylc.components.passive.RadialCeramicDiskCapacitor;
@@ -271,4 +278,41 @@ public class GuitarNetlistAnalyzerTests {
String s = tree.toString();
assertEquals("(((Volume.1-2) + ((Pickup1.North<- + Pickup1.South<-) || (Pickup2.North<- + Pickup2.South<-) || (Tone1.2-3 + Cap1) || (Tone2.2-3 + Cap2))) || (Volume.2-3))", s);
}
@Test
public void testLeverSwitch() {
LeverSwitch leverSwitch = new LeverSwitch();
leverSwitch.setType(LeverSwitchType.DP5T);
String[] validCombinations = new String[]{
"0,0,1", "0,6,11", "0,12,13", "0,18,23",
"1,0,2", "1,7,11", "1,12,14", "1,19,23",
"2,0,3", "2,8,11", "2,12,15", "2,20,23",
"3,0,4", "3,9,11", "3,12,16", "3,21,23",
"4,0,5", "4,10,11", "4,12,17", "4,22,23"};
Arrays.sort(validCombinations);
for (int p = 0; p < leverSwitch.getPositionCount(); p++)
for (int i = 0; i < leverSwitch.getControlPointCount(); i++)
for (int j = 0; j < leverSwitch.getControlPointCount(); j++) {
String test = p + "," + i + "," + j;
boolean isConnected = leverSwitch.arePointsConnected(i, j, p);
boolean isOk = (isConnected && Arrays.binarySearch(validCombinations, test) >= 0) ||
!isConnected && Arrays.binarySearch(validCombinations, test) < 0;
if (!isOk)
fail("Bad connection for p=" + p + ", i=" + i + ",j=" + j);
}
leverSwitch.setType(LeverSwitchType._4P5T);
Arrays.sort(validCombinations);
for (int p = 0; p < leverSwitch.getPositionCount(); p++)
for (int i = 0; i < leverSwitch.getControlPointCount(); i++)
for (int j = 0; j < leverSwitch.getControlPointCount(); j++) {
String test = p + "," + i + "," + j;
boolean isConnected = leverSwitch.arePointsConnected(i, j, p);
boolean isOk = (isConnected && Arrays.binarySearch(validCombinations, test) >= 0) ||
!isConnected && Arrays.binarySearch(validCombinations, test) < 0;
if (!isOk)
fail("Bad connection for p=" + p + ", i=" + i + ",j=" + j);
}
}
}