pyaidrone 2.2__tar.gz → 2.3__tar.gz

{pyaidrone-2.2 → pyaidrone-2.3}/PKG-INFO

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

{pyaidrone-2.2 → pyaidrone-2.3}/pyaidrone/aiDrone.py

@@ -35,7 +35,7 @@ class AIDrone(Parse, Packet):
         while self.isThreadRun:
             readData = self.serial.read(self.serial.in_waiting or 1)
             packet = self.parse.packetArrange(readData)
-            if not eq(packet, "None"):
+            if packet is not None:
                 if self.receiveCallback is not None:
                     self.receiveCallback(packet)
             self.serial.write(self.makepkt.getPacket())

{pyaidrone-2.2 → pyaidrone-2.3}/pyaidrone/deflib.py

@@ -9,7 +9,7 @@ LEFT = 3
 class DefLib:
 
     @classmethod
-    def checksum(self, packet):
+    def checksum(cls, packet):
         len = packet[4]
         sum = 0
         for n in range(6, len):
@@ -18,7 +18,7 @@ class DefLib:
 
 
     @classmethod
-    def _print(self, data):
+    def _print(cls, data):
         for n in range(0, len(data)):
             h = hex(data[n])
 #            print(h, end=" ")
@@ -26,7 +26,7 @@ class DefLib:
 
 
     @classmethod
-    def constrain(self, val , max, min):
+    def constrain(cls, val , max, min):
         if val > max:
             val = max
         if val < min:
@@ -35,7 +35,7 @@ class DefLib:
 
 
     @classmethod
-    def comp(self, data):
+    def comp(cls, data):
         data = data&0xFF
         if data < 0:
             return 256 + data

{pyaidrone-2.2 → pyaidrone-2.3}/pyaidrone/ikeyevent.py

@@ -14,20 +14,23 @@ class IKeyEvent:
             self.keyRight = True
         if key == keyboard.Key.left:
             self.keyLeft = True
-        if key == keyboard.KeyCode(char="w"):
+            
+        char = getattr(key, 'char', None)
+        if char == "w":
             self.keyGoUp = True
-        if key == keyboard.KeyCode(char="x"):
+        if char == "x":
             self.keyGoDown = True
-        if key == keyboard.KeyCode(char="a"):
+        if char == "a":
             self.keyLTurn = True
-        if key == keyboard.KeyCode(char="d"):
+        if char == "d":
             self.keyRTurn = True
-        if key == keyboard.KeyCode(char="r"):
+        if char == "r":
             self.keyRecording = True 
-        if key == keyboard.KeyCode(char="s"):
+        if char == "s":
             self.keyPicture = True
-        if key == keyboard.KeyCode(char="t"):
+        if char == "t":
             self.keyTracking = True
+            
         if key == keyboard.Key.esc:
             self.keyEsc = True
 
@@ -44,20 +47,23 @@ class IKeyEvent:
             self.keyRight = False
         if key == keyboard.Key.left:
             self.keyLeft = False
-        if key == keyboard.KeyCode(char="w"):
+            
+        char = getattr(key, 'char', None)
+        if char == "w":
             self.keyGoUp = False
-        if key == keyboard.KeyCode(char="x"):
+        if char == "x":
             self.keyGoDown = False
-        if key == keyboard.KeyCode(char="a"):
+        if char == "a":
             self.keyLTurn = False
-        if key == keyboard.KeyCode(char="d"):
+        if char == "d":
             self.keyRTurn = False
-        if key == keyboard.KeyCode(char="r"):
+        if char == "r":
             self.keyRecording = False
-        if key == keyboard.KeyCode(char="s"):
+        if char == "s":
             self.keyPicture = False          
-        if key == keyboard.KeyCode(char="t"):
+        if char == "t":
             self.keyTracking = False
+            
         if key == keyboard.Key.esc:
             self.keyEsc = False
 

{pyaidrone-2.2 → pyaidrone-2.3}/pyaidrone/parse.py

@@ -41,5 +41,5 @@ class Parse:
                 chksum = DefLib.checksum(self.packet)
                 if chksum == self.packet[5]:
                     return self.packet
-        return "None"
+        return None
             

{pyaidrone-2.2 → pyaidrone-2.3}/pyaidrone.egg-info/PKG-INFO

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

{pyaidrone-2.2 → pyaidrone-2.3}/setup.py

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