X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=_Mappings.pde;h=9ff93e6b962c86d0606cd8ee84b2badd15dd5562;hp=6b9b98c76ecc29670df3537bb2b32fff54dcf3c7;hb=df18145ff0149470136d51d6eab334800e7be9a9;hpb=e3da2932ded14d087bfbfe6364c53692c526ca95

diff --git a/_Mappings.pde b/_Mappings.pde
index 6b9b98c..9ff93e6 100644
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -222,7 +222,7 @@ for (StaggeredTower st : scubes) {
       tower.add(cubes[cubeIndex++] = new Cube(st.x, st.y + CH* 4/3.*i, st.z, 0, st.r, 0, w));
     }
     towerList.add(new Tower(tower));
-  }
+  }   
 
   return new Model(towerList, cubes, bassBox, speakers);
 }
@@ -248,28 +248,28 @@ public PandaMapping[] buildPandaList() {
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 13, 14, 15}),
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),
     }),
-   //  new PandaMapping(
-   //    "10.200.1.29", new ChannelMapping[] {
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 34, 35, 36}),
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19, 20, 21}),
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 22, 23, 24}), 
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 25, 26, 27}),
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28, 29, 30}),
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 31, 32, 33}),
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),
-   //  }),    
-   //  new PandaMapping(
-   //    "10.200.1.30", new ChannelMapping[] {
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // 30 J3 *
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),  // 30 J4 //ORIG *
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 39}),                // 30 J7 *
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 40, 41, 42}),  // 30 J8 *
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 43, 44, 45}),                // 30 J13 (not working)
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 46, 47, 48}),                // 30 J14 (unplugged)
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 49, 50, 51}),                // 30 J15 (unplugged)
-   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 52, 53, 54}), // 30 J16
-   // }),    
+    new PandaMapping(
+      "10.200.1.29", new ChannelMapping[] {
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 34, 35, 36}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19, 20, 21}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 22, 23, 24}), 
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 25, 26, 27}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28, 29, 30}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 31, 32, 33}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),
+    }),    
+    new PandaMapping(
+      "10.200.1.30", new ChannelMapping[] {
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1,1}), // 30 J3 *
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1,1}),  // 30 J4 //ORIG *
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 39}),                // 30 J7 *
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 40, 41, 42}),  // 30 J8 *
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 43, 44, 45}),                // 30 J13 (not working)
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 46, 47, 48}),                // 30 J14 (unplugged)
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 49, 50, 51}),                // 30 J15 (unplugged)
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 52, 53, 54}), // 30 J16
+   }),    
    //   new PandaMapping(
    //     "10.200.1.31", new ChannelMapping[] {
    //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 65, 66}),       // J3 
@@ -434,4 +434,4 @@ class ChannelMapping {
       objectIndices[i] = (i < rawObjectIndices.length) ? rawObjectIndices[i] : NO_OBJECT;
     }
   }
-}
\ No newline at end of file
+}