Index: dialin/common/msg_defs.py =================================================================== diff -u -r5e6e7768e1a2ca730207f6850a6c85bf1a5e3afc -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 5e6e7768e1a2ca730207f6850a6c85bf1a5e3afc) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/accelerometer.py (.../accelerometer.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/accelerometer.py (.../accelerometer.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -21,7 +21,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): @@ -100,27 +100,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/conductivity_sensors.py =================================================================== diff -u -rd531ce09d0240e0ae542ea33cf8ebe4b8169825b -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision d531ce09d0240e0ae542ea33cf8ebe4b8169825b) +++ dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -18,7 +18,7 @@ from ..utils.conversions import integer_to_bytearray, float_to_bytearray 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 @@ -77,11 +77,11 @@ @return: None """ - ro_rejection_ratio = struct.unpack('f', bytearray(message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1])) - cpi = struct.unpack('f', bytearray(message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2])) - cpo = struct.unpack('f', bytearray(message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3])) - cd1 = struct.unpack('f', bytearray(message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) - cd2 = struct.unpack('f', bytearray(message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5])) + ro_rejection_ratio = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + cpi = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) + cpo = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) + cd1 = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) + cd2 = struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) self.ro_rejection_ratio = ro_rejection_ratio[0] self.conductivity_sensor_cpi = cpi[0] Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r942bc248fa5a9966cbda891acf725807fc0979eb -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 942bc248fa5a9966cbda891acf725807fc0979eb) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -rf8387df23789b74fba26df353fb88a14b99de199 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision f8387df23789b74fba26df353fb88a14b99de199) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/heaters.py (.../heaters.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/heaters.py (.../heaters.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -rf8387df23789b74fba26df353fb88a14b99de199 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/load_cells.py (.../load_cells.py) (revision f8387df23789b74fba26df353fb88a14b99de199) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -rf8387df23789b74fba26df353fb88a14b99de199 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/pressures.py (.../pressures.py) (revision f8387df23789b74fba26df353fb88a14b99de199) +++ dialin/dg/pressures.py (.../pressures.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/reservoirs.py (.../reservoirs.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/reservoirs.py (.../reservoirs.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -rf8387df23789b74fba26df353fb88a14b99de199 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision f8387df23789b74fba26df353fb88a14b99de199) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/hd/accelerometer.py (.../accelerometer.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/hd/accelerometer.py (.../accelerometer.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -21,7 +21,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): @@ -100,27 +100,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/blood_flow.py =================================================================== diff -u -r05e5cb90221fbb76cd661d7c812ee6a9ca322da0 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision 05e5cb90221fbb76cd661d7c812ee6a9ca322da0) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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] Index: dialin/hd/dialysate_inlet_flow.py =================================================================== diff -u -r05e5cb90221fbb76cd661d7c812ee6a9ca322da0 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision 05e5cb90221fbb76cd661d7c812ee6a9ca322da0) +++ dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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] Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -r05e5cb90221fbb76cd661d7c812ee6a9ca322da0 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 05e5cb90221fbb76cd661d7c812ee6a9ca322da0) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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] Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r05e5cb90221fbb76cd661d7c812ee6a9ca322da0 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 05e5cb90221fbb76cd661d7c812ee6a9ca322da0) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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): @@ -137,21 +137,21 @@ @return: None """ rev = 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])) acc_x = 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])) acc_y = 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])) acc_z = 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])) bf_g = 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])) bf_o = 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])) df_g = 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])) df_o = 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.hd_calibration_data["Revision"] = rev[0] self.hd_calibration_data["AccelXOffset"] = acc_x[0] @@ -172,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 -r864ac652e57073046c683b996fe736d9a851b736 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 864ac652e57073046c683b996fe736d9a851b736) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -r864ac652e57073046c683b996fe736d9a851b736 -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/hd/treatment.py (.../treatment.py) (revision 864ac652e57073046c683b996fe736d9a851b736) +++ dialin/hd/treatment.py (.../treatment.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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 -r3b2f75c25b2f794d171c49487afcf72c9552431e -raf31e009599d36b73b3d2b2453d4cc5cc82118eb --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 3b2f75c25b2f794d171c49487afcf72c9552431e) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision af31e009599d36b73b3d2b2453d4cc5cc82118eb) @@ -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