Index: dialin/ui/hd_simulator.py =================================================================== diff -u -rbf3f26db920b3ec4d8d11ad6a9efbffa0b5d53b0 -r3ed79c5b9910a16ae58402c7380a4d3375d1d0fc --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision bf3f26db920b3ec4d8d11ad6a9efbffa0b5d53b0) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 3ed79c5b9910a16ae58402c7380a4d3375d1d0fc) @@ -28,7 +28,7 @@ DenaliCanMessenger, DenaliChannels) from ..utils.base import _AbstractSubSystem, _LogManager -from ..utils.conversions import integer_to_bytearray, float_to_bytearray +from ..utils.conversions import integer_to_bytearray, float_to_bytearray, byte_to_bytearray, short_to_bytearray YES = 1 NO = 0 @@ -1709,9 +1709,9 @@ self.can_interface.send(message, 0) - def cmd_send_acccelerometer_hd_data(self, vX, vY, vZ, vXMax, vYMax, vZMax, vXTilt, vYTilt, vZTilt ): + def cmd_send_accelerometer_hd_data(self, vX, vY, vZ, vXMax, vYMax, vZMax, vXTilt, vYTilt, vZTilt ): """ - the acccelerometer hd data message method + the accelerometer hd data message method | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | |0x3300| 0x040 | 7 | 1Hz | N | HD | UI | HD Accelerometer data | @@ -1756,9 +1756,9 @@ self.can_interface.send(message, 0) - def cmd_send_acccelerometer_dg_data(self, vX, vY, vZ, vXMax, vYMax, vZMax, vXTilt, vYTilt, vZTilt ): + def cmd_send_accelerometer_dg_data(self, vX, vY, vZ, vXMax, vYMax, vZMax, vXTilt, vYTilt, vZTilt ): """ - the acccelerometer dg data message method + the accelerometer dg data message method | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | |0x3400| 0x080 | 8 | 1Hz | N | HD | UI | DG Accelerometer data | @@ -1817,14 +1817,14 @@ :return: None """ - payload = integer_to_bytearray(vMajor) - payload += integer_to_bytearray(vMinor) - payload += integer_to_bytearray(vMicro) - payload += integer_to_bytearray(vBuild) - payload += integer_to_bytearray(vFPGA_id) - payload += integer_to_bytearray(vFPGA_Major) - payload += integer_to_bytearray(vFPGA_Minor) - payload += integer_to_bytearray(vFPGA_Lab) + payload = byte_to_bytearray(vMajor) + payload += byte_to_bytearray(vMinor) + payload += byte_to_bytearray(vMicro) + payload += short_to_bytearray(vBuild) + payload += byte_to_bytearray(vFPGA_id) + payload += byte_to_bytearray(vFPGA_Major) + payload += byte_to_bytearray(vFPGA_Minor) + payload += byte_to_bytearray(vFPGA_Lab) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, message_id=MsgIds.MSG_ID_HD_VERSION.value, @@ -1846,14 +1846,14 @@ :return: None """ - payload = integer_to_bytearray(vMajor) - payload += integer_to_bytearray(vMinor) - payload += integer_to_bytearray(vMicro) - payload += integer_to_bytearray(vBuild) - payload += integer_to_bytearray(vFPGA_id) - payload += integer_to_bytearray(vFPGA_Major) - payload += integer_to_bytearray(vFPGA_Minor) - payload += integer_to_bytearray(vFPGA_Lab) + payload = byte_to_bytearray(vMajor) + payload += byte_to_bytearray(vMinor) + payload += byte_to_bytearray(vMicro) + payload += short_to_bytearray(vBuild) + payload += byte_to_bytearray(vFPGA_id) + payload += byte_to_bytearray(vFPGA_Major) + payload += byte_to_bytearray(vFPGA_Minor) + payload += byte_to_bytearray(vFPGA_Lab) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_ui_ch_id, message_id=MsgIds.MSG_ID_DG_VERSION.value, Index: dialin/utils/conversions.py =================================================================== diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -r3ed79c5b9910a16ae58402c7380a4d3375d1d0fc --- dialin/utils/conversions.py (.../conversions.py) (revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7) +++ dialin/utils/conversions.py (.../conversions.py) (revision 3ed79c5b9910a16ae58402c7380a4d3375d1d0fc) @@ -16,6 +16,26 @@ import struct +def byte_to_bytearray(val): + """ + Converts a byte value into a byte array (little endian) + + @param val: (int) integer to convert to byte array + @return: byte array + """ + return struct.pack("