pyaidrone 1.1__tar.gz → 1.3__tar.gz

pyaidrone-1.3/PKG-INFO

@@ -0,0 +1,23 @@
+Metadata-Version: 2.1
+Name: pyaidrone
+Version: 1.3
+Summary: Library for AIDrone Products
+Home-page: http://www.ir-brain.com
+Author: IR-Brain
+Author-email: ceo@ir-brain.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+
+## install pyaidrone
+
+> python setup.py install
+> or
+> python install pyaidrone
+
+### install Packages
+
+> pip install pyserial
+> pip install pynput

pyaidrone-1.3/pyaidrone/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.2'

{pyaidrone-1.1 → pyaidrone-1.3}/pyaidrone/aiDrone.py

@@ -32,7 +32,25 @@ class AIDrone(Parse,  Packet):
                     self.receiveCallback(packet)
             self.serial.write(self.makepkt.getPacket())
 
+    def requestSensorData(self):
+        self.makepkt.makePacket(8, bytes([0x10]))
+        self.serial.write(self.makepkt.getPacket())
+    
+    def get_gyro(self):
+        return self.sensors["gyro"]
+
+    def get_acceleration(self):
+        return self.sensors["acceleration"]
 
+    def get_altitude(self):
+        return self.sensors["altitude"]
+
+    def get_position(self):
+        return self.sensors["position"]
+        
+    def get_tof(self):
+        return self.sensors["tof"]
+        
     def Open(self, portName = "None"):
         if eq(portName, "None"):
             nodes = comports()
@@ -132,11 +150,12 @@ class AIDrone(Parse,  Packet):
     
 	
     def rotation(self, rot=90):
-        self.rot += rot
+        self.rot += rot               
         data = self.rot.to_bytes(2, byteorder="little", signed=True)
         self.makepkt.makePacket(10, data)
 
 
+
     def motor(self, what, speed):
         speed = DefLib.constrain(speed, 100, 0)
         data = speed.to_bytes(2, byteorder="little", signed=True)
@@ -147,5 +166,27 @@ class AIDrone(Parse,  Packet):
     def emergency(self):
         self.setOption(0x00)
         self.serial.write(self.makepkt.getPacket())
+        
+    def motor(self, motor_id, speed):
+    """
+    모터 속도를 0~100 범위에서 설정합니다.
+
+    :param motor_id: 제어할 모터의 인덱스 (0~3은 개별 모터, 4는 모든 모터)
+    :param speed: 모터 속도 (0 ~ 100)
+    """
+    speed = max(0, min(speed, 100))  # 속도를 0~100 범위로 제한
+    scaled_speed = speed * 10  # 내부적으로 0~1000 범위로 변환
+    data = scaled_speed.to_bytes(2, byteorder="little", signed=False)
+
+    # 모든 모터를 동시에 제어
+    if motor_id == 4:
+        self.makepkt.makePacket(12, data)  # 모든 모터의 속도를 설정 (THR 제어)
+    else:
+        # 개별 모터 제어
+        self.makepkt.makePacket(6 + (motor_id * 2), data)
+
+    # 패킷을 시리얼 포트를 통해 전송
+    self.serial.write(self.makepkt.getPacket())
+
 
 

{pyaidrone-1.1 → pyaidrone-1.3}/pyaidrone/parse.py

@@ -3,11 +3,12 @@ from pyaidrone.deflib import *
 class Parse:
     def __init__(self, model=AIDRONE):
         self.model = model
-        self.packet = bytearray(20)
+        self.packet = bytearray(100)
         self.offset = 0
         self.type = 0
         self.packetLen = 20 
         self.headMatchCnt = 0
+        self.sensors = {"gyro":(0,0), "acceleration":(0,0), "altitude": (0,0), "position": (0, 0), "tof": 0}
         if self.model == AIDRONE:
             self.head = (0x26, 0xA8, 0x14, 0xA0)
         
@@ -40,6 +41,18 @@ class Parse:
                 self.offset = 0
                 chksum = DefLib.checksum(self.packet)
                 if chksum == self.packet[5]:
+                    self.parseSensorData(slef.packet)
                     return self.packet
         return "None"
 
+    def parseSensorData(self, packet):
+        if packet[3] == 0xA2:
+            self.sensors["gyro"] = (int.from_bytes(packet[9:11], "little", signed=True),
+                                    int.from_bytes(packet[11:13], "little", signed=True))
+            self.sensors["acceleration"] = (int.from_bytes(packet[13:15], "little", signed=True),
+                                            int.from_bytes(packet[15:17], "little", signed=True))
+            self.sensors["altitude"] = int.from_bytes(packet[17:19], "little", signed=True)
+            self.sensors["position"] = (int.from_bytes(packet[19:21], "little", signed=True),
+                                        int.from_bytes(packet[21:23], "little", signed=True))
+            self.sensors["tof"] = int.from_bytes(packet[23:25], "little", signed=True)    
+            

pyaidrone-1.3/pyaidrone.egg-info/PKG-INFO

@@ -0,0 +1,23 @@
+Metadata-Version: 2.1
+Name: pyaidrone
+Version: 1.3
+Summary: Library for AIDrone Products
+Home-page: http://www.ir-brain.com
+Author: IR-Brain
+Author-email: ceo@ir-brain.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+
+## install pyaidrone
+
+> python setup.py install
+> or
+> python install pyaidrone
+
+### install Packages
+
+> pip install pyserial
+> pip install pynput

pyaidrone-1.3/setup.py

@@ -0,0 +1,23 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="pyaidrone",
+    version="1.3",
+    description="Library for AIDrone Products",
+    long_description=open("README.md").read(),  # README.md 내용을 long_description으로 사용
+    long_description_content_type="text/markdown",  # README 파일이 markdown 형식임을 지정
+    author="IR-Brain",
+    author_email="ceo@ir-brain.com",
+    url="http://www.ir-brain.com",
+    packages=find_packages(),  # find_packages()를 사용해 서브패키지까지 자동 탐색
+    install_requires=[
+        'pyserial>=3.4',
+        'pynput>=1.7.3',
+    ],
+    classifiers=[  # 추가 메타데이터
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",  # 실제 라이선스를 설정해야 함
+        "Operating System :: OS Independent",
+    ],
+    python_requires='>=3.6',  # 최소 Python 버전 요구 사항 설정
+)

pyaidrone-1.1/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.1
-Name: pyaidrone
-Version: 1.1
-Summary: Library for AIDrone Products
-Home-page: http://www.ir-brain.com
-Author: IR-Brain
-Author-email: ceo@ir-brain.com

pyaidrone-1.1/pyaidrone/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.0'

pyaidrone-1.1/pyaidrone.egg-info/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.1
-Name: pyaidrone
-Version: 1.1
-Summary: Library for AIDrone Products
-Home-page: http://www.ir-brain.com
-Author: IR-Brain
-Author-email: ceo@ir-brain.com

pyaidrone-1.1/setup.py

@@ -1,16 +0,0 @@
-from setuptools import setup, find_packages
-
-setup(
-    name = "pyaidrone",
-    version = "1.1", 
-    description = "Library for AIDrone Products",
-    author = "IR-Brain",
-    author_email = "ceo@ir-brain.com",
-    url = "http://www.ir-brain.com",
-    packages = ['pyaidrone', 
-        ],
-    install_requires = [
-        'pyserial>=3.4',
-        'pynput>=1.7.3',
-        ],
-)