Skip to content

Commit

Permalink
web finish
Browse files Browse the repository at this point in the history
  • Loading branch information
@monibu1548
monibu1548 committed Sep 28, 2015
1 parent f070aeb commit ea0b5ad
Show file tree
Hide file tree
Showing 7 changed files with 144 additions and 82 deletions.
Binary file added ArduinoActuator/._ArduinoActuator (JingyuJung의 충돌된 사본 2015-09-13).ino
View file
Binary file not shown.
Binary file added ArduinoActuator/._ArduinoActuator.ino
View file
Binary file not shown.
11 changes: 6 additions & 5 deletions ArduinoActuator/ArduinoActuator.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ void setup(){

pinMode(lightPin, OUTPUT);
pinMode(airconPin, OUTPUT);
digitalWrite(airconPin, HIGH);
}

void loop(){
Expand Down Expand Up @@ -172,7 +173,7 @@ void loop(){

}

delay(1000);
delay(500);
}

void OnLight(){
Expand All @@ -185,11 +186,11 @@ void OffLight(){
}
void OnAircon(){
// Pin 12 -> Aircon
digitalWrite(airconPin, HIGH);
digitalWrite(airconPin, LOW);
}
void OffAircon(){
// Pin 12 -> Aircon
digitalWrite(airconPin, LOW);
digitalWrite(airconPin, HIGH);
}
void OnProjector(){

Expand All @@ -200,7 +201,7 @@ void OnProjector(){

// Control Servomoter
int pos;
for(pos = 0; pos <= 180; pos += 1) // goes from 0 degrees to 180 degrees
for(pos = 0; pos <= 180; pos += 3) // goes from 0 degrees to 180 degrees
{ // in steps of 1 degree
projServo.write(pos); // tell servo to go to position in variable 'pos'
delay(15); // waits 15ms for the servo to reach the position
Expand All @@ -216,7 +217,7 @@ void OffProjector(){
}

int pos;
for(pos = 180; pos>=0; pos-=1) // goes from 180 degrees to 0 degrees
for(pos = 180; pos>=0; pos-=3) // goes from 180 degrees to 0 degrees
{
projServo.write(pos); // tell servo to go to position in variable 'pos'
delay(15); // waits 15ms for the servo to reach the position
Expand Down
Binary file added RaspO2Ogateway/src/Arduino/._ArduinoManager.class
View file
Binary file not shown.
Binary file added RaspO2Ogateway/src/Arduino/._ArduinoManager.java
View file
Binary file not shown.
44 changes: 28 additions & 16 deletions WebMonitering/JS/loadData.js
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,37 @@
var tempData101 = $('#temp101');
var humData101 = $('#hum101');
var useData101 = $('#user101');
var Data101 = $('#data101');

var btnLight101 = $('#btnLight101');
var btnBeam101 = $('#btnBeam101');
var btnAircon101 = $('#btnAircon101');

var tempData102 = $('#temp102');
var humData102 = $('#hum102');
var useData102 = $('#user102');

var btnLight102 = $('#btnLight102');
var btnBeam102 = $('#btnBeam102');
var btnAircon102 = $('#btnAircon102');
var Data102 = $('#data102');

var loadingData = function(){

$.getJSON('http://49.142.11.147:3000/1', function(json){
tempData101.text(json.temp);

$.ajax({
url: "http://growingdever.cafe24.com:3001/1",
type: 'GET',
success: function(res) {
Data101.val(res.temp +" "+res.hum + " " + res.inuse);
},
error: function(res){
alert("errer 101");
console.log(res);
}

});

$.ajax({
url: "http://growingdever.cafe24.com:3001/2",
type: 'GET',
success: function(res) {
Data102.val(res.temp +" "+res.hum + " " + res.inuse);
},
error: function(res){
alert("error 102");
console.log(res);
}
});



}


Expand Down
171 changes: 110 additions & 61 deletions WebMonitering/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,23 @@ <h3 class="Room">101 호</h3>
</div>

<div class="TextData">
<img class="data" id="temp101"></img>
<img class="data" id="hum101">Loading...</img>
<img class="data" id="use101"></img>
<img class="data">온도</img>
<img class="data">습도</img>
<img class="data">사용유무</img>
</div>

<div class="TextData">
<img class="data"></img>
<img class="data"></img>
<img class="data"></img>
</div>


<div class="TextData" style="text-align:center">
<input type="text" class="data" id="data101" value="Loading.." style="text-align:center"/>
</div>

<div class="DataFrame">
<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>
Expand All @@ -60,16 +67,22 @@ <h3 class="Room">102 호</h3>
</div>

<div class="TextData">
<img class="data" id="temp101"></img>
<img class="data" id="hum101">Loading...</img>
<img class="data" id="use101"></img>
<img class="data">온도</img>
<img class="data">습도</img>
<img class="data">사용유무</img>
</div>

<div class="TextData">
<img class="data"></img>
<img class="data"></img>
<img class="data"></img>
</div>

<div class="TextData" style="text-align:center">
<input type="text" class="data" id="data102" value="Loading.." style="text-align:center"/>
</div>

<div class="DataFrame">
<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>
Expand All @@ -87,16 +100,23 @@ <h3 class="Room">103 호</h3>
</div>

<div class="TextData">
<img class="data">온도</img>
<img class="data">습도</img>
<img class="data">사용유무</img>
</div>

<div class="TextData">
<img class="data"></img>
<img class="data"></img>
<img class="data">Loading...</img>
<img class="data"></img>
</div>


<div class="TextData" style="text-align:center">
<input type="text" class="data" value="Loading.." style="text-align:center"/>
</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">
</div>


<p class="ui-li-aside">1F</p>
</a></li>
Expand All @@ -110,19 +130,23 @@ <h3 class="Room">104 호</h3>
<img src="/Res/waterIcon.png" alt="" class="DataIcon">
<img src="/Res/usingIcon.png" alt="" class="DataIcon">
</div>

<div class="TextData">

<div class="TextData">
<img class="data">온도</img>
<img class="data">습도</img>
<img class="data">사용유무</img>
</div>

<div class="TextData">
<img class="data"></img>
<img class="data"></img>
<img class="data">Loading...</img>
<img class="data"></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">
</div>


<div class="TextData" style="text-align:center">
<input type="text" class="data" value="Loading.." style="text-align:center"/>
</div>

<p class="ui-li-aside">1F</p>
</a></li>

Expand All @@ -137,17 +161,23 @@ <h3 class="Room">105 호</h3>
</div>

<div class="TextData">
<img class="data">온도</img>
<img class="data">습도</img>
<img class="data">사용유무</img>
</div>

<div class="TextData">
<img class="data"></img>
<img class="data"></img>
<img class="data">Loading...</img>
<img class="data"></img>
</div>


<div class="TextData" style="text-align:center">
<input type="text" class="data" value="Loading.." style="text-align:center"/>
</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">
</div>


<p class="ui-li-aside">1F</p>
</a></li>

Expand All @@ -162,16 +192,23 @@ <h3 class="Room">106 호</h3>
</div>

<div class="TextData">
<img class="data">온도</img>
<img class="data">습도</img>
<img class="data">사용유무</img>
</div>

<div class="TextData">
<img class="data"></img>
<img class="data"></img>
<img class="data">Loading...</img>
<img class="data"></img>
</div>


<div class="TextData" style="text-align:center">
<input type="text" class="data" value="Loading.." style="text-align:center"/>
</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">
</div>


<p class="ui-li-aside">1F</p>
</a></li>
Expand All @@ -186,17 +223,23 @@ <h3 class="Room">107 호</h3>
<img src="/Res/usingIcon.png" alt="" class="DataIcon">
</div>

<div class="TextData">
<div class="TextData">
<img class="data">온도</img>
<img class="data">습도</img>
<img class="data">사용유무</img>
</div>

<div class="TextData">
<img class="data"></img>
<img class="data"></img>
<img class="data">Loading...</img>
<img class="data"></img>
</div>
</div>

<div class="TextData" style="text-align:center">
<input type="text" class="data" value="Loading.." style="text-align:center"/>
</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">
</div>


<p class="ui-li-aside">1F</p>
</a></li>
Expand All @@ -210,18 +253,24 @@ <h3 class="Room">108 호</h3>
<img src="/Res/waterIcon.png" alt="" class="DataIcon">
<img src="/Res/usingIcon.png" alt="" class="DataIcon">
</div>

<div class="TextData">

<div class="TextData">
<img class="data">온도</img>
<img class="data">습도</img>
<img class="data">사용유무</img>
</div>

<div class="TextData">
<img class="data"></img>
<img class="data"></img>
<img class="data">Loading...</img>
<img class="data"></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">
</div>
<div class="TextData" style="text-align:center">
<input type="text" class="data" value="Loading.." style="text-align:center"/>
</div>



<p class="ui-li-aside">1F</p>
</a></li>
Expand Down

0 comments on commit ea0b5ad

Please sign in to comment.