Index: leahi_dialin/common/msg_defs.py =================================================================== diff -u -r41de945f9c773e54e965e80d9e46def828beb732 -r775f2d7ca9a4d1c86c02bc27130f8765dc4156ad --- leahi_dialin/common/msg_defs.py (.../msg_defs.py) (revision 41de945f9c773e54e965e80d9e46def828beb732) +++ leahi_dialin/common/msg_defs.py (.../msg_defs.py) (revision 775f2d7ca9a4d1c86c02bc27130f8765dc4156ad) @@ -14,15 +14,13 @@ # ############################################################################ from enum import unique -from ..utils.base import DialinEnum +from ..utils.enums import DialinEnum from .msg_ids import MsgIds +from .constants import MSG_HEADER_SIZE +ACK_NOT_REQUIRED = [ ] -ACK_NOT_REQUIRED = [ -] - - @unique class RequestRejectReasons(DialinEnum): REQUEST_REJECT_REASON_NONE = 0 @@ -75,9 +73,10 @@ REQUEST_REJECT_REASON_TREATMENT_CANNOT_BE_RESUMED = 47 RequestRejectReasons._str_list = {} + class MsgFieldPositions: # Generic response msg field byte positions (where 32-bit data fields are used) - START_POS_FIELD_1 = 6 # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.DenaliMessage class + START_POS_FIELD_1 = MSG_HEADER_SIZE # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.CanMessage class END_POS_FIELD_1 = START_POS_FIELD_1 + 4 START_POS_FIELD_2 = END_POS_FIELD_1 END_POS_FIELD_2 = START_POS_FIELD_2 + 4 @@ -135,11 +134,77 @@ END_POS_FIELD_28 = START_POS_FIELD_28 + 4 START_POS_FIELD_29 = END_POS_FIELD_28 END_POS_FIELD_29 = START_POS_FIELD_29 + 4 + START_POS_FIELD_30 = END_POS_FIELD_29 + END_POS_FIELD_30 = START_POS_FIELD_29 + 4 + START_POS_FIELD_31 = END_POS_FIELD_30 + END_POS_FIELD_31 = START_POS_FIELD_30 + 4 + START_POS_FIELD_32 = END_POS_FIELD_31 + END_POS_FIELD_32 = START_POS_FIELD_31 + 4 + START_POS_FIELD_33 = END_POS_FIELD_32 + END_POS_FIELD_33 = START_POS_FIELD_32 + 4 + START_POS_FIELD_34 = END_POS_FIELD_33 + END_POS_FIELD_34 = START_POS_FIELD_33 + 4 + START_POS_FIELD_35 = END_POS_FIELD_34 + END_POS_FIELD_35 = START_POS_FIELD_34 + 4 + START_POS_FIELD_36 = END_POS_FIELD_35 + END_POS_FIELD_36 = START_POS_FIELD_35 + 4 + START_POS_FIELD_37 = END_POS_FIELD_36 + END_POS_FIELD_37 = START_POS_FIELD_36 + 4 + START_POS_FIELD_38 = END_POS_FIELD_37 + END_POS_FIELD_38 = START_POS_FIELD_37 + 4 + START_POS_FIELD_39 = END_POS_FIELD_38 + END_POS_FIELD_39 = START_POS_FIELD_38 + 4 + START_POS_FIELD_40 = END_POS_FIELD_39 + END_POS_FIELD_40 = START_POS_FIELD_39 + 4 + START_POS_FIELD_41 = END_POS_FIELD_40 + END_POS_FIELD_41 = START_POS_FIELD_40 + 4 + START_POS_FIELD_42 = END_POS_FIELD_41 + END_POS_FIELD_42 = START_POS_FIELD_41 + 4 + START_POS_FIELD_43 = END_POS_FIELD_42 + END_POS_FIELD_43 = START_POS_FIELD_42 + 4 + START_POS_FIELD_44 = END_POS_FIELD_43 + END_POS_FIELD_44 = START_POS_FIELD_43 + 4 + START_POS_FIELD_45 = END_POS_FIELD_44 + END_POS_FIELD_45 = START_POS_FIELD_44 + 4 + START_POS_FIELD_46 = END_POS_FIELD_45 + END_POS_FIELD_46 = START_POS_FIELD_45 + 4 + START_POS_FIELD_47 = END_POS_FIELD_46 + END_POS_FIELD_47 = START_POS_FIELD_46 + 4 + START_POS_FIELD_48 = END_POS_FIELD_47 + END_POS_FIELD_48 = START_POS_FIELD_47 + 4 + START_POS_FIELD_49 = END_POS_FIELD_48 + END_POS_FIELD_49 = START_POS_FIELD_48 + 4 + START_POS_FIELD_50 = END_POS_FIELD_49 + END_POS_FIELD_50 = START_POS_FIELD_49 + 4 + START_POS_FIELD_51 = END_POS_FIELD_50 + END_POS_FIELD_51 = START_POS_FIELD_50 + 4 + START_POS_FIELD_52 = END_POS_FIELD_51 + END_POS_FIELD_52 = START_POS_FIELD_51 + 4 + START_POS_FIELD_53 = END_POS_FIELD_52 + END_POS_FIELD_53 = START_POS_FIELD_52 + 4 + START_POS_FIELD_54 = END_POS_FIELD_53 + END_POS_FIELD_54 = START_POS_FIELD_53 + 4 + START_POS_FIELD_55 = END_POS_FIELD_54 + END_POS_FIELD_55 = START_POS_FIELD_54 + 4 + START_POS_FIELD_56 = END_POS_FIELD_55 + END_POS_FIELD_56 = START_POS_FIELD_55 + 4 + START_POS_FIELD_57 = END_POS_FIELD_56 + END_POS_FIELD_57 = START_POS_FIELD_56 + 4 + START_POS_FIELD_58 = END_POS_FIELD_57 + END_POS_FIELD_58 = START_POS_FIELD_57 + 4 + START_POS_FIELD_59 = END_POS_FIELD_58 + END_POS_FIELD_59 = START_POS_FIELD_58 + 4 + START_POS_FIELD_60 = END_POS_FIELD_59 + END_POS_FIELD_60 = START_POS_FIELD_59 + 4 + START_POS_FIELD_61 = END_POS_FIELD_60 + END_POS_FIELD_61 = START_POS_FIELD_60 + 4 + START_POS_FIELD_62 = END_POS_FIELD_61 + END_POS_FIELD_62 = START_POS_FIELD_61 + 4 class MsgFieldPositionsFWVersions: # UI version message field positions - START_POS_MAJOR = 6 # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.DenaliMessage class + START_POS_MAJOR = MSG_HEADER_SIZE # Hardcoded for now to avoid cyclic import issue. See protocols.CAN.CanMessage class END_POS_MAJOR = START_POS_MAJOR + 1 START_POS_MINOR = END_POS_MAJOR END_POS_MINOR = START_POS_MINOR + 1 @@ -156,4 +221,4 @@ START_POS_FPGA_MICRO = END_POS_FPGA_MINOR END_POS_FPGA_MICRO = START_POS_FPGA_MICRO + 1 START_POS_COMPATIBILITY_REV = END_POS_FPGA_MICRO - END_POS_COMPATIBILITY_REV = START_POS_COMPATIBILITY_REV + 4 \ No newline at end of file + END_POS_COMPATIBILITY_REV = START_POS_COMPATIBILITY_REV + 4