Index: DD_DateTime/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- DD_DateTime/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ DD_DateTime/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -72,7 +73,7 @@ if ( reason == 0 ): message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE dateTime,index = conversions.bytearray_to_integer( message, index) self.lbDateTime .setText( str(dateTime) ) Index: DD_RO_WaterMode/loader.py =================================================================== diff -u -red036ca13ecc35dcbdca1ce8474bddfcbd1b0756 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- DD_RO_WaterMode/loader.py (.../loader.py) (revision ed036ca13ecc35dcbdca1ce8474bddfcbd1b0756) +++ DD_RO_WaterMode/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -12,7 +12,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -118,7 +119,7 @@ :return: none """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer( message, index) cmdString = self.cmdStrings[value] if value >= 0 and value < len(self.cmdStrings) else "" self.lbAdjustRoWaterModeRequest.setText(f"{cmdString} ({value})") Index: MainTreatmentData/loader.py =================================================================== diff -u -rc2a68654fcf052f130d3e5de8457aaa375b72506 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- MainTreatmentData/loader.py (.../loader.py) (revision c2a68654fcf052f130d3e5de8457aaa375b72506) +++ MainTreatmentData/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -113,7 +114,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE state,index = conversions.bytearray_to_integer( message, index) self.lbBolusStart .setText( str(state) ) Index: TD_Advanced_Institutional_Records/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Advanced_Institutional_Records/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_Advanced_Institutional_Records/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -204,7 +205,7 @@ @return: None """ message = message['message'] - self.index = MsgFieldPositions.START_POS_FIELD_1 + self.index = MSG_HEADER_SIZE accepted = ( self.sbMinRORejectionRatioAlarmMinRejectionReason .value() + Index: TD_BloodPrime/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_BloodPrime/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_BloodPrime/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -144,7 +145,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) cmdString = self.cmdStrings[value] if value >= 0 and value < len(self.cmdStrings) else "" self.lbCmdReqCommand.setText(f"{cmdString} ({value})") Index: TD_Confirm/loader.py =================================================================== diff -u -r934beb78b79499cd544cae598048d24eb86acc22 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Confirm/loader.py (.../loader.py) (revision 934beb78b79499cd544cae598048d24eb86acc22) +++ TD_Confirm/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -82,7 +83,7 @@ """ print() message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE id,index = conversions.bytearray_to_integer(message, index) confirm,index = conversions.bytearray_to_integer(message, index) cmdString = self.cmdStrings[id] if id >= 0 and id < len(self.cmdStrings) else "" Index: TD_DateTime/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_DateTime/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_DateTime/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -72,7 +73,7 @@ if ( reason == 0 ): message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE dateTime,index = conversions.bytearray_to_integer( message, index) self.lbDateTime .setText( str(dateTime) ) Index: TD_DryBicartDisconnect/loader.py =================================================================== diff -u -rd51b02e411ec18f90a6bbb2f6ed8f7e6f8b17bb5 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_DryBicartDisconnect/loader.py (.../loader.py) (revision d51b02e411ec18f90a6bbb2f6ed8f7e6f8b17bb5) +++ TD_DryBicartDisconnect/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -135,7 +136,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) cmdString = self.cmdStrings[value] if value >= 0 and value < len(self.cmdStrings) else "" self.lbReqCommand.setText(f"{cmdString} ({value})") Index: TD_End_Treatment/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_End_Treatment/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_End_Treatment/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,7 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.msg_ids import MsgIds from leahi_dialin.protocols import CAN # hd Simulator Index: TD_HDF/loader.py =================================================================== diff -u -r31a04301e0719002e80528c8d1e08aa452925f78 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_HDF/loader.py (.../loader.py) (revision 31a04301e0719002e80528c8d1e08aa452925f78) +++ TD_HDF/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -207,7 +208,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) cmdString = self.hdfState[value] if value >= 0 and value < len(self.hdfState) else "" self.lbHDFState.setText(f"{cmdString} ({value})") @@ -220,7 +221,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) cmdString = self.autoSubState[value] if value >= 0 and value < len(self.autoSubState) else "" self.lbAutoSub.setText(f"{cmdString} ({value})") @@ -233,7 +234,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE txMode,index = conversions.bytearray_to_integer (message, index) vol,index = conversions.bytearray_to_float (message, index) self.lbtxMode .setText(f"{txMode}") Index: TD_Heparin/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Heparin/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_Heparin/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -93,7 +94,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE state,index = conversions.bytearray_to_integer( message, index) self.lbHeparin .setText( str(state) ) Index: TD_Institutional_Records/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Institutional_Records/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_Institutional_Records/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -389,7 +390,7 @@ @return: None """ message = message['message'] - self.index = MsgFieldPositions.START_POS_FIELD_1 + self.index = MSG_HEADER_SIZE accepted = ( self.sbBloodFlowMinReason .value() + Index: TD_IsolatedUF/loader.py =================================================================== diff -u -r2f22dd779f62e03f061dc3fa000464c600d86872 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_IsolatedUF/loader.py (.../loader.py) (revision 2f22dd779f62e03f061dc3fa000464c600d86872) +++ TD_IsolatedUF/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions Index: TD_ParamRanges/loader.py =================================================================== diff -u -rb908a6c7f02cb688cc67f9d999686b4ba7d6d246 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_ParamRanges/loader.py (.../loader.py) (revision b908a6c7f02cb688cc67f9d999686b4ba7d6d246) +++ TD_ParamRanges/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions Index: TD_Post_Treatment/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Post_Treatment/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_Post_Treatment/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,7 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.msg_ids import MsgIds from leahi_dialin.protocols import CAN # hd Simulator Index: TD_Pre_Treatment/loader.py =================================================================== diff -u -rabcf784299ec8c8617692b5a57cf286eea658b98 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Pre_Treatment/loader.py (.../loader.py) (revision abcf784299ec8c8617692b5a57cf286eea658b98) +++ TD_Pre_Treatment/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -20,7 +20,8 @@ # dialin from leahi_dialin.ui.td_messaging import TD_Messaging -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -317,7 +318,7 @@ @return: None """ message = message['message'] - self.index = MsgFieldPositions.START_POS_FIELD_1 + self.index = MSG_HEADER_SIZE command = self.getIntValue(message) commandString = self.cmdStrings [command] modality = self.getIntValue(message) @@ -350,7 +351,7 @@ @return: None """ message = message['message'] - self.index = MsgFieldPositions.START_POS_FIELD_1 + self.index = MSG_HEADER_SIZE self.lbFinalConfirmation .setText(str(self.getIntValue(message))) self.lbTreatmentModality .setText(str(self.getIntValue(message))) self.lbHDFTreatmentMode .setText(str(self.getIntValue(message))) Index: TD_Pressures/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Pressures/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_Pressures/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,7 @@ # Plugin specific from leahi_dialin.ui.common import Ranges from leahi_dialin.protocols import CAN -from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.msg_ids import MsgIds from leahi_dialin.utils import conversions # hd Simulator Index: TD_Prime/loader.py =================================================================== diff -u -r4902b21dfddcccdbbef2e51ae9a1b2123aeeba73 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Prime/loader.py (.../loader.py) (revision 4902b21dfddcccdbbef2e51ae9a1b2123aeeba73) +++ TD_Prime/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions Index: TD_Recirculate/loader.py =================================================================== diff -u -r980818b4ab695268a45204f6b4a226a2b8ae8c24 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Recirculate/loader.py (.../loader.py) (revision 980818b4ab695268a45204f6b4a226a2b8ae8c24) +++ TD_Recirculate/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -116,7 +117,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) cmdString = self.cmdStrings[value] if value >= 0 and value < len(self.cmdStrings) else "" self.lbReqCommand.setText(f"{cmdString} ({value})") Index: TD_Rinseback/loader.py =================================================================== diff -u -r980818b4ab695268a45204f6b4a226a2b8ae8c24 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Rinseback/loader.py (.../loader.py) (revision 980818b4ab695268a45204f6b4a226a2b8ae8c24) +++ TD_Rinseback/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -147,7 +148,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) cmdString = self.cmdStrings[value] if value >= 0 and value < len(self.cmdStrings) else "" self.lbReqCommand.setText(f"{cmdString} ({value})") Index: TD_TreatmentAdjustmentsBolusVolume/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_TreatmentAdjustmentsBolusVolume/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_TreatmentAdjustmentsBolusVolume/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -74,7 +75,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) self.lbReqBolusVolume.setText("{0}".format(value)) Index: TD_TreatmentAdjustmentsDuration/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_TreatmentAdjustmentsDuration/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_TreatmentAdjustmentsDuration/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -106,7 +107,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) self.lbEditReqDuration.setText(f"{value}") @@ -157,7 +158,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE duration,index = conversions.bytearray_to_integer (message, index) hepDuration,index = conversions.bytearray_to_integer (message, index) rate,index = conversions.bytearray_to_float (message, index) Index: TD_TreatmentAdjustmentsIsolatedUF/loader.py =================================================================== diff -u -re33573617b167dc9a2f7f54529b4603c74e1a8a5 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_TreatmentAdjustmentsIsolatedUF/loader.py (.../loader.py) (revision e33573617b167dc9a2f7f54529b4603c74e1a8a5) +++ TD_TreatmentAdjustmentsIsolatedUF/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -15,7 +15,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -154,7 +155,7 @@ :return: none """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) self.lbDurationReq.setText(f"{value:.0f}") @@ -191,7 +192,7 @@ :return: none """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE self.reqDuration,index = conversions.bytearray_to_integer(message, index, False) self.reqVolume,index = conversions.bytearray_to_integer(message, index, False) self.lbVolumeReqParams.setText(f"Duration (min) = {self.reqDuration}, Volume (mL) = {self.reqVolume}") @@ -255,7 +256,7 @@ :return: none """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) cmdString = self.cmdStrings[value] if value >= 0 and value < len(self.cmdStrings) else "" self.lbStateReq.setText(f"{cmdString} ({value})") Index: TD_TreatmentAdjustmentsPressures/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_TreatmentAdjustmentsPressures/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_TreatmentAdjustmentsPressures/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -86,7 +87,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE param1,index = conversions.bytearray_to_integer(message, index) param2,index = conversions.bytearray_to_integer(message, index) param3,index = conversions.bytearray_to_integer(message, index) Index: TD_TreatmentAdjustmentsSetPoints/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -146,7 +147,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE param1,index = conversions.bytearray_to_integer (message, index) param2,index = conversions.bytearray_to_integer (message, index) param3,index = conversions.bytearray_to_float (message, index) @@ -207,7 +208,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer(message, index) self.lbBloodFlowRateReq.setText(f"{value}") @@ -241,7 +242,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_integer (message, index) self.lbDialysateFlowRateReq.setText(f"{value}") @@ -270,7 +271,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_float(message, index) self.lbDialysateTemperatureReq.setText(f"{value:.1f}") Index: TD_TreatmentAdjustmentsUltrafiltration/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_TreatmentAdjustmentsUltrafiltration/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_TreatmentAdjustmentsUltrafiltration/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -116,7 +117,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE value,index = conversions.bytearray_to_float(message, index) self.changeRequestLabel.setText(f"{value:.2f}") @@ -157,7 +158,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE state,index = conversions.bytearray_to_integer(message, index) self.prRequestLabel.setText(f"Resume({state})" if state else f"Pause({state})") @@ -190,7 +191,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE volume,index = conversions.bytearray_to_float(message, index) rate,index = conversions.bytearray_to_float(message, index) self.confirmRequestVolume.setText(f"{volume:.2f}") Index: TD_TreatmentAdjustmentsVitals/loader.py =================================================================== diff -u -ra8eae25e9f058fd6280ba65591ce11da5bce0d35 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_TreatmentAdjustmentsVitals/loader.py (.../loader.py) (revision a8eae25e9f058fd6280ba65591ce11da5bce0d35) +++ TD_TreatmentAdjustmentsVitals/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -92,7 +93,7 @@ @return: None """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE param1,index = conversions.bytearray_to_integer (message, index) param2,index = conversions.bytearray_to_integer (message, index) param3,index = conversions.bytearray_to_integer (message, index) Index: TD_Vitals/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_Vitals/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_Vitals/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,7 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.msg_ids import MsgIds from leahi_dialin.protocols import CAN # hd Simulator Index: TD_WaterSample/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TD_WaterSample/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ TD_WaterSample/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -12,7 +12,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions @@ -111,6 +112,6 @@ :return: none """ message = message['message'] - index = MsgFieldPositions.START_POS_FIELD_1 + index = MSG_HEADER_SIZE val,index = conversions.bytearray_to_float( message, index) self.lbWaterSampleResult.setText(f"{val:.2f}") Index: TreatmentLog/loader.py =================================================================== diff -u -r05edab0c07f66b4d8ed5358f1b329a8ac48cfb5d -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- TreatmentLog/loader.py (.../loader.py) (revision 05edab0c07f66b4d8ed5358f1b329a8ac48cfb5d) +++ TreatmentLog/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,8 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds +from leahi_dialin.common.constants import MSG_HEADER_SIZE from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions Index: Trends/loader.py =================================================================== diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3 --- Trends/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) +++ Trends/loader.py (.../loader.py) (revision fc43fc2ed484aec6f49ef1c7f67a71c4d0d5d0d3) @@ -14,7 +14,7 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.common.msg_ids import MsgIds from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions