repositories / SugarCubes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
New code for Grizzlies
[SugarCubes.git] / _Mappings.pde
diff --git a/_Mappings.pde b/_Mappings.pde
index 171ff13e26808b056c55392661fecb621050a8a4..5e7e05ef81eb0764442409056e5fe245499e8ddb 100644 (file)
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -243,52 +243,153 @@ 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
+      "192.168.88.100", new ChannelMapping[] {
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+   }),
+   new PandaMapping(
+      "192.168.88.101", new ChannelMapping[] {
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+   }),
+  new PandaMapping(
+      "192.168.88.102", new ChannelMapping[] {
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+   }),
+  new PandaMapping(
+      "192.168.88.103", new ChannelMapping[] {
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
     }),
     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[] { }),
-    }),    
-    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
-   }),    
+      "192.168.88.104", new ChannelMapping[] {
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+   }),
+   new PandaMapping( 
+      "192.168.88.105", new ChannelMapping[] {
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+        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[] { 8}),
+   }),
+   // new PandaMapping(
+   //    "192.168.88.102", new ChannelMapping[] {
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+   //      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[] { 8}),
+   // }),
+   // new PandaMapping(
+   //    "192.168.88.104", new ChannelMapping[] {
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+   //      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[] { 8}),
+   // }),
+   // new PandaMapping(
+   //    "192.168.88.105", new ChannelMapping[] {
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
+   //      new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
+   //      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[] { 8}),
+   // }),
+      
 //     new PandaMapping(
 //       "10.200.1.31", new ChannelMapping[] {
 //         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 65, 66}),       // J3 
@@ -362,7 +463,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 +497,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;
Last FOSS code of SugarCubes - http://symmetrylabs.com/