pyaidrone 1.0__tar.gz → 1.2__tar.gz

pyaidrone-1.2/PKG-INFO

@@ -0,0 +1,23 @@
+Metadata-Version: 2.1
+Name: pyaidrone
+Version: 1.2
+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.2/pyaidrone/__init__.py

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

pyaidrone-1.0/pyaidrone/AIDrone.py → pyaidrone-1.2/pyaidrone/aiDrone.py

@@ -1,151 +1,151 @@
-import serial
-import binascii
-import math
-from time import sleep
-import random
-from operator import eq
-from threading import Thread
-from serial.tools.list_ports import comports
-from pyaidrone.parse import *
-from pyaidrone.packet import *
-from pyaidrone.deflib import *
-
-
-class AIDrone(Parse,  Packet):
-    def __init__(self, receiveCallback = None):
-        self.serial = None
-        self.isThreadRun = False
-        self.parse = Parse(AIDRONE)
-        self.makepkt = Packet(AIDRONE)
-        self.receiveCallback = receiveCallback
-        self.makepkt.clearPacket()
-        self.posX = 0
-        self.posY = 0
-        self.rot = 0
-
-    def receiveHandler(self):
-        while self.isThreadRun:
-            readData = self.serial.read(self.serial.in_waiting or 1)
-            packet = self.parse.packetArrange(readData)
-            if not eq(packet, "None"):
-                if self.receiveCallback != None:
-                    self.receiveCallback(packet)
-            self.serial.write(self.makepkt.getPacket())
-
-
-    def Open(self, portName = "None"):
-        if eq(portName, "None"):
-            nodes = comports()
-            for node in nodes:
-                if "CH340" in node.description:
-                    portName = node.device
-            
-            if eq(portName, "None"):
-                print("Can't find Serial Port")
-                exit()
-                return False
-        try:
-            self.serial = serial.Serial(port=portName, baudrate=115200, timeout=1)
-            if self.serial.isOpen():
-                self.isThreadRun = True
-                self.thread = Thread(target=self.receiveHandler, args=(), daemon=True)
-                self.thread.start()
-                print("Connected to", portName)                   
-                return True
-            else:
-                print("Can't open " + portName)
-                exit()
-                return False
-        except:
-            print("Can't open " + portName)
-            exit()
-            return False
-			
-
-    def Close(self):
-        self.isThreadRun = False
-        sleep(0.2)
-        pkt = self.makepkt.getPacket()
-        if (pkt[15]&0x80) == 0x80:
-            self.makepkt.clearPacket()
-            self.setOption(0x8000)
-            self.serial.write(self.makepkt.getPacket())
-            sleep(0.2)
-        self.serial.write(self.makepkt.clearPacket())
-        sleep(0.2)
-        if self.serial != None:
-            if self.serial.isOpen() == True:
-                self.serial.close()
-
-    def setOption(self, option):
-        data = option.to_bytes(2, byteorder="little", signed=False)
-        self.makepkt.makePacket(14, data)
-
-
-    def takeoff(self):
-        alt = 70
-        data = alt.to_bytes(2, byteorder="little", signed=False)
-        self.makepkt.makePacket(12, data)
-        alt = 0x2F 
-        data = alt.to_bytes(2, byteorder="little", signed=False)
-        self.setOption(0x2F)
-
-
-    def landing(self):
-        alt = 0
-        data = alt.to_bytes(2, byteorder="little", signed=False)
-        self.makepkt.makePacket(12, data)
-
-
-    def altitude(self, alt):
-        data = alt.to_bytes(2, byteorder="little", signed=False)
-        self.makepkt.makePacket(12, data)
-
-
-    def velocity(self, dir=0, vel=100):
-        if dir > 3:
-            return
-        if dir==1 or dir==3:
-            vel *= -1; 
-        data = vel.to_bytes(2, byteorder="little", signed=True)
-        if dir==0 or dir==1:
-            self.makepkt.makePacket(8, data)
-        else:
-            self.makepkt.makePacket(6, data)
-        self.setOption(0x0F)
-
-
-    def move(self, dir=0, dist=100):
-        if dir > 3:
-            return
-        if dir==1 or dir==3:
-            dist *= -1; 
-        if dir==0 or dir==1:
-            self.posX += dist
-            data = self.posX.to_bytes(2, byteorder="little", signed=True)
-            self.makepkt.makePacket(8, data)
-        else:
-            self.posY += dist
-            data = self.posY.to_bytes(2, byteorder="little", signed=True)
-            self.makepkt.makePacket(6, data)
-        self.setOption(0x2F)
-    
-	
-    def rotation(self, rot=90):
-        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)
-        self.makepkt.makePacket(what*2+6, data)
-        self.setOption(0x8000)
-
-
-    def emergency(self):
-        self.setOption(0x00)
-        self.serial.write(self.makepkt.getPacket())
-
-
+import serial
+import binascii
+import math
+from time import sleep
+import random
+from operator import eq
+from threading import Thread
+from serial.tools.list_ports import comports
+from pyaidrone.parse import *
+from pyaidrone.packet import *
+from pyaidrone.deflib import *
+
+
+class AIDrone(Parse,  Packet):
+    def __init__(self, receiveCallback = None):
+        self.serial = None
+        self.isThreadRun = False
+        self.parse = Parse(AIDRONE)
+        self.makepkt = Packet(AIDRONE)
+        self.receiveCallback = receiveCallback
+        self.makepkt.clearPacket()
+        self.posX = 0
+        self.posY = 0
+        self.rot = 0
+
+    def receiveHandler(self):
+        while self.isThreadRun:
+            readData = self.serial.read(self.serial.in_waiting or 1)
+            packet = self.parse.packetArrange(readData)
+            if not eq(packet, "None"):
+                if self.receiveCallback != None:
+                    self.receiveCallback(packet)
+            self.serial.write(self.makepkt.getPacket())
+
+
+    def Open(self, portName = "None"):
+        if eq(portName, "None"):
+            nodes = comports()
+            for node in nodes:
+                if "CH340" in node.description:
+                    portName = node.device
+            
+            if eq(portName, "None"):
+                print("Can't find Serial Port")
+                exit()
+                return False
+        try:
+            self.serial = serial.Serial(port=portName, baudrate=115200, timeout=1)
+            if self.serial.isOpen():
+                self.isThreadRun = True
+                self.thread = Thread(target=self.receiveHandler, args=(), daemon=True)
+                self.thread.start()
+                print("Connected to", portName)                   
+                return True
+            else:
+                print("Can't open " + portName)
+                exit()
+                return False
+        except:
+            print("Can't open " + portName)
+            exit()
+            return False
+			
+
+    def Close(self):
+        self.isThreadRun = False
+        sleep(0.2)
+        pkt = self.makepkt.getPacket()
+        if (pkt[15]&0x80) == 0x80:
+            self.makepkt.clearPacket()
+            self.setOption(0x8000)
+            self.serial.write(self.makepkt.getPacket())
+            sleep(0.2)
+        self.serial.write(self.makepkt.clearPacket())
+        sleep(0.2)
+        if self.serial != None:
+            if self.serial.isOpen() == True:
+                self.serial.close()
+
+    def setOption(self, option):
+        data = option.to_bytes(2, byteorder="little", signed=False)
+        self.makepkt.makePacket(14, data)
+
+
+    def takeoff(self):
+        alt = 70
+        data = alt.to_bytes(2, byteorder="little", signed=False)
+        self.makepkt.makePacket(12, data)
+        alt = 0x2F 
+        data = alt.to_bytes(2, byteorder="little", signed=False)
+        self.setOption(0x2F)
+
+
+    def landing(self):
+        alt = 0
+        data = alt.to_bytes(2, byteorder="little", signed=False)
+        self.makepkt.makePacket(12, data)
+
+
+    def altitude(self, alt):
+        data = alt.to_bytes(2, byteorder="little", signed=False)
+        self.makepkt.makePacket(12, data)
+
+
+    def velocity(self, dir=0, vel=100):
+        if dir > 3:
+            return
+        if dir==1 or dir==3:
+            vel *= -1; 
+        data = vel.to_bytes(2, byteorder="little", signed=True)
+        if dir==0 or dir==1:
+            self.makepkt.makePacket(8, data)
+        else:
+            self.makepkt.makePacket(6, data)
+        self.setOption(0x0F)
+
+
+    def move(self, dir=0, dist=100):
+        if dir > 3:
+            return
+        if dir==1 or dir==3:
+            dist *= -1; 
+        if dir==0 or dir==1:
+            self.posX += dist
+            data = self.posX.to_bytes(2, byteorder="little", signed=True)
+            self.makepkt.makePacket(8, data)
+        else:
+            self.posY += dist
+            data = self.posY.to_bytes(2, byteorder="little", signed=True)
+            self.makepkt.makePacket(6, data)
+        self.setOption(0x2F)
+    
+	
+    def rotation(self, rot=90):
+        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)
+        self.makepkt.makePacket(what*2+6, data)
+        self.setOption(0x8000)
+
+
+    def emergency(self):
+        self.setOption(0x00)
+        self.serial.write(self.makepkt.getPacket())
+
+

{pyaidrone-1.0 → pyaidrone-1.2}/pyaidrone/packet.py

@@ -1,10 +1,10 @@
-from pyirbrain.deflib import *
+from pyaidrone.deflib import *
 
 class Packet:
-    def __init__(self, model = AIRONE):
+    def __init__(self, model = AIDRONE):
         self.model = model
         self.packet = bytearray(20) 
-        if self.model == AIRONE:
+        if self.model == AIDRONE:
             self.packet[0:5] = [0x26, 0xA8, 0x14, 0xB1, 0x14]
 
     def getPacket(self):
@@ -22,7 +22,7 @@ class Packet:
     def clearPacket(self):
         for n in range(5, 20):
             self.packet[n] = 0
-        if self.model == AIRONE:
+        if self.model == AIDRONE:
             self.packet[5] = self.packet[14] = 0x01
             self.packet[16] = self.packet[18] = 0x64
         return self.packet

{pyaidrone-1.0 → pyaidrone-1.2}/pyaidrone/parse.py

@@ -1,9 +1,9 @@
-from pyirbrain.deflib import *
+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 

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

@@ -0,0 +1,23 @@
+Metadata-Version: 2.1
+Name: pyaidrone
+Version: 1.2
+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.0 → pyaidrone-1.2}/pyaidrone.egg-info/SOURCES.txt

@@ -1,8 +1,8 @@
 README.md
 setup.cfg
 setup.py
-pyaidrone/AIDrone.py
 pyaidrone/__init__.py
+pyaidrone/aiDrone.py
 pyaidrone/deflib.py
 pyaidrone/ikeyevent.py
 pyaidrone/packet.py

pyaidrone-1.2/setup.py

@@ -0,0 +1,23 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="pyaidrone",
+    version="1.2",
+    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.0/PKG-INFO

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

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

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

pyaidrone-1.0/setup.py

@@ -1,16 +0,0 @@
-from setuptools import setup, find_packages
-
-setup(
-    name = "pyaidrone",
-    version = "1.0", 
-    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',
-        ],
-)