codrone-edu 2.10__tar.gz → 2.11__tar.gz

{codrone_edu-2.10 → codrone_edu-2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codrone_edu
-Version: 2.10
+Version: 2.11
 Summary: Python CoDrone EDU library
 Home-page: 
 Author: 

{codrone_edu-2.10 → codrone_edu-2.11}/codrone_edu/drone.py

@@ -1286,7 +1286,7 @@ class Drone:
             speed_level = 1
 
         self.sendCommand(CommandType.ControlSpeed, int(speed_level))
-        if self.information_data[1] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone(self.information_data[1]):
             time.sleep(0.03)
         else:
             time.sleep(0.01)
@@ -2277,7 +2277,7 @@ class Drone:
         if state_flight is ModeFlight.Ready:
             device_info = self.get_information_data()
 
-            if self.information_data[1] == ModelNumber.Drone_12_Drone_P1:
+            if is_jrotc_drone(self.information_data[1]):
                 print(Fore.GREEN + "Connected to CoDrone EDU (JROTC ed.)." + Style.RESET_ALL)
             else:
                 print(Fore.GREEN + "Connected to CoDrone EDU." + Style.RESET_ALL)
@@ -2363,7 +2363,7 @@ class Drone:
         if state_flight is ModeFlight.Ready:
             device_info = await self.get_information_data()
 
-            if self.information_data[1] == ModelNumber.Drone_12_Drone_P1:
+            if is_jrotc_drone(self.information_data[1]):
                 print(Fore.GREEN + "Connected to CoDrone EDU (JROTC ed.)." + Style.RESET_ALL)
             else:
                 print(Fore.GREEN + "Connected to CoDrone EDU." + Style.RESET_ALL)
@@ -2412,7 +2412,7 @@ class Drone:
 
         device_info = await self.get_information_data()
 
-        if device_info[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone(device_info[1]):
             print("Connected to CoDrone EDU (JROTC ed.).", color="green")
         else:
             print("Connected to CoDrone EDU.", color="green")
@@ -4070,7 +4070,7 @@ class Drone:
         # store current position and z_angle
         pos_data = None
         z_angle = None # angle offset between G_new and L
-        if self.information_data[1] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone(self.information_data[1]):
             for _ in range(3):
                 pos_data = self.get_position_data()
                 z_angle = self.get_angle_z()
@@ -4205,7 +4205,7 @@ class Drone:
         # store current position and z_angle
         pos_data = None
         z_angle = None  # angle offset between G_new and L
-        if self.information_data[1] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone(self.information_data[1]):
             for _ in range(3):
                 pos_data = await self.get_position_data()
                 z_angle = await self.get_angle_z()
@@ -7374,7 +7374,7 @@ class Drone:
         return image
     
     async def _controller_create_canvas_emscripten(self, color="white"):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7487,7 +7487,7 @@ class Drone:
             raise InvalidDrawColorError("Invalid color. Color value must be 'white' or 'black'")
             
     async def _controller_draw_line_emscripten(self, x1, y1, x2, y2, image, color, pixel_width):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7545,7 +7545,7 @@ class Drone:
             raise InvalidDrawColorError("Invalid color. Color value must be 'white' or 'black'")
 
     async def _controller_draw_rectangle_emscripten(self, x, y, width, height, image, color, fill_in, pixel_width):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7603,7 +7603,7 @@ class Drone:
             raise InvalidDrawColorError("Invalid color. Color value must be 'white' or 'black'")
 
     async def _controller_draw_square_emscripten(self, x, y, width, image, color, fill_in, pixel_width):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7651,7 +7651,7 @@ class Drone:
             raise InvalidDrawColorError("Invalid color. Color value must be 'white' or 'black'")
 
     async def _controller_draw_point_emscripten(self, x, y, image, color):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7683,7 +7683,7 @@ class Drone:
         self.sendDisplayClearAll(pixel)
 
     async def _controller_clear_screen_emscripten(self, pixel=DisplayPixel.White):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7738,7 +7738,7 @@ class Drone:
 
 
     async def _controller_draw_polygon_emscripten(self, point_list, image, color, fill_in, pixel_width):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7805,7 +7805,7 @@ class Drone:
             raise InvalidDrawColorError("Invalid color. Color value must be 'white' or 'black'")
 
     async def _controller_draw_ellipse_emscripten(self, ellipse_list, image, color, fill_in=None, pixel_width=1):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7870,7 +7870,7 @@ class Drone:
             raise InvalidDrawColorError("Invalid color. Color value must be 'white' or 'black'")
             
     async def _controller_draw_arc_emscripten(self, arc_list, start_angle, end_angle, image, color, pixel_width):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7936,7 +7936,7 @@ class Drone:
             raise InvalidDrawColorError("Invalid color. Color value must be 'white' or 'black'")
 
     async def _controller_draw_chord_emscripten(self, chord_list, start_angle, end_angle, image, color, fill_in, pixel_width):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -7992,7 +7992,7 @@ class Drone:
             raise InvalidDrawColorError("Invalid color. Color value must be 'white' or 'black'")
 
     async def _controller_draw_string_emscripten(self, x, y, string, image, color):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -8066,7 +8066,7 @@ class Drone:
             raise InvalidDrawColorError("Invalid color. Color value must be 'white' or 'black'")
 
     async def _controller_draw_string_align_emscripten(self, x_start, x_end, y, string, image, color, alignment):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,
@@ -8153,7 +8153,7 @@ class Drone:
                     return
                 
     async def _controller_draw_image_emscripten(self, pixel_list):
-        if (await self.get_information_data())[0] == ModelNumber.Drone_12_Drone_P1:
+        if is_jrotc_drone((await self.get_information_data())[1]):
             warnings.warn(
                 "This function is not currently supported for CoDrone EDU (JROTC ed.).",
                 RuntimeWarning,

{codrone_edu-2.10 → codrone_edu-2.11}/codrone_edu/system.py

@@ -77,11 +77,21 @@ class ModelNumber(Enum):
     
     Drone_12_Controller_P1  = 0x000C2001  # Drone_12_Controller_P1 (CDE JROTC ed.)
     Drone_12_Drone_P1       = 0x000C1002  # Drone_12_Drone_P1 (CDE JROTC ed.)
+    Drone_12_Drone_P3       = 0x000C1003  # Drone_12_Drone_P3 (CDE JROTC ed.) (IMU)
     Drone_8_Drone_P3        = 0x00081003  # Drone_8_Drone_P3 CoDrone EDU (IMU)
 
-    Drone_12_Controller_P10 = 0x000C200A  # CDEP Controller (v1.0)
-    Drone_12_Controller_P11 = 0x000C2010  # CDEP Controller (v1.1)
-    Drone_12_Drone_P10      = 0x000C100A  # CDEP Drone
+
+JROTC_DRONE_MODEL_NUMBERS = (
+    ModelNumber.Drone_12_Drone_P1,
+    ModelNumber.Drone_12_Drone_P3,
+)
+
+
+def is_jrotc_drone(model_number):
+    """
+    Returns True if model_number belongs to a CoDrone EDU (JROTC ed.) drone.
+    """
+    return model_number in JROTC_DRONE_MODEL_NUMBERS
 
 
 class DeviceType(Enum):

{codrone_edu-2.10 → codrone_edu-2.11}/codrone_edu/tools/update.py

@@ -175,7 +175,7 @@ class Updater:
         exit()
 
         #print("model number", self.modelNumber)
-        if self.modelNumber == ModelNumber.Drone_12_Drone_P1 or self.modelNumber == ModelNumber.Drone_12_Controller_P1:
+        if is_jrotc_drone(self.modelNumber) or self.modelNumber == ModelNumber.Drone_12_Controller_P1:
             print(Fore.RED + "Python firmware updater not available for CoDrone EDU (JROTC ed.)")
             exit()
 

{codrone_edu-2.10 → codrone_edu-2.11}/codrone_edu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codrone_edu
-Version: 2.10
+Version: 2.11
 Summary: Python CoDrone EDU library
 Home-page: 
 Author: 

{codrone_edu-2.10 → codrone_edu-2.11}/setup.py

@@ -22,7 +22,7 @@ Python package for controlling CoDrone EDU.
 
 setup(
     name='codrone_edu',
-    version='2.10',
+    version='2.11',
     description='Python CoDrone EDU library',
     url='',
     author='',