Make panda mappings a bit safer

[SugarCubes.git] / _PandaDriver.pde

diff --git a/_PandaDriver.pde b/_PandaDriver.pde
index 60ab343ab2add9faca1d12e2c2d0da5829b4fabb..c95f9b0ed301efbdced58bcafbd09eda5fee3d51 100644 (file)
--- a/_PandaDriver.pde
+++ b/_PandaDriver.pde
@@ -16,20 +16,27 @@ import oscP5.*;
  */
 public class PandaDriver {
 
+  // IP address
+  public final String ip;
+  
   // Address to send to
   private final NetAddress address;
   
+  // Whether board output is enabled
+  private boolean enabled = false;
+  
   // OSC message
   private final OscMessage message;
 
   // List of point indices on the board
   private final int[] points;
-
+  
   // Packet data
-  private final byte[] packet = new byte[4*352]; // TODO: de-magic-number
+  private final byte[] packet = new byte[4*352]; // TODO: de-magic-number, UDP related?
 
-  public PandaDriver(NetAddress address, Model model, int[][] channelList) {
-    this.address = address;
+  public PandaDriver(String ip, Model model, int[][] channelList) {
+    this.ip = ip;
+    this.address = new NetAddress(ip, 9001);
     message = new OscMessage("/shady/pointbuffer");
     List<Integer> pointList = buildMappedList(model, channelList);
     points = new int[pointList.size()];
@@ -38,13 +45,18 @@ public class PandaDriver {
       points[i++] = value;
     }
   }
+  
+  public void toggle() {
+    enabled = !enabled;
+    println("PandaBoard/" + ip + ": " + (enabled ? "ON" : "OFF"));    
+  } 
 
   private ArrayList<Integer> buildMappedList(Model model, int[][] channelList) {
     ArrayList<Integer> points = new ArrayList<Integer>();
     for (int[] channel : channelList) {
       for (int cubeNumber : channel) {
         if (cubeNumber == 0) {
-          for (int i = 0; i < (Cube.FACES_PER_CUBE*Face.STRIPS_PER_FACE*Strip.POINTS_PER_STRIP); ++i) {
+          for (int i = 0; i < Cube.POINTS_PER_CUBE; ++i) {
             points.add(0);
           }
         } else {
@@ -68,6 +80,9 @@ public class PandaDriver {
   }
 
   public final void send(int[] colors) {
+    if (!enabled) {
+      return;
+    }
     int len = 0;
     int packetNum = 0;
     for (int index : points) {
@@ -82,21 +97,21 @@ public class PandaDriver {
 
       // Flush once packet is full buffer size
       if (len >= packet.length) {
-        sendPacket(packetNum++, len);
+        sendPacket(packetNum++);
         len = 0;
       }
     }
 
     // Flush any remaining data
     if (len > 0) {
-      sendPacket(packetNum++, len);
+      sendPacket(packetNum++);
     }
   }
   
-  private void sendPacket(int packetNum, int len) {
+  private void sendPacket(int packetNum) {
     message.clearArguments();
     message.add(packetNum);
-    message.add(len);
+    message.add(packet.length);
     message.add(packet);
     try {
       OscP5.flush(message, address);