Modify doorlock process and Modify api(delete auth)

김유현
Commit e09873957d759d4a55c7156c23bc218598d7bf52 e0987395 1 parent 4c09d477
Showing 4 changed files with 39 additions and 57 deletions
api/views.py
asset/beep.wav
asset/dingdongdang.wav
doorlock.py
--- a/api/views.py
View file @e098739
+++ b/api/views.py
View file @e098739
@@ -77,8 +77,6 @@ class Devices(APIView) :
     # 기기 목록 조회
     def get(self, request, format = None) :
         try :
-            if request.auth == None :
-                raise PermissionDenied
             queryset = Device.objects.all()
             serializer = DeviceSerializer(queryset, many = True)
             res = {
@@ -89,20 +87,13 @@ class Devices(APIView) :
             return Response({
                 'error' : "FieldDoesNotExist ",
                 'date' : datetime.now()
-            }, status = status.HTTP_400_BAD_REQUEST)
+            }, status = status.HTTP_400_BAD_REQUEST)     
-        except PermissionDenied as error :
-            return Response({
-                'error' : "PermissionDenied",
-                'date' : datetime.now()
-            }, status = status.HTTP_400_BAD_REQUEST)            
     # 기기 추가 요청
-    def put(self, request, device_id, format = None) :
+    def put(self, request, format = None) :
         try :
             if request.auth == None :
                 raise PermissionDenied
-            if device_id != "request" :
-                raise FieldDoesNotExist
             print(request.body)
             target = AddDevice.objects.get(id=1)
             serializer = AddDeviceSerializer(target, many=False)
@@ -114,11 +105,6 @@ class Devices(APIView) :
             return Response({
                 'msg' : 'changed state successfully'
             }, status = status.HTTP_200_OK)
-        except FieldDoesNotExist as error :
-            return Response({
-                'error' : "FieldDoesNotExist ",
-                'date' : datetime.now()
-            }, status = status.HTTP_400_BAD_REQUEST)
         except PermissionDenied as error :
             return Response({
                 'error' : "PermissionDenied",
@@ -127,9 +113,7 @@ class Devices(APIView) :
     # 기기 추가
     def post(self, request, format = None) : # request body에 rfid_id 포함되어있음 
-        try : 
+        try :            
-            if request.auth == None :
-                raise PermissionDenied            
             print(request.data)
             request_id = request.data.get('rfid_id', None)
             if request_id == None :
@@ -152,11 +136,6 @@ class Devices(APIView) :
                 'error' : "FieldDoesNotExist ",
                 'date' : datetime.now()
             }, status = status.HTTP_400_BAD_REQUEST)
-        except PermissionDenied as error :
-            return Response({
-                'error' : "PermissionDenied",
-                'date' : datetime.now()
-            }, status = status.HTTP_400_BAD_REQUEST) 
--- a/asset/beep.wav 0 → 100644
View file @e098739
+++ b/asset/beep.wav 0 → 100644
View file @e098739
--- a/asset/dingdongdang.wav 0 → 100644
View file @e098739
+++ b/asset/dingdongdang.wav 0 → 100644
View file @e098739
--- a/doorlock.py
View file @e098739
+++ b/doorlock.py
View file @e098739
@@ -9,6 +9,7 @@ import os
 import django
 import datetime
 import sys
+import subprocess
 sys.path.append('/home/pi/Desktop/smartdoorlock-backend')
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'src.settings')
@@ -22,45 +23,48 @@ from api.serializers import LockSerializer, AddDeviceSerializer, DeviceSerialize
 GPIO.setmode(GPIO.BCM)
 MFIAREReader = mfrc522.MFRC522()  # RFID Reader
 BASE_URL = "http://127.0.0.1:8000"
-PIN = {
+PIN = 18
-    'Motor_MT_N': 12,
-    'Motor_MT_P': 6
-}
-class Motor:
+class Sound:
-    LEFT = 0
+    def __init__(self):
-    RIGHT = 1
+        self.right_sound = "asset/dingdongdang.wav"
+        self.wrong_sound = "asset/beep.wav"
+
+    def print_right_sound(self):
+        print("딩동댕 ~ 완료하였습니다")
+        result = subprocess.check_output("sudo aplay {}".format(self.right_sound), shell=True)
+        
+    def print_wrong_sound(self):
+        print("경고음 삑 -!")
+        result = subprocess.check_output("sudo aplay {}".format(self.wrong_sound), shell=True)
+
+class Motor:
     def __init__(self):
-        self.pwmN = GPIO.PWM(PIN['Motor_MT_N'], 100)
+        self.p = GPIO.PWM(PIN, 50)
-        self.pwmP = GPIO.PWM(PIN['Motor_MT_P'], 100)
+        self.p.start(0)
-        self.pwmN.start(0)
+
-        self.pwmP.start(0)
+    def rotate(self, command):
-
+        if command == "open":
-    def rotate(self, direction):
+            self.p.ChangeDutyCycle(12.5)
-        if direction == Motor.LEFT:
-            GPIO.output(PIN['Motor_MT_N'], GPIO.HIGH)
-            GPIO.output(PIN['Motor_MT_P'], GPIO.LOW)
-            self.pwmN.ChangeDutyCycle(50)
         else:
-            GPIO.output(PIN['Motor_MT_N'], GPIO.LOW)
+            self.p.ChangeDutyCycle(2.5)
-            GPIO.output(PIN['Motor_MT_P'], GPIO.HIGH)
-            self.pwmP.ChangeDutyCycle(50)
     def stop(self):
-        self.pwmP.ChangeDutyCycle(0)
+        self.p.ChangeDutyCycle(0)
-        self.pwmN.ChangeDutyCycle(0)
+
 def RFIDProcess(signalQueue):
+    sound = Sound()
     while True:
         success = False
         try:
             (readerStatus, tagType) = MFIAREReader.MFRC522_Request(MFIAREReader.PICC_REQIDL)
             (readerStatus, uid) = MFIAREReader.MFRC522_Anticoll()  # uid = [1, 2, 3, 4, 5]
             if readerStatus == MFIAREReader.MI_OK:  # if RFID 태그가 됨:
-		time.sleep(1)
+                time.sleep(1)
                 print("RIFD tag")
                 deviceId = ""   # 방금 태그된 RFID 장치의 ID.
                 for i in uid:
@@ -94,10 +98,10 @@ def RFIDProcess(signalQueue):
                         else:
                             # callApi(POST /api/device, {rfid_id:deviceId})  # 기기 추가
                             requests.post(BASE_URL+"/api/device", data={"rfid_id": deviceId})
-                            print("딩동댕 ~ 완료하였습니다")  # 소리 출력
+                            sound.print_right_sound()
                             pass
                     except:
-                        print("경고음 삑 -!")
+                        sound.print_wrong_sound()
                         pass
                     finally:  # setToIPC(기기 추가 여부, 기기 추가 아님)
                         target.state = False
@@ -111,7 +115,7 @@ def RFIDProcess(signalQueue):
                         else:
                             success = True
                     except:
-                        print("경고음 삑 -!")  # 소리 출력
+                        sound.print_wrong_sound()
                         pass
             if success:
@@ -146,27 +150,26 @@ def signalProcess(signalQueue):
 def doorProcess(doorQueue):
-    # motor = Motor()
+    motor = Motor()
     while True:
         signal = doorQueue.get()
         print("{} 신호를 받아 문 열기 동작 수행 시작".format(signal))
         if signal is not None:
             print("문 열림")
-            #motor.rotate(Motor.LEFT)
+            motor.rotate("open")
             time.sleep(0.5)
-            #motor.stop()
+            motor.stop()
             time.sleep(5)  # 열린 후 5초 지나면 닫힘
             print("문 닫힘")
-            #motor.rotate(Motor.RIGHT)
+            motor.rotate("close")
             time.sleep(0.5)
-            #motor.stop()
+            motor.stop()
 if __name__ == '__main__':
     try:
         GPIO.setmode(GPIO.BCM)
-        #GPIO.setup(PIN['Motor_MT_N'], GPIO.OUT, initial=GPIO.LOW)
+        GPIO.setup(PIN, GPIO.OUT)
-        #GPIO.setup(PIN['Motor_MT_P'], GPIO.OUT, initial=GPIO.LOW)
         signalQueue = Queue()
         pid = os.fork()