diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 32858aa..a4cd323 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*.class # Mobile Tools for Java (J2ME) .mtj.tmp/ diff --git a/ArduinoActuator/ArduinoActuator.ino b/ArduinoActuator/ArduinoActuator.ino old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/.name b/RaspO2Ogateway/.idea/.name old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/compiler.xml b/RaspO2Ogateway/.idea/compiler.xml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/copyright/profiles_settings.xml b/RaspO2Ogateway/.idea/copyright/profiles_settings.xml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/inspectionProfiles/Project_Default.xml b/RaspO2Ogateway/.idea/inspectionProfiles/Project_Default.xml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/inspectionProfiles/profiles_settings.xml b/RaspO2Ogateway/.idea/inspectionProfiles/profiles_settings.xml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/misc.xml b/RaspO2Ogateway/.idea/misc.xml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/modules.xml b/RaspO2Ogateway/.idea/modules.xml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/uiDesigner.xml b/RaspO2Ogateway/.idea/uiDesigner.xml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/vcs.xml b/RaspO2Ogateway/.idea/vcs.xml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/.idea/workspace.xml b/RaspO2Ogateway/.idea/workspace.xml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/RaspO2Ogateway.iml b/RaspO2Ogateway/RaspO2Ogateway.iml old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/lib/RXTXcomm.jar b/RaspO2Ogateway/lib/RXTXcomm.jar old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/lib/json-simple-1.1.1.jar b/RaspO2Ogateway/lib/json-simple-1.1.1.jar old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/AppData/ReferenceValue.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/AppData/ReferenceValue.class old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/Arduino/ArduinoManager.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/Arduino/ArduinoManager.class old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/Arduino/HWcontroller.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/Arduino/HWcontroller.class old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/HTTP/HTTPcontroller.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/HTTP/HTTPcontroller.class old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/HTTP/HTTPmanager.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/HTTP/HTTPmanager.class old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/IotGateway.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/IotGateway.class old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/Protocol/Data.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/Protocol/Data.class old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/src/AppData/ReferenceValue.java b/RaspO2Ogateway/src/AppData/ReferenceValue.java old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/src/Arduino/ArduinoManager.java b/RaspO2Ogateway/src/Arduino/ArduinoManager.java old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/src/Arduino/HWcontroller.java b/RaspO2Ogateway/src/Arduino/HWcontroller.java old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/src/HTTP/HTTPcontroller.java b/RaspO2Ogateway/src/HTTP/HTTPcontroller.java old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/src/HTTP/HTTPmanager.java b/RaspO2Ogateway/src/HTTP/HTTPmanager.java old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/src/IotGateway.java b/RaspO2Ogateway/src/IotGateway.java old mode 100644 new mode 100755 diff --git a/RaspO2Ogateway/src/Protocol/Data.java b/RaspO2Ogateway/src/Protocol/Data.java old mode 100644 new mode 100755 diff --git a/WebMonitering/CSS/style.css b/WebMonitering/CSS/style.css old mode 100644 new mode 100755 diff --git a/WebMonitering/JS/loadData.js b/WebMonitering/JS/loadData.js old mode 100644 new mode 100755 index 3a26ad0..109074a --- a/WebMonitering/JS/loadData.js +++ b/WebMonitering/JS/loadData.js @@ -16,19 +16,9 @@ var btnAircon102 = $('#btnAircon102'); var loadingData = function(){ - $.ajax({ - type:'GET', - dataType : 'jsonp', - cache : false, - url : 'http://49.142.11.147:3000/1', - success : function(data) { - alert(data); - }, - headers:{ - "Access-Control-Allow-Origin" : "*", - "Access-Control-Allow-Headers": "x-requested-with", - "Access-Control-Allow-Methods": "POST, GET, OPTIONS, DELETE" - } + $.getJSON('http://49.142.11.147:3000/1', function(json){ + tempData101.text(json.temp); + }); } diff --git a/WebMonitering/Res/BackGround.jpg b/WebMonitering/Res/BackGround.jpg old mode 100644 new mode 100755 diff --git a/WebMonitering/Res/aincon_off.png b/WebMonitering/Res/aincon_off.png old mode 100644 new mode 100755 diff --git a/WebMonitering/Res/aircon_on.png b/WebMonitering/Res/aircon_on.png old mode 100644 new mode 100755 diff --git a/WebMonitering/Res/beam_off.png b/WebMonitering/Res/beam_off.png old mode 100644 new mode 100755 diff --git a/WebMonitering/Res/beam_on.png b/WebMonitering/Res/beam_on.png old mode 100644 new mode 100755 diff --git a/WebMonitering/Res/light_off.png b/WebMonitering/Res/light_off.png old mode 100644 new mode 100755 diff --git a/WebMonitering/Res/light_on.png b/WebMonitering/Res/light_on.png old mode 100644 new mode 100755 diff --git a/WebMonitering/Res/tempIcon.png b/WebMonitering/Res/tempIcon.png old mode 100644 new mode 100755 diff --git a/WebMonitering/Res/usingIcon.png b/WebMonitering/Res/usingIcon.png old mode 100644 new mode 100755 diff --git a/WebMonitering/Res/waterIcon.png b/WebMonitering/Res/waterIcon.png old mode 100644 new mode 100755 diff --git a/WebMonitering/index.html b/WebMonitering/index.html old mode 100644 new mode 100755 index 0d653c5..11992f2 --- a/WebMonitering/index.html +++ b/WebMonitering/index.html @@ -8,11 +8,7 @@ - - - + @@ -58,26 +54,28 @@

101 호

102 호

- - - + + +
- - Loading... - + + Loading... +
- - - + + +

1F

+ +