repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make panda mappings a bit safer
[SugarCubes.git]
/
_PandaDriver.pde
diff --git
a/_PandaDriver.pde
b/_PandaDriver.pde
index d90613e9de483b4c04ab8cebd5641edd87919f20..c95f9b0ed301efbdced58bcafbd09eda5fee3d51 100644
(file)
--- a/
_PandaDriver.pde
+++ b/
_PandaDriver.pde
@@
-31,12
+31,6
@@
public class PandaDriver {
// List of point indices on the board
private final int[] points;
// List of point indices on the board
private final int[] points;
- // How many channels are on the panda board
- private final static int CHANNELS_PER_BOARD = 8;
-
- // How many cubes per channel xc_PB is configured for
- private final static int CUBES_PER_CHANNEL = 4;
-
// Packet data
private final byte[] packet = new byte[4*352]; // TODO: de-magic-number, UDP related?
// Packet data
private final byte[] packet = new byte[4*352]; // TODO: de-magic-number, UDP related?
@@
-54,15
+48,13
@@
public class PandaDriver {
public void toggle() {
enabled = !enabled;
public void toggle() {
enabled = !enabled;
- println("PandaBoard
Output
/" + ip + ": " + (enabled ? "ON" : "OFF"));
+ println("PandaBoard/" + ip + ": " + (enabled ? "ON" : "OFF"));
}
private ArrayList<Integer> buildMappedList(Model model, int[][] channelList) {
ArrayList<Integer> points = new ArrayList<Integer>();
}
private ArrayList<Integer> buildMappedList(Model model, int[][] channelList) {
ArrayList<Integer> points = new ArrayList<Integer>();
- for (int chi = 0; chi < CHANNELS_PER_BOARD; ++chi) {
- int[] channel = (chi < channelList.length) ? channelList[chi] : new int[]{};
- for (int ci = 0; ci < CUBES_PER_CHANNEL; ++ci) {
- int cubeNumber = (ci < channel.length) ? channel[ci] : 0;
+ for (int[] channel : channelList) {
+ for (int cubeNumber : channel) {
if (cubeNumber == 0) {
for (int i = 0; i < Cube.POINTS_PER_CUBE; ++i) {
points.add(0);
if (cubeNumber == 0) {
for (int i = 0; i < Cube.POINTS_PER_CUBE; ++i) {
points.add(0);