X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Mappings.pde;h=5bcdb739bba8a3b6000af7bf7845d83834e968ce;hb=4e6626a95f23831319a73d3702789621b2248bb9;hp=171ff13e26808b056c55392661fecb621050a8a4;hpb=3ee7238a0fdae90265f2a28ab3e6f380b8478429;p=SugarCubes.git

diff --git a/_Mappings.pde b/_Mappings.pde
index 171ff13..5bcdb73 100644
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -77,17 +77,17 @@ public Model buildModel() {
   // dan's proposed lattice
         ArrayList<StaggeredTower> scubes = new ArrayList<StaggeredTower>();
         //if (NumBackTowers != 25) exit();
-        for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
-                  (i+1)*CW,                                                                 // x
-                  (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
-                 - ((i % 2 == 0) ? 11 : 0) + 80          ,   // z
-                 -45, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight) );         // num cubes
+          // for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
+          //           (i+1)*CW,                                                                 // x
+          //           (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
+          //          - ((i % 2 == 0) ? 11 : 0) + 80          ,   // z
+          //          -45, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight) );         // num cubes
         
-//        for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
-//                  (i+1)*CW,                                                                 // x
-//                  (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
-//                 - ((i % 2 == 0) ? 0 : 11) + 80 - pow(CH*CH + CW*CW, .5),   // z
-//                 225, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) ); 
+       // for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
+       //           (i+1)*CW,                                                                 // x
+       //           (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
+       //          - ((i % 2 == 0) ? 0 : 11) + 80 - pow(CH*CH + CW*CW, .5),   // z
+       //          225, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) ); 
 
       // for (int i=0; i<2 ; i++) scubes.add(new StaggeredTower(
       //             (i+1)*CW,                                                                 // x
@@ -101,83 +101,101 @@ public Model buildModel() {
         //                          dcubes.add(new Cube(-6+CW*4/3*i+CW*2/3., CH*.5, 0, 0, 0, 0, WRR));        
         // }
 
-float current_x_position = 0;
-// scubes.add(new StaggeredTower(//tower 1
-//       current_x_position,               // x
-//        15   ,   // y
-//        0  ,   // z
-//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
-// current_x_position += 25.25;
-// scubes.add(new StaggeredTower(// tower 2
-//       current_x_position,               // x
-//        0  ,   // y
-//        -10.5   ,   // z
-//      45, 6, new Cube.Wiring[] { WFR, WFL, WRR, WRR, WFL, WRR}) );
-// current_x_position += 25.25;
-// scubes.add(new StaggeredTower(//tower 3
-//       current_x_position,               // x
-//        15   ,   // y
-//        0,   // z
-//      45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WRR, WFL, WRR}) );
-// current_x_position += 25.25;
-// scubes.add(new StaggeredTower(//tower 4
-//     current_x_position,               // x
-//        0,   // y
-//        -10.5  ,   // z
-//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
-// current_x_position += 28;
-// scubes.add(new StaggeredTower(//tower 5
-//       current_x_position,               // x
-//        15   ,   // y
-//        -4.5 ,   // z
-//      45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WFL, WRR, WFL}) );
-// current_x_position += 28;
-// scubes.add(new StaggeredTower(//tower 6
-//       current_x_position,               // x
-//        0 ,   // y
-//        -10.5,   // z
-//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
-// current_x_position += 25.25;
-// scubes.add(new StaggeredTower(// tower 7
-//       current_x_position,               // x
-//        15   ,   // y
-//       0,   // z
-//      45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WFL, WRR, WFL}) );
-// current_x_position += 25.25;     
-// scubes.add(new StaggeredTower(//tower 8
-//       current_x_position,               // x
-//        0  ,   // y
-//        -10.5 ,   // z
-//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
-// current_x_position += 25.25;
-// scubes.add(new StaggeredTower(//tower 9
-//       current_x_position,               // x
-//        15   ,   // y
-//        0,   // z
-//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
-// current_x_position += 25.25;
+float[] pos = new float[3];
+pos[0] = 50;
+pos[2] = 100;
+scubes.add(new StaggeredTower(//tower 1
+      pos[0],               // x
+       0   ,   // y
+       pos[2], // z
+     0, 4, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
+
+
+pos[0] += 25;
+pos[2] -= 10;
+scubes.add(new StaggeredTower(// tower 2
+      pos[0],               // x
+       15  ,   // y
+       pos[2], // z
+     0, 4, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
+
+pos[0] += 25;
+pos[2] += -12.5;
+scubes.add(new StaggeredTower(//tower 3
+      pos[0],               // x
+       0   ,   // y
+       pos[2], // z
+     0, 5, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
+
+pos[0] += -32.75;
+pos[2] += -13;
+scubes.add(new StaggeredTower(//tower 4
+    pos[0],               // x
+       0,   // y
+       pos[2], // z
+     0, 6, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
+
+pos[0] += 26;
+pos[2] += -16;
+scubes.add(new StaggeredTower(//tower 5
+      pos[0],               // x
+       15   ,   // y
+       pos[2], // z
+     0, 6, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
+
+pos[0] += 26;
+pos[2] += -4.5;
+scubes.add(new StaggeredTower(//tower 6
+      pos[0],               // x
+       0 ,   // y
+       pos[2], // z
+     0, 6, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
+
+pos[0] += -56.5;
+pos[2] += -6.5;
+scubes.add(new StaggeredTower(// tower 7
+      pos[0],               // x
+       15   ,   // y
+      pos[2], // z
+     0, 4, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
+
+pos[0] += 26;
+pos[2] += -16.5;     
+scubes.add(new StaggeredTower(//tower 8
+      pos[0],               // x
+       0  ,   // y
+       pos[2], // z
+     0, 5, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
+
+pos[0] += 27;
+pos[2] += -4.5;
+scubes.add(new StaggeredTower(//tower 9
+      pos[0],               // x
+       15   ,   // y
+       pos[2], // z
+     0, 5, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
 
 // //TOWERS ON DANCE FLOOR
 // scubes.add(new StaggeredTower(//tower 10
 //       83.75+39+43-124.5,   // x
 //       0,   // y
 //        -47.5-43,   // z
-//      45,  4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR})  ); 
+//      45,  4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR})  ); 
 // scubes.add(new StaggeredTower(//tower 11
 //       83.75,   // x
 //        0,   // y
 //        -47.5,   // z
-//      45,  4, new Cube.Wiring[]{ WFL, WRR, WRR, WFL})  );  
+//      45,  4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR})  );  
 // scubes.add(new StaggeredTower(//tower 12
 //       83.75+39,   // x
 //        0,   // y
 //        -47.5,   // z
-//      45,  4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR})  ); 
+//      45,  4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR})  ); 
 // scubes.add(new StaggeredTower(//tower 13
 //        83.75+39+43,   // x
 //        0,   // y
 //        -47.5-43,   // z
-//      45,  4, new Cube.Wiring[]{ WFL, WRR, WFL, WRR})  ); 
+//      45,  4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR})  ); 
 
 // scubes.add(new StaggeredTower(// Single cube on top of tower 4
 //       42,               // x
@@ -243,75 +261,88 @@ public PandaMapping[] buildPandaList() {
   // 8 channels map to:  3, 4, 7, 8, 13, 14, 15, 16.
   return new PandaMapping[] {
     new PandaMapping(
-      "10.200.1.28", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 39 }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 43, 44, 45 }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 46, 47, 48 }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  }), // new front thing
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  }), // new back thing
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 13, 14, 15 }), // new back thing
-    }),
-    new PandaMapping(
-      "10.200.1.29", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19, 20, 21 }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1, 2, 3 }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4, 5, 6 }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 7, 8, 9 }),
-
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 10, 11, 12 }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16, 17, 18 }),
-//        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[] { }),
-    }),    
+      "192.168.88.100", new ChannelMapping[] { // G1
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 6}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 6}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 7}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 7}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 8}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 11}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 10}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 9}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 9}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 12}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 13}),
+   }),
+
+   new PandaMapping(
+      "192.168.88.101", new ChannelMapping[] { //G4
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 25}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 23}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 43}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 45}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 44}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 41}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 42}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 21}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 22}),
+   }),
+  
     new PandaMapping(
-      "10.200.1.30", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 40, 41, 42 }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),
-        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[] { 34, 35, 36 }),
-//        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 
-//         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1}),       // 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[] { 1,1}),              //  J16
-//     }),
-
-     // new PandaMapping(
-     //   "10.200.1.32", new ChannelMapping[] {
-     //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J3 
-     //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J4
-     //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 67, 68}), // 30 J7 
-     //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 69, 70}), //  J8 
-     //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),           // J13 
-     //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J14 
-     //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                //  J15
-     //     new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),              //  J16
-     // }),
+      "192.168.88.104", new ChannelMapping[] { // G3
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 26}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 27}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 18}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 17}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 18}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 15}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 14}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 29}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 30}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 31}),
+   }),
+
+   new PandaMapping( 
+      "192.168.88.105", new ChannelMapping[] { // G2
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 39}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 38}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 40}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 34}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 35}),
+
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 33}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 32}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
+   }),
   };
 }
 
@@ -362,7 +393,7 @@ class StaggeredTower {
 class PandaMapping {
   
   // How many channels are on the panda board
-  public final static int CHANNELS_PER_BOARD = 8;
+  public final static int CHANNELS_PER_BOARD = 16;
   
   // How many total pixels on the whole board
   public final static int PIXELS_PER_BOARD = ChannelMapping.PIXELS_PER_CHANNEL * CHANNELS_PER_BOARD;
@@ -396,7 +427,7 @@ class PandaMapping {
 class ChannelMapping {
 
   // How many cubes per channel xc_PB is configured for
-  public final static int CUBES_PER_CHANNEL = 4;  
+  public final static int CUBES_PER_CHANNEL = 1;  
 
   // How many total pixels on each channel
   public final static int PIXELS_PER_CHANNEL = Cube.POINTS_PER_CUBE * CUBES_PER_CHANNEL;