diff --git a/DBHelper.py b/DBHelper.py index aaca2dfa1..f92c53870 100644 --- a/DBHelper.py +++ b/DBHelper.py @@ -111,71 +111,71 @@ def delete_thief_photo(user_photo): # Motor signal getter def get_motor(): - motor = db.child("signal").child("motor").get().val() + motor = db.child("signal").child("1").child("motor").get().val() return motor # Motor signal setter def set_motor(motor): - db.child("signal").child("motor").set(motor) + db.child("signal").child("1").child("motor").set(motor) # Alarm signal getter def get_alarm(): - alarm = db.child("signal").child("alarm").get().val() + alarm = db.child("signal").child("1").child("alarm").get().val() return alarm # Alarm signal setter def set_alarm(alarm): - db.child("signal").child("alarm").set(alarm) + db.child("signal").child("1").child("alarm").set(alarm) # Power signal getter def get_power(): - alarm = db.child("signal").child("power").get().val() + alarm = db.child("signal").child("1").child("power").get().val() return alarm # Power signal setter def set_power(power): - db.child("signal").child("power").set(power) + db.child("signal").child("1").child("power").set(power) # Returns the first name or else an empty string. def get_signal_firstname(): - firstname = db.child("signal_2").child("First Name").get().val() + firstname = db.child("signal").child("2").child("First Name").get().val() return firstname # Returns the last name or else an empty string. def get_signal_lastname(): - lastname = db.child("signal_2").child("Last Name").get().val() + lastname = db.child("signal").child("2").child("Last Name").get().val() return lastname # Returns the e-mail or else an empty string. def get_signal_email(): - email = db.child("signal_2").child("E-Mail").get().val() + email = db.child("signal").child("2").child("E-Mail").get().val() return email # Returns the phone or else an empty string. def get_signal_phone(): - phone = db.child("signal_2").child("Phone").get().val() + phone = db.child("signal").child("2").child("Phone").get().val() return phone # Returns the address or else an empty string. def get_signal_address(): - address = db.child("signal_2").child("Address").get().val() + address = db.child("signal").child("2").child("Address").get().val() return address # Uploads the data of user input into firebase. def upload_signal_data(firstname, lastname, email, phone, address): data = {"First Name": firstname, "Last Name": lastname, "E-Mail": email, "Phone": phone, "Address": address} - db.child("signal_2").set(data) + db.child("signal").child("2").set(data) # Removes the inputs. @@ -184,4 +184,4 @@ def reset_data(): if __name__ == "__main__": - upload_signal_data("Joe", "Joestar", "Jojo@gmail.com", "6353453242", "JojoLand") \ No newline at end of file + upload_signal_data("Batuhan", "Başoğlu", "bbaso079@uottawa.ca", "6138072241", "257 Lisgar Street") \ No newline at end of file diff --git a/Facial_images/face_rec/train/User_1/0.jpg b/Facial_images/face_rec/train/User_1/0.jpg index 50c833a11..ba3ef8144 100644 Binary files a/Facial_images/face_rec/train/User_1/0.jpg and b/Facial_images/face_rec/train/User_1/0.jpg differ diff --git a/Facial_images/face_rec/train/User_1/1.jpg b/Facial_images/face_rec/train/User_1/1.jpg index 019222c38..c9aa4c3c1 100644 Binary files a/Facial_images/face_rec/train/User_1/1.jpg and b/Facial_images/face_rec/train/User_1/1.jpg differ diff --git a/Facial_images/face_rec/train/User_1/10.jpg b/Facial_images/face_rec/train/User_1/10.jpg index 6390fe57d..9c1154324 100644 Binary files a/Facial_images/face_rec/train/User_1/10.jpg and b/Facial_images/face_rec/train/User_1/10.jpg differ diff --git a/Facial_images/face_rec/train/User_1/11.jpg b/Facial_images/face_rec/train/User_1/11.jpg index 8c6af0ac7..2e5e8ee13 100644 Binary files a/Facial_images/face_rec/train/User_1/11.jpg and b/Facial_images/face_rec/train/User_1/11.jpg differ diff --git a/Facial_images/face_rec/train/User_1/12.jpg b/Facial_images/face_rec/train/User_1/12.jpg index ab81e8e39..c9390ec52 100644 Binary files a/Facial_images/face_rec/train/User_1/12.jpg and b/Facial_images/face_rec/train/User_1/12.jpg differ diff --git a/Facial_images/face_rec/train/User_1/13.jpg b/Facial_images/face_rec/train/User_1/13.jpg index 9f2df09e9..0c9800004 100644 Binary files a/Facial_images/face_rec/train/User_1/13.jpg and b/Facial_images/face_rec/train/User_1/13.jpg differ diff --git a/Facial_images/face_rec/train/User_1/14.jpg b/Facial_images/face_rec/train/User_1/14.jpg index 1b437d695..984e6bda4 100644 Binary files a/Facial_images/face_rec/train/User_1/14.jpg and b/Facial_images/face_rec/train/User_1/14.jpg differ diff --git a/Facial_images/face_rec/train/User_1/15.jpg b/Facial_images/face_rec/train/User_1/15.jpg index da2d747e3..1c98f0aef 100644 Binary files a/Facial_images/face_rec/train/User_1/15.jpg and b/Facial_images/face_rec/train/User_1/15.jpg differ diff --git a/Facial_images/face_rec/train/User_1/16.jpg b/Facial_images/face_rec/train/User_1/16.jpg index a4e4b0e75..9c53040cd 100644 Binary files a/Facial_images/face_rec/train/User_1/16.jpg and b/Facial_images/face_rec/train/User_1/16.jpg differ diff --git a/Facial_images/face_rec/train/User_1/17.jpg b/Facial_images/face_rec/train/User_1/17.jpg index ca182eb7a..ba3ff8c4f 100644 Binary files a/Facial_images/face_rec/train/User_1/17.jpg and b/Facial_images/face_rec/train/User_1/17.jpg differ diff --git a/Facial_images/face_rec/train/User_1/18.jpg b/Facial_images/face_rec/train/User_1/18.jpg index 2122c8e2c..21aaa7375 100644 Binary files a/Facial_images/face_rec/train/User_1/18.jpg and b/Facial_images/face_rec/train/User_1/18.jpg differ diff --git a/Facial_images/face_rec/train/User_1/19.jpg b/Facial_images/face_rec/train/User_1/19.jpg index 7ec702e14..d7e97ba2e 100644 Binary files a/Facial_images/face_rec/train/User_1/19.jpg and b/Facial_images/face_rec/train/User_1/19.jpg differ diff --git a/Facial_images/face_rec/train/User_1/2.jpg b/Facial_images/face_rec/train/User_1/2.jpg index 05e9f70c1..2cf8ab1ae 100644 Binary files a/Facial_images/face_rec/train/User_1/2.jpg and b/Facial_images/face_rec/train/User_1/2.jpg differ diff --git a/Facial_images/face_rec/train/User_1/3.jpg b/Facial_images/face_rec/train/User_1/3.jpg index 83c214f3d..334e2ce69 100644 Binary files a/Facial_images/face_rec/train/User_1/3.jpg and b/Facial_images/face_rec/train/User_1/3.jpg differ diff --git a/Facial_images/face_rec/train/User_1/4.jpg b/Facial_images/face_rec/train/User_1/4.jpg index c0f70812d..84daf5540 100644 Binary files a/Facial_images/face_rec/train/User_1/4.jpg and b/Facial_images/face_rec/train/User_1/4.jpg differ diff --git a/Facial_images/face_rec/train/User_1/5.jpg b/Facial_images/face_rec/train/User_1/5.jpg index 78a61ae58..deafb4b65 100644 Binary files a/Facial_images/face_rec/train/User_1/5.jpg and b/Facial_images/face_rec/train/User_1/5.jpg differ diff --git a/Facial_images/face_rec/train/User_1/6.jpg b/Facial_images/face_rec/train/User_1/6.jpg index 960ea129b..ce463871a 100644 Binary files a/Facial_images/face_rec/train/User_1/6.jpg and b/Facial_images/face_rec/train/User_1/6.jpg differ diff --git a/Facial_images/face_rec/train/User_1/7.jpg b/Facial_images/face_rec/train/User_1/7.jpg index 6b9dcd6a4..31b8ec1c4 100644 Binary files a/Facial_images/face_rec/train/User_1/7.jpg and b/Facial_images/face_rec/train/User_1/7.jpg differ diff --git a/Facial_images/face_rec/train/User_1/8.jpg b/Facial_images/face_rec/train/User_1/8.jpg index 2c3e41b32..8c90548bc 100644 Binary files a/Facial_images/face_rec/train/User_1/8.jpg and b/Facial_images/face_rec/train/User_1/8.jpg differ diff --git a/Facial_images/face_rec/train/User_1/9.jpg b/Facial_images/face_rec/train/User_1/9.jpg index 2c4405568..7fc14b47c 100644 Binary files a/Facial_images/face_rec/train/User_1/9.jpg and b/Facial_images/face_rec/train/User_1/9.jpg differ diff --git a/Facial_images/face_rec/train/User_2/0.jpg b/Facial_images/face_rec/train/User_2/0.jpg deleted file mode 100644 index ba3ef8144..000000000 Binary files a/Facial_images/face_rec/train/User_2/0.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/1.jpg b/Facial_images/face_rec/train/User_2/1.jpg deleted file mode 100644 index c9aa4c3c1..000000000 Binary files a/Facial_images/face_rec/train/User_2/1.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/10.jpg b/Facial_images/face_rec/train/User_2/10.jpg deleted file mode 100644 index 9c1154324..000000000 Binary files a/Facial_images/face_rec/train/User_2/10.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/11.jpg b/Facial_images/face_rec/train/User_2/11.jpg deleted file mode 100644 index 2e5e8ee13..000000000 Binary files a/Facial_images/face_rec/train/User_2/11.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/12.jpg b/Facial_images/face_rec/train/User_2/12.jpg deleted file mode 100644 index c9390ec52..000000000 Binary files a/Facial_images/face_rec/train/User_2/12.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/13.jpg b/Facial_images/face_rec/train/User_2/13.jpg deleted file mode 100644 index 0c9800004..000000000 Binary files a/Facial_images/face_rec/train/User_2/13.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/14.jpg b/Facial_images/face_rec/train/User_2/14.jpg deleted file mode 100644 index 984e6bda4..000000000 Binary files a/Facial_images/face_rec/train/User_2/14.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/15.jpg b/Facial_images/face_rec/train/User_2/15.jpg deleted file mode 100644 index 1c98f0aef..000000000 Binary files a/Facial_images/face_rec/train/User_2/15.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/16.jpg b/Facial_images/face_rec/train/User_2/16.jpg deleted file mode 100644 index 9c53040cd..000000000 Binary files a/Facial_images/face_rec/train/User_2/16.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/17.jpg b/Facial_images/face_rec/train/User_2/17.jpg deleted file mode 100644 index ba3ff8c4f..000000000 Binary files a/Facial_images/face_rec/train/User_2/17.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/18.jpg b/Facial_images/face_rec/train/User_2/18.jpg deleted file mode 100644 index 21aaa7375..000000000 Binary files a/Facial_images/face_rec/train/User_2/18.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/19.jpg b/Facial_images/face_rec/train/User_2/19.jpg deleted file mode 100644 index d7e97ba2e..000000000 Binary files a/Facial_images/face_rec/train/User_2/19.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/2.jpg b/Facial_images/face_rec/train/User_2/2.jpg deleted file mode 100644 index 2cf8ab1ae..000000000 Binary files a/Facial_images/face_rec/train/User_2/2.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/3.jpg b/Facial_images/face_rec/train/User_2/3.jpg deleted file mode 100644 index 334e2ce69..000000000 Binary files a/Facial_images/face_rec/train/User_2/3.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/4.jpg b/Facial_images/face_rec/train/User_2/4.jpg deleted file mode 100644 index 84daf5540..000000000 Binary files a/Facial_images/face_rec/train/User_2/4.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/5.jpg b/Facial_images/face_rec/train/User_2/5.jpg deleted file mode 100644 index deafb4b65..000000000 Binary files a/Facial_images/face_rec/train/User_2/5.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/6.jpg b/Facial_images/face_rec/train/User_2/6.jpg deleted file mode 100644 index ce463871a..000000000 Binary files a/Facial_images/face_rec/train/User_2/6.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/7.jpg b/Facial_images/face_rec/train/User_2/7.jpg deleted file mode 100644 index 31b8ec1c4..000000000 Binary files a/Facial_images/face_rec/train/User_2/7.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/8.jpg b/Facial_images/face_rec/train/User_2/8.jpg deleted file mode 100644 index 8c90548bc..000000000 Binary files a/Facial_images/face_rec/train/User_2/8.jpg and /dev/null differ diff --git a/Facial_images/face_rec/train/User_2/9.jpg b/Facial_images/face_rec/train/User_2/9.jpg deleted file mode 100644 index 7fc14b47c..000000000 Binary files a/Facial_images/face_rec/train/User_2/9.jpg and /dev/null differ diff --git a/Hardware/Updated_HW_codes/NewMotorFunc.py b/Hardware/Updated_HW_codes/NewMotorFunc.py index f35189792..b5d142294 100644 --- a/Hardware/Updated_HW_codes/NewMotorFunc.py +++ b/Hardware/Updated_HW_codes/NewMotorFunc.py @@ -1,4 +1,4 @@ -mport RPi.GPIO as GPIO +import RPi.GPIO as GPIO import pyrebase # u need to install Pyrebase module firstly from time import sleep @@ -114,7 +114,7 @@ class Motor: return False -if _name__=="__main_": +if __name__=="__main__": #print("Execute function...") diff --git a/UI/.gitignore b/UI/.gitignore index ebdd23d29..603b14077 100644 --- a/UI/.gitignore +++ b/UI/.gitignore @@ -1,14 +1,14 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -.cxx +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/UI/.idea/gradle.xml b/UI/.idea/gradle.xml index ac6b0aec6..5cd135a06 100644 --- a/UI/.idea/gradle.xml +++ b/UI/.idea/gradle.xml @@ -7,7 +7,6 @@