pyaidrone 1.5__tar.gz → 1.7__tar.gz

{pyaidrone-1.5 → pyaidrone-1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyaidrone
-Version: 1.5
+Version: 1.7
 Summary: Library for AIDrone Products
 Home-page: http://www.ir-brain.com
 Author: IR-Brain

{pyaidrone-1.5 → pyaidrone-1.7}/pyaidrone/aiDrone.py

@@ -21,9 +21,12 @@ class AIDrone(Parse,  Packet):
         self.makepkt.clearPacket()
         self.posX = 0
         self.posY = 0
-        self.rot = 0
-        
-        
+        self.rot = 0        
+        # --- 영상 스트리밍 관련 기본값 ---
+        self.stream_host = "192.168.4.1"
+        self.stream_port = 80
+        self.stream_path = "/?action=stream"
+        self._cap = None
 
     def receiveHandler(self):
         while self.isThreadRun:
@@ -150,6 +153,66 @@ class AIDrone(Parse,  Packet):
     def emergency(self):
         self.setOption(0x00)
         self.serial.write(self.makepkt.getPacket())
+        
+    # aiDrone.py — AIDrone 클래스 안에 아래 3개 메서드 추가
+    def setStreamAddress(self, host: str, port: int = 80, path: str = "/?action=stream"):
+        """MJPG-Streamer 주소 구성 요소를 저장합니다."""
+        if not isinstance(host, str) or len(host.strip()) == 0:
+            raise ValueError("host가 올바르지 않습니다.")
+        self.stream_host = host.strip()
+        self.stream_port = int(port)
+        if not path.startswith("/"):
+            path = "/" + path
+        self.stream_path = path
+        return self._build_stream_url()
+
+    def _build_stream_url(self):
+        """내부 사용: 저장된 host/port/path로 URL 생성."""
+        if self.stream_port in (80, None):
+            return f"http://{self.stream_host}{self.stream_path}"
+        return f"http://{self.stream_host}:{self.stream_port}{self.stream_path}"
+
+    def streamon(self, host: str = None, port: int = None, path: str = None, return_url: bool = False):
+        """
+        MJPG-Streamer 스트림을 엽니다.
+        - 인자를 주면 해당 값으로 주소를 덮어쓰고, 안 주면 저장된 값 사용.
+        - return_url=True 이면 URL 문자열만 반환(캡처는 열지 않음).
+        - 기본 URL 예: http://192.168.4.1/?action=stream
+        """
+        if host is not None or port is not None or path is not None:
+            self.setStreamAddress(host or self.stream_host,
+                                  self.stream_port if port is None else port,
+                                  self.stream_path if path is None else path)
+
+        url = self._build_stream_url()
+        if return_url:
+            return url
+
+        # OpenCV는 여기서만 임포트(필요할 때만)
+        try:
+            import cv2 as cv
+        except Exception as e:
+            raise RuntimeError(f"OpenCV(cv2) 임포트 실패: {e}")
+
+        # 이전 cap이 열려 있으면 정리
+        self.streamoff()
+
+        self._cap = cv.VideoCapture(url)
+        if not self._cap.isOpened():
+            self._cap.release()
+            self._cap = None
+            raise RuntimeError(f"스트림 열기 실패: {url}")
+        return self._cap
+
+    def streamoff(self):
+        """열려 있는 스트림을 닫습니다."""
+        if self._cap is not None:
+            try:
+                self._cap.release()
+            except Exception:
+                pass
+            self._cap = None
+
 
         
     

{pyaidrone-1.5 → pyaidrone-1.7}/pyaidrone/ikeyevent.py

@@ -22,8 +22,8 @@ class IKeyEvent:
             self.keyLTurn = True
         if key == keyboard.KeyCode(char="d"):
             self.keyRTurn = True
-        if key == keyboard.KeyCode(char="k"):
-            self.keyRTurn = True    
+        if key == keyboard.KeyCode(char="s"):
+            self.keyPicture = True     
         if key == keyboard.Key.esc:
             self.keyEsc = True
 
@@ -48,8 +48,8 @@ class IKeyEvent:
             self.keyLTurn = False
         if key == keyboard.KeyCode(char="d"):
             self.keyRTurn = False
-        if key == keyboard.KeyCode(char="v"):
-            self.keyRTurn = False
+        if key == keyboard.KeyCode(char="s"):
+            self.keyPicture = False        
         if key == keyboard.Key.esc:
             self.keyEsc = False
 
@@ -58,13 +58,13 @@ class IKeyEvent:
         self.keySpace = False   
         self.keyUp = False
         self.keyDown = False
+        self.keyRight= False
         self.keyLeft = False
-        self.keyRight = False
         self.keyGoUp = False
         self.keyGoDown = False
         self.keyLTurn= False
         self.keyRTurn = False
-        self.keyVideo = False
+        self.keyPicture = False
         self.keyEsc = False
 
         listener = keyboard.Listener(on_press=self.on_press, on_release=self.on_release)
@@ -100,8 +100,8 @@ class IKeyEvent:
     def isKeyDPressed(self):
         return self.keyRTurn
 
-    def isKeyVPressed(self):
-        return self.keyVideo
+    def isKeySPressed(self):
+        return self.keyPicture
     
     def isKeyEscPressed(self):
         return self.keyEsc

{pyaidrone-1.5 → pyaidrone-1.7}/pyaidrone/parse.py

@@ -40,7 +40,6 @@ class Parse:
                 self.offset = 0
                 chksum = DefLib.checksum(self.packet)
                 if chksum == self.packet[5]:
-                    self.parseSensorData(slef.packet)
                     return self.packet
         return "None"
             

{pyaidrone-1.5 → pyaidrone-1.7}/pyaidrone.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyaidrone
-Version: 1.5
+Version: 1.7
 Summary: Library for AIDrone Products
 Home-page: http://www.ir-brain.com
 Author: IR-Brain

{pyaidrone-1.5 → pyaidrone-1.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pyaidrone",
-    version="1.5",
+    version="1.7",
     description="Library for AIDrone Products",
     long_description=open("README.md").read(),  # README.md 내용을 long_description으로 사용
     long_description_content_type="text/markdown",  # README 파일이 markdown 형식임을 지정