Index: dialin/dg/accelerometer.py =================================================================== diff -u -ra0370d7df824c38cc35a1ab57b6efe1e2f8b1ca8 -r10b117b1e65980a9c1a93a4c718c33fe2976f1e4 --- dialin/dg/accelerometer.py (.../accelerometer.py) (revision a0370d7df824c38cc35a1ab57b6efe1e2f8b1ca8) +++ dialin/dg/accelerometer.py (.../accelerometer.py) (revision 10b117b1e65980a9c1a93a4c718c33fe2976f1e4) @@ -124,28 +124,19 @@ @return: none """ - x = struct.unpack('f', bytearray( - message['message'][self.START_POS_X:self.END_POS_X])) - y = struct.unpack('f', bytearray( - message['message'][self.START_POS_Y:self.END_POS_Y])) - z = struct.unpack('f', bytearray( - message['message'][self.START_POS_Z:self.END_POS_Z])) + x = struct.unpack('f', bytearray(message['message'][self.START_POS_X:self.END_POS_X])) + y = struct.unpack('f', bytearray(message['message'][self.START_POS_Y:self.END_POS_Y])) + z = struct.unpack('f', bytearray(message['message'][self.START_POS_Z:self.END_POS_Z])) self.vector = self.AccelerometerVector( x[0], y[0], z[0] ) - x = struct.unpack('f', bytearray( - message['message'][self.START_POS_MAX_X:self.END_POS_MAX_X])) - y = struct.unpack('f', bytearray( - message['message'][self.START_POS_MAX_Y:self.END_POS_MAX_Y])) - z = struct.unpack('f', bytearray( - message['message'][self.START_POS_MAX_Z:self.END_POS_MAX_Z])) + x = struct.unpack('f', bytearray(message['message'][self.START_POS_MAX_X:self.END_POS_MAX_X])) + y = struct.unpack('f', bytearray(message['message'][self.START_POS_MAX_Y:self.END_POS_MAX_Y])) + z = struct.unpack('f', bytearray(message['message'][self.START_POS_MAX_Z:self.END_POS_MAX_Z])) self.vector_max = self.AccelerometerVector( x[0], y[0], z[0] ) - x = struct.unpack('f', bytearray( - message['message'][self.START_POS_TILT_X:self.END_POS_TILT_X])) - y = struct.unpack('f', bytearray( - message['message'][self.START_POS_TILT_Y:self.END_POS_TILT_Y])) - z = struct.unpack('f', bytearray( - message['message'][self.START_POS_TILT_Z:self.END_POS_TILT_Z])) + x = struct.unpack('f', bytearray(message['message'][self.START_POS_TILT_X:self.END_POS_TILT_X])) + y = struct.unpack('f', bytearray(message['message'][self.START_POS_TILT_Y:self.END_POS_TILT_Y])) + z = struct.unpack('f', bytearray(message['message'][self.START_POS_TILT_Z:self.END_POS_TILT_Z])) self.tilts = self.AccelerometerVector( x[0], y[0], z[0] ) def cmd_accel_vector_override(self, mag, axis, reset=NO_RESET): Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r6f6b6c076ce638b404534b2bf04cb3f986ee6b26 -r10b117b1e65980a9c1a93a4c718c33fe2976f1e4 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 6f6b6c076ce638b404534b2bf04cb3f986ee6b26) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 10b117b1e65980a9c1a93a4c718c33fe2976f1e4) @@ -167,14 +167,10 @@ @return: None if unsuccessful, the version string if unpacked successfully """ - major = struct.unpack('B', bytearray( - message['message'][self.START_POS_MAJOR:self.END_POS_MAJOR])) - minor = struct.unpack('B', bytearray( - message['message'][self.START_POS_MINOR:self.END_POS_MINOR])) - micro = struct.unpack('B', bytearray( - message['message'][self.START_POS_MICRO:self.END_POS_MICRO])) - build = struct.unpack('H', bytearray( - message['message'][self.START_POS_BUILD:self.END_POS_BUILD])) + major = struct.unpack('B', bytearray(message['message'][self.START_POS_MAJOR:self.END_POS_MAJOR])) + minor = struct.unpack('B', bytearray(message['message'][self.START_POS_MINOR:self.END_POS_MINOR])) + micro = struct.unpack('B', bytearray(message['message'][self.START_POS_MICRO:self.END_POS_MICRO])) + build = struct.unpack('H', bytearray(message['message'][self.START_POS_BUILD:self.END_POS_BUILD])) if len(major) > 0 and len(minor) > 0 and len(micro) > 0 and len(build) > 0: self.dg_version = f"v{major[0]}.{minor[0]}.{micro[0]}-{build[0]}" Index: dialin/hd/accelerometer.py =================================================================== diff -u -ra0370d7df824c38cc35a1ab57b6efe1e2f8b1ca8 -r10b117b1e65980a9c1a93a4c718c33fe2976f1e4 --- dialin/hd/accelerometer.py (.../accelerometer.py) (revision a0370d7df824c38cc35a1ab57b6efe1e2f8b1ca8) +++ dialin/hd/accelerometer.py (.../accelerometer.py) (revision 10b117b1e65980a9c1a93a4c718c33fe2976f1e4) @@ -124,28 +124,19 @@ @return: none """ - x = struct.unpack('f', bytearray( - message['message'][self.START_POS_X:self.END_POS_X])) - y = struct.unpack('f', bytearray( - message['message'][self.START_POS_Y:self.END_POS_Y])) - z = struct.unpack('f', bytearray( - message['message'][self.START_POS_Z:self.END_POS_Z])) + x = struct.unpack('f', bytearray(message['message'][self.START_POS_X:self.END_POS_X])) + y = struct.unpack('f', bytearray(message['message'][self.START_POS_Y:self.END_POS_Y])) + z = struct.unpack('f', bytearray(message['message'][self.START_POS_Z:self.END_POS_Z])) self.vector = self.AccelerometerVector( x[0], y[0], z[0] ) - x = struct.unpack('f', bytearray( - message['message'][self.START_POS_MAX_X:self.END_POS_MAX_X])) - y = struct.unpack('f', bytearray( - message['message'][self.START_POS_MAX_Y:self.END_POS_MAX_Y])) - z = struct.unpack('f', bytearray( - message['message'][self.START_POS_MAX_Z:self.END_POS_MAX_Z])) + x = struct.unpack('f', bytearray(message['message'][self.START_POS_MAX_X:self.END_POS_MAX_X])) + y = struct.unpack('f', bytearray(message['message'][self.START_POS_MAX_Y:self.END_POS_MAX_Y])) + z = struct.unpack('f', bytearray(message['message'][self.START_POS_MAX_Z:self.END_POS_MAX_Z])) self.vector_max = self.AccelerometerVector( x[0], y[0], z[0] ) - x = struct.unpack('f', bytearray( - message['message'][self.START_POS_TILT_X:self.END_POS_TILT_X])) - y = struct.unpack('f', bytearray( - message['message'][self.START_POS_TILT_Y:self.END_POS_TILT_Y])) - z = struct.unpack('f', bytearray( - message['message'][self.START_POS_TILT_Z:self.END_POS_TILT_Z])) + x = struct.unpack('f', bytearray(message['message'][self.START_POS_TILT_X:self.END_POS_TILT_X])) + y = struct.unpack('f', bytearray(message['message'][self.START_POS_TILT_Y:self.END_POS_TILT_Y])) + z = struct.unpack('f', bytearray(message['message'][self.START_POS_TILT_Z:self.END_POS_TILT_Z])) self.tilts = self.AccelerometerVector( x[0], y[0], z[0] ) def cmd_accel_vector_override(self, mag, axis, reset=NO_RESET): Index: dialin/squish/messageBuilder.py =================================================================== diff -u -r63f32da409c04f95d4dfc788f1a30d6299e85273 -r10b117b1e65980a9c1a93a4c718c33fe2976f1e4 --- dialin/squish/messageBuilder.py (.../messageBuilder.py) (revision 63f32da409c04f95d4dfc788f1a30d6299e85273) +++ dialin/squish/messageBuilder.py (.../messageBuilder.py) (revision 10b117b1e65980a9c1a93a4c718c33fe2976f1e4) @@ -60,5 +60,3 @@ msg += arg msg += calcCRC8(msg) return syncByte + msg - -