Add dht library for arduino

monibu1548 · Sep 10, 2015 · 239da9b · 239da9b
1 parent 7a3ee41
commit 239da9b
Show file tree

Hide file tree

Showing 43 changed files with 21 additions and 28 deletions.
diff --git 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
diff --git a/README.md b/README.md
diff --git a/RaspO2Ogateway/.idea/.name b/RaspO2Ogateway/.idea/.name
diff --git a/RaspO2Ogateway/.idea/compiler.xml b/RaspO2Ogateway/.idea/compiler.xml
diff --git a/RaspO2Ogateway/.idea/copyright/profiles_settings.xml b/RaspO2Ogateway/.idea/copyright/profiles_settings.xml
diff --git a/RaspO2Ogateway/.idea/inspectionProfiles/Project_Default.xml b/RaspO2Ogateway/.idea/inspectionProfiles/Project_Default.xml
diff --git a/RaspO2Ogateway/.idea/inspectionProfiles/profiles_settings.xml b/RaspO2Ogateway/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/RaspO2Ogateway/.idea/misc.xml b/RaspO2Ogateway/.idea/misc.xml
diff --git a/RaspO2Ogateway/.idea/modules.xml b/RaspO2Ogateway/.idea/modules.xml
diff --git a/RaspO2Ogateway/.idea/uiDesigner.xml b/RaspO2Ogateway/.idea/uiDesigner.xml
diff --git a/RaspO2Ogateway/.idea/vcs.xml b/RaspO2Ogateway/.idea/vcs.xml
diff --git a/RaspO2Ogateway/.idea/workspace.xml b/RaspO2Ogateway/.idea/workspace.xml
diff --git a/RaspO2Ogateway/RaspO2Ogateway.iml b/RaspO2Ogateway/RaspO2Ogateway.iml
diff --git a/RaspO2Ogateway/lib/RXTXcomm.jar b/RaspO2Ogateway/lib/RXTXcomm.jar
diff --git a/RaspO2Ogateway/lib/json-simple-1.1.1.jar b/RaspO2Ogateway/lib/json-simple-1.1.1.jar
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/AppData/ReferenceValue.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/AppData/ReferenceValue.class
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/Arduino/ArduinoManager.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/Arduino/ArduinoManager.class
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/Arduino/HWcontroller.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/Arduino/HWcontroller.class
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/HTTP/HTTPcontroller.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/HTTP/HTTPcontroller.class
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/HTTP/HTTPmanager.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/HTTP/HTTPmanager.class
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/IotGateway.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/IotGateway.class
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/Protocol/Data.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/Protocol/Data.class
diff --git a/RaspO2Ogateway/src/AppData/ReferenceValue.java b/RaspO2Ogateway/src/AppData/ReferenceValue.java
diff --git a/RaspO2Ogateway/src/Arduino/ArduinoManager.java b/RaspO2Ogateway/src/Arduino/ArduinoManager.java
diff --git a/RaspO2Ogateway/src/Arduino/HWcontroller.java b/RaspO2Ogateway/src/Arduino/HWcontroller.java
diff --git a/RaspO2Ogateway/src/HTTP/HTTPcontroller.java b/RaspO2Ogateway/src/HTTP/HTTPcontroller.java
diff --git a/RaspO2Ogateway/src/HTTP/HTTPmanager.java b/RaspO2Ogateway/src/HTTP/HTTPmanager.java
diff --git a/RaspO2Ogateway/src/IotGateway.java b/RaspO2Ogateway/src/IotGateway.java
diff --git a/RaspO2Ogateway/src/Protocol/Data.java b/RaspO2Ogateway/src/Protocol/Data.java
diff --git a/WebMonitering/CSS/style.css b/WebMonitering/CSS/style.css
diff --git 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
diff --git a/WebMonitering/Res/aincon_off.png b/WebMonitering/Res/aincon_off.png
diff --git a/WebMonitering/Res/aircon_on.png b/WebMonitering/Res/aircon_on.png
diff --git a/WebMonitering/Res/beam_off.png b/WebMonitering/Res/beam_off.png
diff --git a/WebMonitering/Res/beam_on.png b/WebMonitering/Res/beam_on.png
diff --git a/WebMonitering/Res/light_off.png b/WebMonitering/Res/light_off.png
diff --git a/WebMonitering/Res/light_on.png b/WebMonitering/Res/light_on.png
diff --git a/WebMonitering/Res/tempIcon.png b/WebMonitering/Res/tempIcon.png
diff --git a/WebMonitering/Res/usingIcon.png b/WebMonitering/Res/usingIcon.png
diff --git a/WebMonitering/Res/waterIcon.png b/WebMonitering/Res/waterIcon.png
diff --git a/WebMonitering/index.html b/WebMonitering/index.html
@@ -8,11 +8,7 @@
 	<link rel="stylesheet" href="./CSS/style.css">
 	<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
 	<script src="http://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.js"></script>
-	<script src="JS/loadData.js"></script>
-
-	<script>
-		$(document).ready(loadingData());
-	</script>
+
 
 </head>
 <body>
@@ -58,26 +54,28 @@ <h3 class="Room">101 호</h3>
 
             	<h3 class="Room">102 호</h3>
               	<div class="DataFrame">
-                <img src="/Res/tempIcon.png" alt="" class="DataIcon LightStateOn" id="btnLight102">
-                <img src="/Res/waterIcon.png" alt="" class="DataIcon BeamStateOn" id="btnBeam102">
-                <img src="/Res/usingIcon.png" alt="" class="DataIcon AirconStateOn" id="btnAircon102">
+                <img src="/Res/tempIcon.png" alt="" class="DataIcon">
+                <img src="/Res/waterIcon.png" alt="" class="DataIcon">
+                <img src="/Res/usingIcon.png" alt="" class="DataIcon">
 				</div>
 
               <div class="TextData">
-              	<img class="data"></img>
-              	<img class="data">Loading...</img>
-              	<img class="data"></img>
+              	<img class="data" id="temp101"></img>
+              	<img class="data" id="hum101">Loading...</img>
+              	<img class="data" id="use101"></img>
               </div>
 
               <div class="DataFrame">
-                <img src="/Res/light_on.png" alt="" class="ControlIcon">
-                <img src="/Res/beam_on.png" alt="" class="ControlIcon">
-                <img src="/Res/aircon_on.png" alt="" class="ControlIcon">
+                <img src="/Res/light_on.png" alt="" class="ControlIcon LightStateOn" id="btnLight101">
+                <img src="/Res/beam_on.png" alt="" class="ControlIcon BeamStateOn" id="btnBeam101">
+                <img src="/Res/aircon_on.png" alt="" class="ControlIcon AirconStateOn" id="btnAircon101">
 				</div>          
 
                 <p class="ui-li-aside">1F</p>
             </a></li>
 
+
+
             <ul data-role="listview" data-inset="true">
         	<li class="ClassData"><a href="#">
 
@@ -234,5 +232,11 @@ <h3 class="Room">108 호</h3>
 
 </div><!-- /page -->
 
+	<script src="JS/loadData.js"></script>
+
+	<script>
+		$(document).ready(loadingData());
+	</script>
+
 </body>
 </html>