Small code formatting changes

Author: laurentva

pypozyx/structures/byte_structure.py

@@ -87,7 +87,8 @@ def change_data(self, index, new_data):
         else:
             print("Trying to change data with invalid new values (use int or list)")
 
-    def load(self, data, convert=1):
+    # TODO make convert use True/False not 1/0
+    def load(self, data, convert=True):
         """Loads data in its relevant class components."""
         raise NotImplementedError(
             'load(data) should be customised for every derived structure')

pypozyx/structures/device.py

@@ -16,7 +16,6 @@
     contains all of the UWB settings: channel, bitrate, prf, plen, and gain.
 """
 
-from pypozyx.definitions.constants import *
 from pypozyx.definitions.bitmasks import PozyxBitmasks
 from pypozyx.structures.byte_structure import ByteStructure
 from pypozyx.structures.generic import Data

pypozyx/structures/generic.py

@@ -37,8 +37,6 @@
   >>> d = Data([0] * len(data_format), data_format)
 """
 
-import struct
-
 from pypozyx.structures.byte_structure import ByteStructure
 
 
@@ -103,6 +101,7 @@ def dataCheck(data):
         return False
     return True
 
+
 class XYZ(ByteStructure):
     """
     Generic XYZ data structure consisting of 3 integers x, y, and z.
@@ -124,7 +123,7 @@ def __init__(self, x=0, y=0, z=0):
         self.z = z
         self.data = [x, y, z]
 
-    def load(self, data=[0] * 3, convert=1):
+    def load(self, data, convert=True):
         self.data = data
         if convert:
             self.x = data[0] / self.physical_convert
@@ -182,7 +181,7 @@ def __init__(self, data=None, data_format=None):
         self.set_packed_size()
         self.byte_data = '00' * self.byte_size
 
-    def load(self, data, convert=1):
+    def load(self, data, convert=True):
         self.data = data
 
 
@@ -212,11 +211,13 @@ def __init__(self, value=0, size=1, signed=0, print_style='hex'):
             data_format = 'h'
         elif size == 4:
             data_format = 'i'
+        else:
+            raise ValueError("Size should be 1, 2, or 4")
         if signed == 0:
             data_format = data_format.capitalize()
         Data.__init__(self, [value], data_format)
 
-    def load(self, data, convert=1):
+    def load(self, data, convert=True):
         self.data = data
 
     @property
@@ -227,7 +228,6 @@ def value(self):
     def value(self, new_value):
         self.data[0] = new_value
 
-
     def __str__(self):
         if self.print_style is 'hex':
             return hex(self.data[0]).capitalize()
@@ -236,6 +236,7 @@ def __str__(self):
         else:
             return str(self.data[0])
 
+
 class SingleSensorValue(ByteStructure):
     """
     Generic Single Sensor Value data structure.
@@ -255,7 +256,7 @@ def __init__(self, value=0):
         self.value = value
         self.load([value])
 
-    def load(self, data=[0], convert=1):
+    def load(self, data=[0], convert=True):
         self.data = data
         if convert:
             self.value = float(data[0]) / self.physical_convert

pypozyx/structures/sensor_data.py

@@ -3,8 +3,7 @@
 """pypozyx.structures.sensor_data - Contains container classes for data from the Pozyx's many sensors."""
 from math import sqrt
 
-from pypozyx.definitions.constants import (POZYX_ACCEL_DIV_MG, POZYX_MAG_DIV_UT, POZYX_GYRO_DIV_DPS,
-                                           POZYX_QUAT_DIV, POZYX_MAX_LIN_ACCEL_DIV_MG, POZYX_TEMP_DIV_CELSIUS, POZYX_PRESS_DIV_PA, POZYX_EULER_DIV_DEG)
+from pypozyx.definitions.constants import PozyxConstants
 from pypozyx.structures.byte_structure import ByteStructure
 from pypozyx.structures.generic import XYZ, SingleSensorValue
 
@@ -14,7 +13,7 @@ class Coordinates(XYZ):
     byte_size = 12
     data_format = 'iii'
 
-    def load(self, data, convert=0):
+    def load(self, data, convert=False):
         self.data = data
         self.x = data[0]
         self.y = data[1]
@@ -23,36 +22,36 @@ def load(self, data, convert=0):
 
 class Acceleration(XYZ):
     """Container for acceleration in x, y, and z (in mg)."""
-    physical_convert = POZYX_ACCEL_DIV_MG
+    physical_convert = PozyxConstants.POZYX_ACCEL_DIV_MG
 
     byte_size = 6
     data_format = 'hhh'
 
 
 class Magnetic(XYZ):
     """Container for coordinates in x, y, and z (in uT)."""
-    physical_convert = POZYX_MAG_DIV_UT
+    physical_convert = PozyxConstants.POZYX_MAG_DIV_UT
 
     byte_size = 6
     data_format = 'hhh'
 
 
 class AngularVelocity(XYZ):
     """Container for angular velocity in x, y, and z (in dps)."""
-    physical_convert = POZYX_GYRO_DIV_DPS
+    physical_convert = PozyxConstants.POZYX_GYRO_DIV_DPS
 
     byte_size = 6
     data_format = 'hhh'
 
 
 class LinearAcceleration(XYZ):
     """Container for linear acceleration in x, y, and z (in mg), as floats."""
-    physical_convert = POZYX_ACCEL_DIV_MG
+    physical_convert = PozyxConstants.POZYX_ACCEL_DIV_MG
 
     byte_size = 6
     data_format = 'hhh'
 
-    def load(self, data, convert=1):
+    def load(self, data, convert=True):
         if convert:
             self.x = float(data[0]) / self.physical_convert
             self.y = float(data[1]) / self.physical_convert
@@ -96,7 +95,7 @@ def __str__(self):
 
 class Quaternion(XYZ):
     """Container for quaternion data in x, y, z and w."""
-    physical_convert = POZYX_QUAT_DIV
+    physical_convert = PozyxConstants.POZYX_QUAT_DIV
 
     byte_size = 8
     data_format = 'hhhh'
@@ -107,7 +106,7 @@ def __init__(self, w=0, x=0, y=0, z=0):
         self.data = [w, x, y, z]
         self.w = w
 
-    def load(self, data, convert=1):
+    def load(self, data, convert=True):
         for i in range(len(data)):
             data[i] = float(data[i])
         XYZ.load(self, data[1:4], convert)
@@ -141,14 +140,14 @@ def __str__(self):
 
 
 class MaxLinearAcceleration(SingleSensorValue):
-    physical_convert = POZYX_MAX_LIN_ACCEL_DIV_MG
+    physical_convert = PozyxConstants.POZYX_MAX_LIN_ACCEL_DIV_MG
 
     byte_size = 2
     data_format = 'h'
 
 
 class Temperature(SingleSensorValue):
-    physical_convert = POZYX_TEMP_DIV_CELSIUS
+    physical_convert = PozyxConstants.POZYX_TEMP_DIV_CELSIUS
 
     byte_size = 1
     data_format = 'b'
@@ -158,15 +157,15 @@ def __str__(self):
 
 
 class Pressure(SingleSensorValue):
-    physical_convert = POZYX_PRESS_DIV_PA
+    physical_convert = PozyxConstants.POZYX_PRESS_DIV_PA
 
     byte_size = 4
     data_format = 'I'
 
 
 class EulerAngles(ByteStructure):
     """Container for euler angles as heading, roll, and pitch (in degrees)."""
-    physical_convert = POZYX_EULER_DIV_DEG
+    physical_convert = PozyxConstants.POZYX_EULER_DIV_DEG
 
     byte_size = 6
     data_format = 'hhh'
@@ -178,7 +177,7 @@ def __init__(self, heading=0, roll=0, pitch=0):
         self.roll = roll
         self.pitch = pitch
 
-    def load(self, data, convert=1):
+    def load(self, data, convert=True):
         self.data = data
         if convert:
             self.heading = float(data[0]) / self.physical_convert
@@ -236,7 +235,7 @@ def __init__(self, data=[0] * 24):
         self.gravity_vector = LinearAcceleration(data[20], data[21], data[22])
         self.temperature = Temperature(data[23])
 
-    def load(self, data, convert=1):
+    def load(self, data, convert=True):
         self.data = data
         self.pressure.load([data[0]], convert)
         self.acceleration.load(data[1:4], convert)
@@ -272,5 +271,5 @@ def __init__(self, data=[0] * 24):
         """Initializes the RawSensorData object"""
         SensorData.__init__(self, data)
 
-    def load(self, data, convert=0):
-        SensorData.load(self, data, convert=0)
+    def load(self, data):
+        SensorData.load(self, data, convert=False)