From: Alexander Green <alexandergreen22@gmail.com>
Date: Thu, 31 Oct 2013 03:21:18 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=1d10568e37941b6da5fc9c4d58f41d50fba8fb89;hp=207911097b63d6a40af8f006973e74bf4d052c31;p=SugarCubes.git

Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
don't know
---

diff --git a/_Mappings.pde b/_Mappings.pde
index 84e887c..feca86e 100644
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -149,22 +149,22 @@ scubes.add(new StaggeredTower(//tower 10
       83.75+39+43-124.5,   // x
       0,   // y
        -47.5-43,   // z
-     0,  4, new Cube.Wiring[]{ WRR, WFL, WRR, WFL})  ); 
+     0,  4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR})  ); 
 scubes.add(new StaggeredTower(//tower 11
       83.75,   // x
        0,   // y
        -47.5,   // z
-     0,  4, new Cube.Wiring[]{ WFL, WRR, WFL, WRR})  );  
+     0,  4, new Cube.Wiring[]{ WFL, WRR, WRR, WFL})  );  
 scubes.add(new StaggeredTower(//tower 12
       83.75+39,   // x
        0,   // y
        -47.5,   // z
-     0,  4, new Cube.Wiring[]{ WRR, WFL, WRR, WFL})  ); 
+     0,  4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR})  ); 
 scubes.add(new StaggeredTower(//tower 13
        83.75+39+43,   // x
        0,   // y
        -47.5-43,   // z
-     0,  4, new Cube.Wiring[]{ WRR, WFL, WRR, WFL})  ); 
+     0,  4, new Cube.Wiring[]{ WFL, WRR, WFL, WRR})  ); 
 
 // scubes.add(new StaggeredTower(// Single cube on top of tower 4
 //       42,               // x
@@ -260,14 +260,14 @@ public PandaMapping[] buildPandaList() {
    }),    
      new PandaMapping(
        "10.200.1.31", new ChannelMapping[] {
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J3 
+         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 65, 66}),       // J3 
          new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J4
          new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 55, 56}), // 30 J7 
          new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 57, 58}), //  J8 
          new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 59, 60}),           // J13 
          new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 61, 62}),                // 30 J14 
          new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 63, 64}),                //  J15
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 65, 66}),              //  J16
+         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),              //  J16
      }),
      new PandaMapping(
        "10.200.1.32", new ChannelMapping[] {