Arduino finish

monibu1548 · Sep 11, 2015 · f070aeb · f070aeb
1 parent 810793c
commit f070aeb
Show file tree

Hide file tree

Showing 88 changed files with 65 additions and 512 deletions.
diff --git a/ArduinoActuator/._DHTlib b/ArduinoActuator/._DHTlib
diff --git a/ArduinoActuator/ArduinoActuator.ino b/ArduinoActuator/ArduinoActuator.ino
@@ -14,7 +14,6 @@
 // Pin 8 -> Light
 // Pin 9 -> Projector ( Servo ) PWM
 
-
 // Sensor Collect
 // Pin 2 -> DHT11
 // Pin 4 -> Motion 
@@ -41,6 +40,11 @@ int lightPin = 8;
 int airconPin = 12;
 int projPin = 9;
 
+// state
+#define PROJON 1
+#define PROJOFF 0
+int projState;
+
 int controlList[3] = {lightPin, airconPin, projPin};
 
 
@@ -58,6 +62,7 @@ void setup(){
   Serial.begin(9600);
   projServo.attach(projPin);
   projServo.write(0);
+  projState = PROJOFF;
   serialString = "";
 
   pinMode(MotionPin, INPUT); // declare sensor as input
@@ -167,7 +172,7 @@ void loop(){
 
     }
 
-  delay(1500);
+  delay(1000);
 }
 
 void OnLight(){
@@ -187,22 +192,38 @@ void OffAircon(){
   digitalWrite(airconPin, LOW);
 }
 void OnProjector(){
+
+  // Check change state
+  if(projState == PROJON){
+    return;
+    }
+
   // Control Servomoter
   int pos;
   for(pos = 0; pos <= 180; pos += 1) // 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 
   } 
+
+  projState = PROJON;
 }
 void OffProjector(){
+
+  // Check change state
+  if(projState == PROJOFF){
+    return;
+    }
+
   int pos;
     for(pos = 180; pos>=0; pos-=1)     // 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 
   } 
-  
+
   // Control Servomoter
+
+  projState = PROJOFF;
 }
 
diff --git a/ArduinoActuator/DHTlib/._dht.cpp b/ArduinoActuator/DHTlib/._dht.cpp
diff --git a/ArduinoActuator/DHTlib/._dht.h b/ArduinoActuator/DHTlib/._dht.h
diff --git a/ArduinoActuator/DHTlib/._examples b/ArduinoActuator/DHTlib/._examples
diff --git a/ArduinoActuator/DHTlib/._readme.txt b/ArduinoActuator/DHTlib/._readme.txt
diff --git a/ArduinoActuator/DHTlib/examples/._dht11_test b/ArduinoActuator/DHTlib/examples/._dht11_test
diff --git a/ArduinoActuator/DHTlib/examples/._dht21_test b/ArduinoActuator/DHTlib/examples/._dht21_test
diff --git a/ArduinoActuator/DHTlib/examples/._dht22_test b/ArduinoActuator/DHTlib/examples/._dht22_test
diff --git a/ArduinoActuator/DHTlib/examples/._dht33_test b/ArduinoActuator/DHTlib/examples/._dht33_test
diff --git a/ArduinoActuator/DHTlib/examples/._dht44_test b/ArduinoActuator/DHTlib/examples/._dht44_test
diff --git a/ArduinoActuator/DHTlib/examples/._dht_test1 b/ArduinoActuator/DHTlib/examples/._dht_test1
diff --git a/ArduinoActuator/DHTlib/examples/._dht_tuning b/ArduinoActuator/DHTlib/examples/._dht_tuning
diff --git a/ArduinoActuator/DHTlib/examples/dht11_test/._dht11_test.ino b/ArduinoActuator/DHTlib/examples/dht11_test/._dht11_test.ino
diff --git a/ArduinoActuator/DHTlib/examples/dht21_test/._dht21_test.ino b/ArduinoActuator/DHTlib/examples/dht21_test/._dht21_test.ino
diff --git a/ArduinoActuator/DHTlib/examples/dht22_test/._dht22_test.ino b/ArduinoActuator/DHTlib/examples/dht22_test/._dht22_test.ino
diff --git a/ArduinoActuator/DHTlib/examples/dht33_test/._dht33_test.ino b/ArduinoActuator/DHTlib/examples/dht33_test/._dht33_test.ino
diff --git a/ArduinoActuator/DHTlib/examples/dht44_test/._dht44_test.ino b/ArduinoActuator/DHTlib/examples/dht44_test/._dht44_test.ino
diff --git a/ArduinoActuator/DHTlib/examples/dht_test1/._dht_test1.ino b/ArduinoActuator/DHTlib/examples/dht_test1/._dht_test1.ino
diff --git a/ArduinoActuator/DHTlib/examples/dht_tuning/._dht_tuning.ino b/ArduinoActuator/DHTlib/examples/dht_tuning/._dht_tuning.ino
diff --git a/RaspO2Ogateway/._.idea b/RaspO2Ogateway/._.idea
diff --git a/RaspO2Ogateway/._RaspO2Ogateway.iml b/RaspO2Ogateway/._RaspO2Ogateway.iml
diff --git a/RaspO2Ogateway/._lib b/RaspO2Ogateway/._lib
diff --git a/RaspO2Ogateway/._out b/RaspO2Ogateway/._out
diff --git a/RaspO2Ogateway/._src b/RaspO2Ogateway/._src
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 b/RaspO2Ogateway/.idea/._copyright
diff --git a/RaspO2Ogateway/.idea/._inspectionProfiles b/RaspO2Ogateway/.idea/._inspectionProfiles
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/.idea/copyright/._profiles_settings.xml b/RaspO2Ogateway/.idea/copyright/._profiles_settings.xml
diff --git a/RaspO2Ogateway/.idea/inspectionProfiles/._profiles_settings.xml b/RaspO2Ogateway/.idea/inspectionProfiles/._profiles_settings.xml
diff --git a/RaspO2Ogateway/.idea/inspectionProfiles/._project_default.xml b/RaspO2Ogateway/.idea/inspectionProfiles/._project_default.xml
diff --git a/RaspO2Ogateway/.idea/workspace.xml b/RaspO2Ogateway/.idea/workspace.xml
diff --git a/RaspO2Ogateway/out/._production b/RaspO2Ogateway/out/._production
diff --git a/RaspO2Ogateway/out/production/._RaspO2Ogateway b/RaspO2Ogateway/out/production/._RaspO2Ogateway
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/._AppData b/RaspO2Ogateway/out/production/RaspO2Ogateway/._AppData
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/._Arduino b/RaspO2Ogateway/out/production/RaspO2Ogateway/._Arduino
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/._HTTP b/RaspO2Ogateway/out/production/RaspO2Ogateway/._HTTP
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/._IotGateway.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/._IotGateway.class
diff --git a/RaspO2Ogateway/out/production/RaspO2Ogateway/._Protocol b/RaspO2Ogateway/out/production/RaspO2Ogateway/._Protocol
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/Arduino/ArduinoManager.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/Arduino/ArduinoManager.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/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/out/production/RaspO2Ogateway/Protocol/Data.class b/RaspO2Ogateway/out/production/RaspO2Ogateway/Protocol/Data.class
diff --git a/RaspO2Ogateway/src/._AppData b/RaspO2Ogateway/src/._AppData
diff --git a/RaspO2Ogateway/src/._Arduino b/RaspO2Ogateway/src/._Arduino
diff --git a/RaspO2Ogateway/src/._HTTP b/RaspO2Ogateway/src/._HTTP
diff --git a/RaspO2Ogateway/src/._IotGateway.class b/RaspO2Ogateway/src/._IotGateway.class
diff --git a/RaspO2Ogateway/src/._IotGateway.java b/RaspO2Ogateway/src/._IotGateway.java
diff --git a/RaspO2Ogateway/src/._Protocol b/RaspO2Ogateway/src/._Protocol
diff --git a/RaspO2Ogateway/src/AppData/._ReferenceValue.class b/RaspO2Ogateway/src/AppData/._ReferenceValue.class
diff --git a/RaspO2Ogateway/src/AppData/._ReferenceValue.java b/RaspO2Ogateway/src/AppData/._ReferenceValue.java
diff --git a/RaspO2Ogateway/src/Arduino/._HWcontroller.class b/RaspO2Ogateway/src/Arduino/._HWcontroller.class
diff --git a/RaspO2Ogateway/src/Arduino/._HWcontroller.java b/RaspO2Ogateway/src/Arduino/._HWcontroller.java
diff --git a/RaspO2Ogateway/src/HTTP/._HTTPcontroller.class b/RaspO2Ogateway/src/HTTP/._HTTPcontroller.class
diff --git a/RaspO2Ogateway/src/HTTP/._HTTPcontroller.java b/RaspO2Ogateway/src/HTTP/._HTTPcontroller.java
diff --git a/RaspO2Ogateway/src/HTTP/._HTTPmanager.class b/RaspO2Ogateway/src/HTTP/._HTTPmanager.class
diff --git a/RaspO2Ogateway/src/HTTP/._HTTPmanager.java b/RaspO2Ogateway/src/HTTP/._HTTPmanager.java
diff --git a/RaspO2Ogateway/src/Protocol/._Data.class b/RaspO2Ogateway/src/Protocol/._Data.class
diff --git a/RaspO2Ogateway/src/Protocol/._Data.java b/RaspO2Ogateway/src/Protocol/._Data.java
diff --git a/WebMonitering/._CSS b/WebMonitering/._CSS
diff --git a/WebMonitering/._JS b/WebMonitering/._JS
diff --git a/WebMonitering/._Res b/WebMonitering/._Res
diff --git a/WebMonitering/._index.html b/WebMonitering/._index.html
diff --git a/WebMonitering/CSS/._style.css b/WebMonitering/CSS/._style.css
diff --git a/WebMonitering/JS/._loadData.js b/WebMonitering/JS/._loadData.js
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/배선도.key b/배선도.key