Some local changes, ensuring remote is up to date

vjeeva · Sep 18, 2016 · 3ed2062 · 3ed2062
1 parent e173c3d
commit 3ed2062
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 46 deletions.
diff --git a/IoT-Cube-API/.vs/Arduino_IoT_LED_Cube_API/v14/.suo b/IoT-Cube-API/.vs/Arduino_IoT_LED_Cube_API/v14/.suo
diff --git a/IoT-Cube-API/Arduino_IoT_LED_Cube_API/Scripts/main.js b/IoT-Cube-API/Arduino_IoT_LED_Cube_API/Scripts/main.js
@@ -1,53 +1,15 @@
 function railGun() {
     $.ajax({
         cache: false,
-        url: 'CubeControl/SendCommand/0',
+        url: 'GDO/ToggleDoor',
         type: 'GET',
         data: "",
         success: function (data) {
-            if (data != null) {
-                if (data.Message == "Already executed") alert("Cannot play this animation again. Please choose another animation.");
-            } else {
-                alert("An error has occurred.");
-            }
-        },
-        error: function (e) {
-            alert("An error has occurred.");
-        }
-    });
-}
-
-function cornerCube() {
-    $.ajax({
-        cache: false,
-        url: 'CubeControl/SendCommand/1',
-        type: 'GET',
-        data: "",
-        success: function (data) {
-            if (data != null) {
-                if (data.Message == "Already executed") alert("Cannot play this animation again. Please choose another animation.");
-            } else {
-                alert("An error has occurred.");
-            }
-        },
-        error: function (e) {
-            alert("An error has occurred.");
-        }
-    });
-}
-
-function risingX() {
-    $.ajax({
-        cache: false,
-        url: 'CubeControl/SendCommand/2',
-        type: 'GET',
-        data: "",
-        success: function (data) {
-            if (data != null) {
-                if (data.Message == "Already executed") alert("Cannot play this animation again. Please choose another animation.");
-            } else {
-                alert("An error has occurred.");
-            }
+            //if (data != null) {
+            //    if (data.Message == "Already executed") alert("Cannot play this animation again. Please choose another animation.");
+            //} else {
+            //    alert("An error has occurred.");
+            //}
         },
         error: function (e) {
             alert("An error has occurred.");

diff --git a/Processing-Serial-Code/Processing_CmdToArduino/Processing_CmdToArduino.pde b/Processing-Serial-Code/Processing_CmdToArduino/Processing_CmdToArduino.pde
@@ -10,11 +10,11 @@ void setup(){
 }
 
 void draw(){
-  input = loadStrings("http://192.168.0.10:51111/Commands/commands.txt"); 
+  input = loadStrings("http://192.168.0.15:51111/Commands/commands.txt"); 
   if (input != null && input.length != 0){
    String s_last = input[0];
    delay(200);
-   input = loadStrings("http://192.168.0.10:51111/Commands/commands.txt");
+   input = loadStrings("http://192.168.0.15:51111/Commands/commands.txt");
    if (input.length != 0) {
      String s_current = input[0];
      if (!s_current.equals(s_last)) {