fix bug

Author: AndyLi23

core/src/main/java/com/amhsrobotics/circuitsim/hardware/devices/Falcon.java

@@ -51,9 +51,8 @@ public String getCAN(Cable c1, Cable c2) {
             } else if (getOther(2) instanceof PowerDistributionPanel && getOther(3) instanceof PowerDistributionPanel) {
                 if ((getNum(2) == 9 && getNum(3) == 8) || (getNum(2) == 7 && getNum(3) == 6)) {
                     return "PDP";
-                } else {
-                    return "Incorrectly wired to PDP";
                 }
+                return "Incorrectly wired to PDP";
             } else if (getOther(2) instanceof PneumaticsControlModule && getOther(3) instanceof PneumaticsControlModule) {
                 if ((getNum(2) == 5 && getNum(3) == 4) || (getNum(2) == 3 && getNum(3) == 2)) {
                     return "PCM";
@@ -150,7 +149,7 @@ public String check() {
                         (getCAN(get(3), get(2)).equals("RoboRIO") && getCAN(get(5), get(4)).equals("PDP")))) {
             String ans = "";
 
-            if (!getCAN(get(3), get(2)).equals("PDP") && !getCAN(get(3), get(2)).equals("PCM")) {
+            if (!getCAN(get(3), get(2)).equals("PDP") && !getCAN(get(3), get(2)).equals("PCM") && !getCAN(get(3), get(2)).equals("RoboRIO")) {
                 ans += getCAN(get(3), get(2));
             } else {
                 if (getCAN(get(3), get(2)).equals("PDP")) {
@@ -160,7 +159,7 @@ public String check() {
                 }
             }
 
-            if (!getCAN(get(5), get(4)).equals("PDP") && !getCAN(get(5), get(4)).equals("PCM")) {
+            if (!getCAN(get(5), get(4)).equals("PDP") && !getCAN(get(5), get(4)).equals("PCM") && !getCAN(get(5), get(4)).equals("RoboRIO")) {
                 if (!getCAN(get(5), get(4)).equals(ans)) {
                     if (ans.length() > 0) {
                         ans += "\n";

core/src/main/java/com/amhsrobotics/circuitsim/wiring/CableManager.java

@@ -133,13 +133,15 @@ public static void mergeCables(Cable cable1, Cable cable2, boolean cable1begin,
                                 cable2.mergeCable(cable1, cable1begin, cable2begin);
                                 cable2.color2 = cable1.color;
                                 deleteCable(cable1);
+                                CircuitGUIManager.getSim().changed = true;
                             } else {
                                 CircuitGUIManager.popup.activateError("A crimped cable cannot be connected to a regular cable");
                             }
                         } else {
                             if (!(cable1 instanceof CrimpedCable)) {
                                 cable1.mergeCable(cable2, cable2begin, cable1begin);
                                 deleteCable(cable2);
+                                CircuitGUIManager.getSim().changed = true;
                             } else {
                                 CircuitGUIManager.popup.activateError("A crimped cable cannot be connected to a regular cable");
                             }