Index: dialin/common/msg_defs.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -234,7 +234,7 @@ NUM_OF_REQUEST_REJECT_REASONS = 23 -class MsgFldPositions: +class MsgFieldPositions: # Generic response msg field byte positions (where 32-bit data fields are used) START_POS_FIELD_1 = DenaliMessage.PAYLOAD_START_INDEX END_POS_FIELD_1 = START_POS_FIELD_1 + 4 Index: dialin/dg/accelerometer.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/dg/accelerometer.py (.../accelerometer.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/accelerometer.py (.../accelerometer.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -19,7 +19,7 @@ from ..utils.conversions import integer_to_bytearray, float_to_bytearray from .constants import RESET, NO_RESET from ..utils.base import _AbstractSubSystem, _publish -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from logging import Logger class DGAccelerometer(_AbstractSubSystem): @@ -98,27 +98,27 @@ """ x = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) y = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) z = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) self.vector = self.AccelerometerVector( x[0], y[0], z[0] ) x = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) y = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) z = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) self.vector_max = self.AccelerometerVector( x[0], y[0], z[0] ) x = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) y = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8])) + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) z = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_9:MsgFldPositions.END_POS_FIELD_9])) + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) self.tilts = self.AccelerometerVector( x[0], y[0], z[0] ) def cmd_accel_vector_override(self, mag, axis, reset=NO_RESET): Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -30,7 +30,7 @@ from ..utils.conversions import integer_to_bytearray from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels) from ..utils.base import _AbstractSubSystem, _publish, _LogManager -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions class DG(_AbstractSubSystem): @@ -219,9 +219,9 @@ """ mode = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) smode = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) self.dg_operation_mode = mode[0] self.dg_operation_sub_mode = smode[0] Index: dialin/dg/drain_pump.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -15,7 +15,7 @@ ############################################################################ import struct from ..utils.conversions import integer_to_bytearray -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from .constants import RESET, NO_RESET from ..protocols.CAN import (DenaliMessage, DenaliChannels) @@ -72,9 +72,9 @@ """ tgt = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) dac = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) self.target_drain_pump_speed_RPM = tgt[0] self.dac_value = dac[0] Index: dialin/dg/heaters.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/dg/heaters.py (.../heaters.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/heaters.py (.../heaters.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -17,7 +17,7 @@ import struct from ..utils.conversions import integer_to_bytearray from ..utils.conversions import float_to_bytearray -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from .constants import NO_RESET from ..protocols.CAN import (DenaliMessage, DenaliChannels) from ..utils.base import _AbstractSubSystem, _publish @@ -50,11 +50,11 @@ @returns none """ main_primary_heater_pwm = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) small_primary_heater_pwm = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) trimmer_heater_pwm = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) self.main_primary_heater_pwm = main_primary_heater_pwm[0] self.small_primary_heater_pwm = small_primary_heater_pwm[0] Index: dialin/dg/load_cells.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/dg/load_cells.py (.../load_cells.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -15,7 +15,7 @@ ############################################################################ import struct from ..utils.conversions import integer_to_bytearray, float_to_bytearray -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from .constants import RESET,NO_RESET from ..protocols.CAN import (DenaliMessage, DenaliChannels) @@ -75,13 +75,13 @@ """ a1 = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) a2 = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) b1 = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) b2 = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) self.load_cell_A1 = a1[0] self.load_cell_A2 = a2[0] Index: dialin/dg/pressures.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/dg/pressures.py (.../pressures.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/pressures.py (.../pressures.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -15,7 +15,7 @@ ############################################################################ import struct from ..utils.conversions import integer_to_bytearray, float_to_bytearray -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from .constants import NO_RESET from ..protocols.CAN import (DenaliMessage, DenaliChannels) @@ -82,13 +82,13 @@ """ roi = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) roo = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) dri = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) dro = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) self.ro_pump_inlet_pressure = roi[0] self.ro_pump_outlet_pressure = roo[0] Index: dialin/dg/reservoirs.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/dg/reservoirs.py (.../reservoirs.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/reservoirs.py (.../reservoirs.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -17,7 +17,7 @@ from ..protocols.CAN import (DenaliMessage, DenaliChannels) from ..utils.base import _AbstractSubSystem, _publish -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from logging import Logger @@ -90,11 +90,11 @@ """ res = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) fil = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) dra = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) self.active_reservoir = res[0] self.fill_to_vol_ml = fil[0] Index: dialin/dg/ro_pump.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -15,7 +15,7 @@ ############################################################################ import struct from ..utils.conversions import integer_to_bytearray, float_to_bytearray -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from .constants import RESET, NO_RESET from ..protocols.CAN import (DenaliMessage, DenaliChannels) @@ -91,13 +91,13 @@ """ tgt = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) flow = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) pwm = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) ro_state = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) self.target_pressure_psi = tgt[0] self.measured_flow_rate_lpm = flow[0] Index: dialin/dg/temperature_sensors.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -16,7 +16,7 @@ import struct from ..utils.conversions import integer_to_bytearray from ..utils.conversions import float_to_bytearray -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from .constants import NO_RESET from ..protocols.CAN import (DenaliMessage, DenaliChannels) from ..utils.base import _AbstractSubSystem, _publish @@ -75,51 +75,51 @@ @returns none """ sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) self.inlet_primary = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) self.outlet_primary = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) self.cd1 = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) self.cd2 = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) self.outlet_redundancy = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) self.inlet_dialysate = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) self.primary_tc = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8])) + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) self.trimmer_tc = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_9:MsgFldPositions.END_POS_FIELD_9])) + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) self.primary_cj = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_10:MsgFldPositions.END_POS_FIELD_10])) + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) self.trimmer_cj = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_11:MsgFldPositions.END_POS_FIELD_11])) + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) self.primary_internal = sensors_data[0] sensors_data = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_12:MsgFldPositions.END_POS_FIELD_12])) + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])) self.trimmer_internal = sensors_data[0] def cmd_temperature_sensors_broadcast_interval_override(self, ms, reset=NO_RESET): Index: dialin/hd/accelerometer.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/hd/accelerometer.py (.../accelerometer.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/hd/accelerometer.py (.../accelerometer.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -19,7 +19,7 @@ from ..utils.conversions import integer_to_bytearray, float_to_bytearray from .constants import RESET, NO_RESET from ..utils.base import _AbstractSubSystem, _publish -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from logging import Logger class HDAccelerometer(_AbstractSubSystem): @@ -98,27 +98,27 @@ """ x = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) y = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) z = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) self.vector = self.AccelerometerVector( x[0], y[0], z[0] ) x = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) y = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) z = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) self.vector_max = self.AccelerometerVector( x[0], y[0], z[0] ) x = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) y = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8])) + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) z = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_9:MsgFldPositions.END_POS_FIELD_9])) + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) self.tilts = self.AccelerometerVector( x[0], y[0], z[0] ) def cmd_accel_vector_override(self, mag, axis, reset=NO_RESET): Index: dialin/hd/alarms.py =================================================================== diff -u -r05e5cb90221fbb76cd661d7c812ee6a9ca322da0 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/hd/alarms.py (.../alarms.py) (revision 05e5cb90221fbb76cd661d7c812ee6a9ca322da0) +++ dialin/hd/alarms.py (.../alarms.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -8,21 +8,20 @@ # @file alarms.py # # @author (last) Peter Lucia -# @date (last) 26-Aug-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # ############################################################################ +import struct +from logging import Logger + +from .constants import RESET, NO_RESET +from ..common.msg_defs import MsgIds from ..protocols.CAN import (DenaliMessage, DenaliChannels) -from ..utils.conversions import integer_to_bytearray from ..utils.base import _AbstractSubSystem, _publish -from ..common.msg_defs import MsgIds -from .constants import RESET, NO_RESET -from collections import OrderedDict -import struct -from logging import Logger -#from ..common.alarm_defs import AlarmList +from ..utils.conversions import integer_to_bytearray class HDAlarms(_AbstractSubSystem): Index: dialin/hd/blood_flow.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP from ..utils.base import _AbstractSubSystem, _publish -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions import struct from logging import Logger @@ -132,21 +132,21 @@ """ tgt = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) flow = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) rotor = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) speed = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) mcspeed = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) mccurr = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) pwm = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) sig = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8])) + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) self.target_blood_flow_rate = tgt[0] self.measured_blood_flow_rate = flow[0] @@ -166,7 +166,7 @@ @param flow: integer - flow set point (in mL/min) to override with (negative for reverse direction) @param mode: integer - 0 for closed loop control mode or 1 for open loop control mode - @param reset: integer - 1 to reset a previous override, 0 to override + @param reset: integer - N/A @return: 1 if successful, zero otherwise """ Index: dialin/hd/dialysate_inlet_flow.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -20,7 +20,7 @@ from .constants import RESET, NO_RESET from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP from ..utils.base import _AbstractSubSystem, _publish -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from logging import Logger class HDDialysateInletFlow(_AbstractSubSystem): @@ -137,21 +137,21 @@ """ tgt = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) flow = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) rotor = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) speed = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) mcspeed = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) mccurr = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) pwm = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) sig = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8])) + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) self.target_dialysate_inlet_flow_rate = tgt[0] self.measured_dialysate_inlet_flow_rate = flow[0] @@ -171,7 +171,7 @@ @param flow: integer - flow set point (in mL/min) to override with @param mode: integer - 0 for closed loop control mode or 1 for open loop control mode - @param reset: integer - 1 to reset a previous override, 0 to override + @param reset: integer - N/A @return: 1 if successful, zero otherwise """ Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -20,7 +20,7 @@ from .constants import RESET, NO_RESET from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP from ..utils.base import _AbstractSubSystem, _publish -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from logging import Logger @@ -125,19 +125,19 @@ """ refvol = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) measvol = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) rotor = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) speed = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) mcspeed = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) mccurr = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) pwm = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) self.reference_dialysate_outlet_uf_volume = refvol[0] self.measured_dialysate_outlet_uf_volume = measvol[0] @@ -156,7 +156,7 @@ @param flow: integer - flow set point (in mL/min) to override with @param mode: integer - 0 for closed loop control mode or 1 for open loop control mode - @param reset: integer - 1 to reset a previous override, 0 to override + @param reset: integer - N/A @return: 1 if successful, zero otherwise """ Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -33,7 +33,7 @@ from ..utils.conversions import integer_to_bytearray from ..utils.base import _AbstractSubSystem, _publish, _LogManager from .constants import NO_RESET -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions class HD(_AbstractSubSystem): @@ -87,10 +87,21 @@ msg_id = MsgIds.MSG_ID_HD_OP_MODE.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_hd_op_mode_sync) + msg_id = MsgIds.MSG_ID_HD_CALIBRATION_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self._handler_hd_cal_data_sync) # create properties self.hd_operation_mode = self.HD_OP_MODE_INIT_POST self.hd_operation_sub_mode = 0 + self.hd_calibration_data = {"Revision":0, + "AccelXOffset":0.0, + "AccelYOffset":0.0, + "AccelZOffset":0.0, + "BloodFlowGain":0.0, + "BloodFlowOffset":0.0, + "DialysateFlowGain":0.0, + "DialysateFlowOffset":0.0} # Create command groups self.accel = HDAccelerometer(self.can_interface, self.logger) @@ -115,6 +126,42 @@ """ return self.hd_operation_mode + @_publish(["hd_calibration_data"]) + def _handler_hd_cal_data_sync(self, message): + """ + Handles published HD calibration data messages. Current HD calibration data + is captured for reference. Call cmd_request_hd_calibration_data() method + to request HD to publish HD calibration data. + + @param message: published HD calibration data broadcast message + @return: None + """ + rev = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + acc_x = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) + acc_y = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) + acc_z = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) + bf_g = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + bf_o = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) + df_g = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) + df_o = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) + + self.hd_calibration_data["Revision"] = rev[0] + self.hd_calibration_data["AccelXOffset"] = acc_x[0] + self.hd_calibration_data["AccelYOffset"] = acc_y[0] + self.hd_calibration_data["AccelZOffset"] = acc_z[0] + self.hd_calibration_data["BloodFlowGain"] = bf_g[0] + self.hd_calibration_data["BloodFlowOffset"] = bf_o[0] + self.hd_calibration_data["DialysateFlowGain"] = df_g[0] + self.hd_calibration_data["DialysateFlowOffset"] = df_o[0] + @_publish(["hd_operation_mode"]) def _handler_hd_op_mode_sync(self, message): """ @@ -125,9 +172,9 @@ @return: None """ mode = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) smode = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) self.hd_operation_mode = mode[0] self.hd_operation_sub_mode = smode[0] Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -19,7 +19,7 @@ from ..utils.conversions import integer_to_bytearray, float_to_bytearray from .constants import RESET, NO_RESET from ..utils.base import _AbstractSubSystem, _publish -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from logging import Logger @@ -105,15 +105,15 @@ """ art = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) ven = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) bp = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) dpi = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) dpo = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) self.arterial_pressure = art[0] self.venous_pressure = ven[0] Index: dialin/hd/treatment.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/hd/treatment.py (.../treatment.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/hd/treatment.py (.../treatment.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -18,7 +18,7 @@ DenaliChannels) from ..utils.base import _AbstractSubSystem, _publish from ..utils.conversions import integer_to_bytearray, float_to_bytearray -from ..common.msg_defs import MsgIds, MsgFldPositions +from ..common.msg_defs import MsgIds, MsgFieldPositions from logging import Logger @@ -195,11 +195,11 @@ """ tot = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) ela = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) rem = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) self.treatment_time_prescribed = tot[0] self.treatment_time_elapsed = ela[0] @@ -220,11 +220,11 @@ """ tst = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) ufs = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) bol = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) self.treatment_state = tst[0] self.treatment_uf_state = ufs[0] @@ -245,11 +245,11 @@ """ mxm = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) cum = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) bol = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) self.saline_bolus_max_vol = mxm[0] self.saline_bolus_cum_vol = cum[0] Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r287af45040e35882e001fb3ea835f304007870c4 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 287af45040e35882e001fb3ea835f304007870c4) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -19,7 +19,7 @@ import struct import enum from ..utils.base import _AbstractSubSystem, _publish -from ..common.msg_defs import MsgIds, RequestRejectReasons, MsgFldPositions +from ..common.msg_defs import MsgIds, RequestRejectReasons, MsgFieldPositions from collections import OrderedDict from logging import Logger @@ -631,39 +631,39 @@ @return: none """ bld = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) dia = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) dur = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) sto = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) sal = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) acd = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) bic = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) dlz = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8])) + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) bpi = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_9:MsgFldPositions.END_POS_FIELD_9])) + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) rbf = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_10:MsgFldPositions.END_POS_FIELD_10])) + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) apl = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_11:MsgFldPositions.END_POS_FIELD_11])) + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) aph = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_12:MsgFldPositions.END_POS_FIELD_12])) + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])) vpl = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_13:MsgFldPositions.END_POS_FIELD_13])) + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])) vph = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_14:MsgFldPositions.END_POS_FIELD_14])) + message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])) hdr = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_15:MsgFldPositions.END_POS_FIELD_15])) + message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15])) hbv = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_16:MsgFldPositions.END_POS_FIELD_16])) + message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16])) tmp = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_17:MsgFldPositions.END_POS_FIELD_17])) + message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17])) self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld[0] self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia[0] @@ -730,41 +730,41 @@ @return: none """ val = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) bld = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) dia = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) dur = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) sto = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) sal = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) acd = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) bic = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8])) + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) dlz = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_9:MsgFldPositions.END_POS_FIELD_9])) + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) bpi = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_10:MsgFldPositions.END_POS_FIELD_10])) + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) rbf = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_11:MsgFldPositions.END_POS_FIELD_11])) + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) apl = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_12:MsgFldPositions.END_POS_FIELD_12])) + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])) aph = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_13:MsgFldPositions.END_POS_FIELD_13])) + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])) vpl = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_14:MsgFldPositions.END_POS_FIELD_14])) + message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])) vph = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_15:MsgFldPositions.END_POS_FIELD_15])) + message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15])) hdr = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_16:MsgFldPositions.END_POS_FIELD_16])) + message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16])) hbv = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_17:MsgFldPositions.END_POS_FIELD_17])) + message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17])) tmp = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_18:MsgFldPositions.END_POS_FIELD_18])) + message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18])) if val[0] == 1: self.treatment_parameters_valid = True @@ -811,17 +811,17 @@ @return: none """ mintime = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) maxtime = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) minufvol = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) maxufvol = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) mindialrt = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) maxdialrt = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) self.min_treatment_duration_min = mintime[0] self.max_treatment_duration_min = maxtime[0] @@ -847,11 +847,11 @@ @return: none """ rsp = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) rea = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) vol = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) if rsp[0] == 1: self.saline_bolus_request_succeeded = True @@ -880,13 +880,13 @@ @return: none """ rsp = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) rea = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) tim = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) vol = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) self.duration_change_succeeded = rsp[0] if RequestRejectReasons.has_value(rea[0]): @@ -913,13 +913,13 @@ @return: none """ rsp = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) rea = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) bld = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) dil = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) if rsp[0] == self.RESPONSE_REJECTED: resp = False @@ -956,21 +956,21 @@ @return: none """ rsp = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) rea = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) vol = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) tim = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) tmd = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) rat = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6])) + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) rtd = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) ort = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8])) + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) if rsp[0] == self.RESPONSE_REJECTED: resp = False @@ -1008,15 +1008,15 @@ @return: None """ rsp = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) rea = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) vol = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) tim = struct.unpack('i', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) rat = struct.unpack('f', bytearray( - message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) if rsp[0] == self.RESPONSE_REJECTED: resp = False Index: version.py =================================================================== diff -u -rd6a96b7c76ec205fda56560bb651f1df31ef01b3 -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 --- version.py (.../version.py) (revision d6a96b7c76ec205fda56560bb651f1df31ef01b3) +++ version.py (.../version.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) @@ -1 +1,69 @@ -dialin/version.py \ No newline at end of file +########################################################################### +# +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file version.py +# +# @author (last) Peter Lucia +# @date (last) 10-Nov-2020 +# @author (original) Peter Lucia +# @date (original) 16-Jun-2020 +# +############################################################################ +import subprocess + +VERSION = "0.8.1" + + +def get_branch(): + """ + Gets the current branch name in the current git repository + + @return: The current branch name, None if it can't be determined + """ + + try: + return subprocess.check_output("git rev-parse --abbrev-ref HEAD", shell=True).decode("utf-8").strip() + except subprocess.CalledProcessError: + return None + + +def get_last_commit(): + """ + Gets the latest commit in the current git repository + + @return: (str) the latest commit in the current git repository, None if it can't be determined + """ + try: + return subprocess.check_output("git rev-parse --short=7 HEAD", shell=True).decode("utf-8").strip() + except subprocess.CalledProcessError: + return None + + +def check_if_git_repo(): + """ + Checks if we're in a git repo or not to know if we can get the git branch and commit + + @return: True if in a git repo, False otherwise + """ + + return subprocess.call(["git", "branch"], stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL) == 0 + + +branch = None +commit = None + +DEV_VERSION = VERSION + +if check_if_git_repo(): + branch = get_branch() + commit = get_last_commit() + DEV_VERSION += "-{0}".format(branch) + DEV_VERSION += "-{0}".format(commit) + + +if __name__ == '__main__': + print(VERSION)