finalized mapping

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 7f8be7b14a9837d7f5fb5bb5453030b94f804110..4a941436e6b280c45416a44556d90bdeb330683b 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -27,7 +27,7 @@ LXPattern gplay;
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
     
-    new Gimbal(glucose),
+    
     
     // DMK
         
@@ -82,7 +82,8 @@ LXPattern[] patterns(GLucose glucose) {
     new TowerParams(glucose),
     new DriveableCrossSections(glucose),
     new GranimTestPattern2(glucose),
-     
+     //JR
+    new Gimbal(glucose),
     // Sam
     new JazzRainbow(glucose),
     
@@ -91,6 +92,7 @@ LXPattern[] patterns(GLucose glucose) {
     new AbstractPainting(glucose),
     new Spirality(glucose),
     
+
     // Basic test patterns for reference, not art    
     new TestCubePattern(glucose),
     new TestTowerPattern(glucose),

diff --git a/_Mappings.pde b/_Mappings.pde
index 059841d4a6bbd9059624cffdaa2c062c0c8745f9..940fade7655ad8e0d6c1612d951571f4e9593c17 100644 (file)
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -249,7 +249,11 @@ public Model buildModel() {
       new Cube(BBX + 104,  107.5, BBZ + BassBox.EDGE_DEPTH + 17, 0, -35, 0, WRR), 
       new Cube(BBX + 129,  107.5, BBZ +BassBox.EDGE_DEPTH +10, 0, -35, 0, WFL), 
       
-     new Cube(179, 4*Cube.EDGE_HEIGHT, BBZ + BassBox.EDGE_DEPTH + 14,0, -20, 0 , WFR)
+     new Cube(179, 4*Cube.EDGE_HEIGHT, BBZ + BassBox.EDGE_DEPTH + 14,0, -20, 0 , WFR),
+
+     //lonely cube at top left, one cube channel
+
+     new Cube(BBX - 36,  4*Cube.EDGE_HEIGHT + 8, BBZ +BassBox.EDGE_DEPTH- 38, 0, 10, 0, WFL)
 
     // new Cube(x, y, z, rx, ry, rz, wiring),
   };
@@ -330,12 +334,30 @@ public PandaMapping[] buildPandaList() {
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 60, 61, 62, 63 }), //28 J3
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 56, 57, 58, 59}), //28 J4
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 45,46,47,48 }), //28 J7
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[]  {24,25,26,27}), //28 J8
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[]  {1,1,1,1}), //28 J8
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4,5,6,7}), //28 J13
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 64, 65, 66, 67 }), //28 J14
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 68, 69, 70, 71 }), //28 J15
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 49,50,51,52}), //28 J16
     }),    
+    new PandaMapping(
+      "10.200.1.31", new ChannelMapping[] {
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[]{1,1,1,1}),  //placeholders
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[]{1,1,1,1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {1,1,1,1 }), 
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[]  {24,25,26,27}), //28 J8
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1,1,1}), 
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1,1,1 }), 
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 73 }), 
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1,1,1}), //31 J16
+
+
+      }
+
+
+
+
+      )
   };  
 
 }