Merge branch 'devel-2.x.x' into ccre2015

solar-engine · Mar 10, 2015 · 62d9345 · 62d9345
2 parents 6db7a14 + bab7805
commit 62d9345
Show file tree

Hide file tree

Showing 401 changed files with 14 additions and 102,987 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,4 @@
 /.metadata
 /RemoteSystemsTempFiles
 /Cobertura-2.0.3
+/Javadoc
diff --git a/CommonChickenRuntimeEngine/src/ccre/cluck/rpc/RPCManager.java b/CommonChickenRuntimeEngine/src/ccre/cluck/rpc/RPCManager.java
@@ -149,7 +149,6 @@ void checkRPCTimeouts() {
                 }
             }
             for (String rmt : toRemove) {
-                Logger.warning("Timeout on RPC response for " + rmt);
                 timeouts.remove(rmt);
                 try {
                     bindings.remove(rmt).close();

diff --git a/CommonChickenRuntimeEngine/src/ccre/instinct/InstinctMultiModule.java b/CommonChickenRuntimeEngine/src/ccre/instinct/InstinctMultiModule.java
@@ -183,14 +183,14 @@ public Entry[] queryRConf() throws InterruptedException {
                 outs[0] = RConf.title("Select Autonomous Mode");
                 int i = 1;
                 for (InstinctModeModule m : modes) {
-                    outs[i++] = (m == mode) ? RConf.string(mode.getModeName()) : RConf.button(mode.getModeName());
+                    outs[i++] = (m == mode) ? RConf.string(m.getModeName()) : RConf.button(m.getModeName());
                 }
                 outs[i] = RConf.autoRefresh(5000);
                 return outs;
             }
 
             public boolean signalRConf(int field, byte[] data) throws InterruptedException {
-                if (field >= 1 && field < modes.size()) {
+                if (field >= 1 && field <= modes.size()) {
                     setActiveMode(modes.get(field - 1));
                     return true;
                 }

diff --git a/Javadoc/allclasses-frame.html b/Javadoc/allclasses-frame.html
diff --git a/Javadoc/allclasses-noframe.html b/Javadoc/allclasses-noframe.html