pyaidrone 1.18__tar.gz → 2.0__tar.gz

{pyaidrone-1.18 → pyaidrone-2.0}/PKG-INFO

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

{pyaidrone-1.18 → pyaidrone-2.0}/pyaidrone/aiDrone.py

@@ -50,7 +50,7 @@ class AIDrone(Parse,  Packet):
                 exit()
                 return False
         try:
-            self.serial = serial.Serial(port=portName, baudrate=115200, timeout=1)
+            self.serial = serial.Serial(port=portName, baudrate=19200, timeout=1)
             if self.serial.isOpen():
                 self.isThreadRun = True
                 self.thread = Thread(target=self.receiveHandler, args=(), daemon=True)

{pyaidrone-1.18 → pyaidrone-2.0}/pyaidrone/deflib.py

@@ -1,4 +1,3 @@
-
 AIDRONE = 1
 
 

{pyaidrone-1.18 → pyaidrone-2.0}/pyaidrone/edu.py

@@ -22,6 +22,7 @@ class EduAIDrone:
         self.cap = None
         self.last_frame = None
         self.height = 100 # 기본 유지 고도
+        self.stream_url = None 
 
     # --- 연결 및 영상 관리 ---
     def connect(self):
@@ -33,16 +34,46 @@ class EduAIDrone:
         return False
 
     def start_stream(self, url="http://192.168.4.1/?action=stream"):
-        """영상 스트리밍 시작"""
+        self.stream_url = url  # ← URL 저장
         self.cap = cv2.VideoCapture(url)
-        return self.cap.isOpened()
-
+        
+        if self.cap.isOpened():
+            self.cap.set(cv2.CAP_PROP_BUFFERSIZE, 1)  # ← 버퍼 설정
+            print(f"✅ 스트림 연결: {url}")
+            return True
+        else:
+            print(f"❌ 스트림 연결 실패: {url}")
+            return False
+        
     def update_screen(self, window_name="AI Drone Edu"):
-        """화면을 갱신하고 현재 프레임을 반환 (AI 처리의 핵심)"""
-        ret, frame = self.cap.read()
-        if not ret: return None
-        self.last_frame = cv2.resize(frame, (640, 480))
-        return self.last_frame
+        """안전한 프레임 업데이트"""
+        # 1. cap이 None인지 확인
+        if self.cap is None:
+            print("⚠️ 스트림이 연결되지 않았습니다")
+            return None
+        
+        # 2. AttributeError 처리
+        try:
+            ret, frame = self.cap.read()
+        except AttributeError:
+            print("❌ cap.read() 에러")
+            self.cap = None
+            return None
+        
+        # 3. 프레임 검증
+        if not ret or frame is None:
+            return None
+        
+        # 4. 안전한 리사이즈
+        try:
+            if frame.size == 0:  # ← 크기 체크 추가!
+                return None
+            
+            self.last_frame = cv2.resize(frame, (640, 480))
+            return self.last_frame
+        except Exception as e:
+            print(f"⚠️ 리사이즈 에러: {e}")
+            return None
 
     # --- 단순 제어 명령어 ---
     def takeoff(self):
@@ -142,4 +173,16 @@ class EduAIDrone:
         
         timestamp = time.strftime("%H%M%S")
         filename = f"{folder}/target_{timestamp}.jpg"
-        cv2.imwrite(filename, frame)
+        cv2.imwrite(filename, frame)
+        
+    def reconnect_stream(self):
+        """스트림 재연결"""
+        if self.stream_url is None:
+            return False
+        
+        if self.cap:
+            self.cap.release()
+            self.cap = None
+        
+        time.sleep(1)
+        return self.start_stream(self.stream_url)

{pyaidrone-1.18 → pyaidrone-2.0}/pyaidrone.egg-info/PKG-INFO

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

{pyaidrone-1.18 → pyaidrone-2.0}/setup.py

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