Index: leahi_dialin/common/msg_defs.py =================================================================== diff -u -r775f2d7ca9a4d1c86c02bc27130f8765dc4156ad -r3f4937e339925dde0b95f08e49969f8983c5cba4 --- leahi_dialin/common/msg_defs.py (.../msg_defs.py) (revision 775f2d7ca9a4d1c86c02bc27130f8765dc4156ad) +++ leahi_dialin/common/msg_defs.py (.../msg_defs.py) (revision 3f4937e339925dde0b95f08e49969f8983c5cba4) @@ -15,9 +15,8 @@ ############################################################################ from enum import unique from ..utils.enums import DialinEnum -from .msg_ids import MsgIds -from .constants import MSG_HEADER_SIZE + ACK_NOT_REQUIRED = [ ] @@ -72,153 +71,3 @@ REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH = 46 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 = 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 - START_POS_FIELD_3 = END_POS_FIELD_2 - END_POS_FIELD_3 = START_POS_FIELD_3 + 4 - START_POS_FIELD_4 = END_POS_FIELD_3 - END_POS_FIELD_4 = START_POS_FIELD_4 + 4 - START_POS_FIELD_5 = END_POS_FIELD_4 - END_POS_FIELD_5 = START_POS_FIELD_5 + 4 - START_POS_FIELD_6 = END_POS_FIELD_5 - END_POS_FIELD_6 = START_POS_FIELD_6 + 4 - START_POS_FIELD_7 = END_POS_FIELD_6 - END_POS_FIELD_7 = START_POS_FIELD_7 + 4 - START_POS_FIELD_8 = END_POS_FIELD_7 - END_POS_FIELD_8 = START_POS_FIELD_8 + 4 - START_POS_FIELD_9 = END_POS_FIELD_8 - END_POS_FIELD_9 = START_POS_FIELD_9 + 4 - START_POS_FIELD_10 = END_POS_FIELD_9 - END_POS_FIELD_10 = START_POS_FIELD_10 + 4 - START_POS_FIELD_11 = END_POS_FIELD_10 - END_POS_FIELD_11 = START_POS_FIELD_11 + 4 - START_POS_FIELD_12 = END_POS_FIELD_11 - END_POS_FIELD_12 = START_POS_FIELD_12 + 4 - START_POS_FIELD_13 = END_POS_FIELD_12 - END_POS_FIELD_13 = START_POS_FIELD_13 + 4 - START_POS_FIELD_14 = END_POS_FIELD_13 - END_POS_FIELD_14 = START_POS_FIELD_14 + 4 - START_POS_FIELD_15 = END_POS_FIELD_14 - END_POS_FIELD_15 = START_POS_FIELD_15 + 4 - START_POS_FIELD_16 = END_POS_FIELD_15 - END_POS_FIELD_16 = START_POS_FIELD_16 + 4 - START_POS_FIELD_17 = END_POS_FIELD_16 - END_POS_FIELD_17 = START_POS_FIELD_17 + 4 - START_POS_FIELD_18 = END_POS_FIELD_17 - END_POS_FIELD_18 = START_POS_FIELD_18 + 4 - START_POS_FIELD_19 = END_POS_FIELD_18 - END_POS_FIELD_19 = START_POS_FIELD_19 + 4 - START_POS_FIELD_20 = END_POS_FIELD_19 - END_POS_FIELD_20 = START_POS_FIELD_20 + 4 - START_POS_FIELD_21 = END_POS_FIELD_20 - END_POS_FIELD_21 = START_POS_FIELD_21 + 4 - START_POS_FIELD_22 = END_POS_FIELD_21 - END_POS_FIELD_22 = START_POS_FIELD_22 + 4 - START_POS_FIELD_23 = END_POS_FIELD_22 - END_POS_FIELD_23 = START_POS_FIELD_23 + 4 - START_POS_FIELD_24 = END_POS_FIELD_23 - END_POS_FIELD_24 = START_POS_FIELD_24 + 4 - START_POS_FIELD_25 = END_POS_FIELD_24 - END_POS_FIELD_25 = START_POS_FIELD_25 + 4 - START_POS_FIELD_26 = END_POS_FIELD_25 - END_POS_FIELD_26 = START_POS_FIELD_26 + 4 - START_POS_FIELD_27 = END_POS_FIELD_26 - END_POS_FIELD_27 = START_POS_FIELD_27 + 4 - START_POS_FIELD_28 = END_POS_FIELD_27 - 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 = 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 - START_POS_MICRO = END_POS_MINOR - END_POS_MICRO = START_POS_MICRO + 1 - START_POS_BUILD = END_POS_MICRO - END_POS_BUILD = START_POS_BUILD + 2 - START_POS_FPGA_ID = END_POS_BUILD - END_POS_FPGA_ID = START_POS_FPGA_ID + 1 - START_POS_FPGA_MAJOR = END_POS_FPGA_ID - END_POS_FPGA_MAJOR = START_POS_FPGA_MAJOR + 1 - START_POS_FPGA_MINOR = END_POS_FPGA_MAJOR - END_POS_FPGA_MINOR = START_POS_FPGA_MINOR + 1 - 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