Fix 6-way switch wiring

diylc/diylc-library/src/org/diylc/components/guitar/LeverSwitch.java

@@ -557,36 +557,36 @@ public class LeverSwitch extends AbstractTransparentComponent<String> implements
           new int[] { 4, 7 }
           ) // position 5
       );
-  
+
   private static final List<List<int[]>> _6_WAY_CONNECTIONS = Arrays.asList(
       Arrays.asList(
           new int[] { 0, 8 },
-          new int[] { 2, 8 },
-          new int[] { 1, 3 }
+          new int[] { 1, 3 },
+          new int[] { 1, 5 }
           ), // position 1
       Arrays.asList(
+          new int[] { 0, 8 },
           new int[] { 2, 8 },
-          new int[] { 1, 3 },
           new int[] { 1, 5 }
           ), // position 2
       Arrays.asList(
           new int[] { 2, 8 },
-          new int[] { 4, 8 },
-          new int[] { 1, 5 }
+          new int[] { 1, 5 },
+          new int[] { 1, 7 }
           ), // position 3
       Arrays.asList(
+          new int[] { 2, 8 },
           new int[] { 4, 8 },
-          new int[] { 1, 5 },
           new int[] { 1, 7 }
           ), // position 4
       Arrays.asList(
           new int[] { 4, 8 },
-          new int[] { 6, 8 },
-          new int[] { 1, 7 }
+          new int[] { 1, 7 },
+          new int[] { 1, 9 }
           ), // position 5
       Arrays.asList(
+          new int[] { 4, 8 },
           new int[] { 6, 8 },
-          new int[] { 1, 7 },
           new int[] { 1, 9 }
           ) // position 6      
       );

diylc/diylc-library/test/org/diylc/netlist/SwitchTests.java

@@ -56,8 +56,8 @@ public class SwitchTests {
   public void testLeverSwitch6Way() {
     LeverSwitch leverSwitch = new LeverSwitch();
 
-    String[] validCombinations = new String[] {"0,0,8", "0,2,8", "0,1,3", "1,2,8", "1,1,3", "1,1,5", "2,2,8", "2,4,8", "2,1,5",
-        "3,4,8", "3,1,5", "3,1,7", "4,4,8", "4,6,8", "4,1,7", "5,6,8", "5,1,7", "5,1,9"};
+    String[] validCombinations = new String[] {"0,0,8", "0,1,3", "0,1,5", "1,0,8", "1,2,8", "1,1,5", "2,2,8", "2,1,5", "2,1,7",
+        "3,2,8", "3,4,8", "3,1,7", "4,4,8", "4,1,7", "4,1,9", "5,4,8", "5,6,8", "5,1,9"};
     
     leverSwitch.setType(LeverSwitchType._6_WAY_OG);
     testSwitch(leverSwitch, validCombinations);