From 3ed20623ba2b0d966408c1fbb30cea3bac983206 Mon Sep 17 00:00:00 2001
From: vjeeva <vjeeva@uwaterloo.ca>
Date: Sun, 18 Sep 2016 13:36:44 -0400
Subject: [PATCH] Some local changes, ensuring remote is up to date

---
 .../.vs/Arduino_IoT_LED_Cube_API/v14/.suo     | Bin 148992 -> 148992 bytes
 .../Arduino_IoT_LED_Cube_API/Scripts/main.js  |  50 +++---------------
 .../Processing_CmdToArduino.pde               |   4 +-
 3 files changed, 8 insertions(+), 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
index 18409b0213497eff8f88f17372bb76f2c6bd5054..0b1fb6e77e86c28df556cb6d483a930cb88a2e27 100644
GIT binary patch
delta 3900
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

delta 3400
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

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
index 020ced1..abe9fa0 100644
--- 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
index 92efaf9..49ede8e 100644
--- 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)) {