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 18409b0..0b1fb6e 100644 Binary files a/IoT-Cube-API/.vs/Arduino_IoT_LED_Cube_API/v14/.suo and b/IoT-Cube-API/.vs/Arduino_IoT_LED_Cube_API/v14/.suo differ 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)) {