Index: dialin/squish/denaliMessages.py =================================================================== diff -u -r511f8ce9d68e437c7812f9d79324719803dfafc9 -rc6b120f6a2e0e9e23550e39c7034bef31b8dbe54 --- dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision 511f8ce9d68e437c7812f9d79324719803dfafc9) +++ dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision c6b120f6a2e0e9e23550e39c7034bef31b8dbe54) @@ -30,6 +30,7 @@ import subprocess from .utils import toI32, toF32, toI16 from .messageBuilder import buildMessage, toFrames, toCandumpFormat +from dialin.squish import messageBuilder class EResponse: @@ -115,7 +116,7 @@ ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ def buildHDDebugText(vText): len = 40 - txt = textToByte(vText, len) # + 1 null term + txt = messageBuilder.textToByte(vText, len) # + 1 null term msg = buildMessage( GuiActionType.HDDebugText, 1 * (len + 1), False, txt) return toFrames(msg) ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -130,7 +131,7 @@ ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ def buildDGDebugText(vText): len = 40 - txt = textToByte(vText, len) # + 1 null term + txt = messageBuilder.textToByte(vText, len) # + 1 null term msg = buildMessage( GuiActionType.DGDebugText, 1 * (len + 1), False, txt) return toFrames(msg) Index: dialin/squish/messageBuilder.py =================================================================== diff -u -r511f8ce9d68e437c7812f9d79324719803dfafc9 -rc6b120f6a2e0e9e23550e39c7034bef31b8dbe54 --- dialin/squish/messageBuilder.py (.../messageBuilder.py) (revision 511f8ce9d68e437c7812f9d79324719803dfafc9) +++ dialin/squish/messageBuilder.py (.../messageBuilder.py) (revision c6b120f6a2e0e9e23550e39c7034bef31b8dbe54) @@ -70,10 +70,10 @@ l = len(vText) for i in range(vLen): if i < l: - text += utils.toI08(ord(vText[i])) + text += toI08(ord(vText[i])) else: - text += utils.toI08(0) - text += utils.toI08(0) #null /0 + text += toI08(0) + text += toI08(0) #null /0 return text