Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r55d97b27c73f8e08994328881d3f56cbc7f00e29 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 55d97b27c73f8e08994328881d3f56cbc7f00e29) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -34,7 +34,7 @@ DDPreGenDialysateStates: DialinEnum DDGenDialysateModeStates: DialinEnum DDPostGenDialysateStates: DialinEnum - DDHeatDisinfectState: DialinEnum + DDHeatDisinfectStates: DialinEnum DDHeaterCoolingStates: DialinEnum DDROPermeateStates: DialinEnum DDNotLegalStates: DialinEnum @@ -76,7 +76,7 @@ 'DDPreGenDialysateStates': '_create_dd_pregen_states', 'DDGenDialysateModeStates': '_create_dd_gen_states', 'DDPostGenDialysateStates': '_create_dd_postgen_states', - 'DDHeatDisinfectState': '_create_dd_heat_disinfect_states', + 'DDHeatDisinfectStates': '_create_dd_heat_disinfect_states', 'DDHeaterCoolingStates': '_create_dd_heater_cooling_states', 'DDROPermeateStates': '_create_dd_ro_permeate_states', 'DDNotLegalStates': '_create_dd_not_legal_states', @@ -125,9 +125,12 @@ def update_enums(self) -> None: - for prop in self._properties: - self.__dict__.pop(prop, None) - self.__getattr__(prop) + for prop_name in self._properties: + # Cleans the cached value + self.__dict__.pop(prop_name, None) + + # Reinitializing the enum as it's not in the cache + self.__getattr__(prop_name) @@ -250,7 +253,7 @@ 'DD_HEAT_DISINFECT_STATE_COMPLETE': 1, # Heat disinfect, complete state 'NUM_OF_DD_HEAT_DISINFECT_STATES': 2 # Number of heat disinfect mode states } - return DialinEnum('DDHeatDisinfectState', members) + return DialinEnum('DDHeatDisinfectStates', members) def _create_dd_heater_cooling_states(self): @@ -445,9 +448,9 @@ # Add aliases extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.D9_TEMP.value) - extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.D87_TEMP.value if GlobalVariables.NEXT_GEN_HW == True else created_enum.D41_TEMP.value) + extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.D87_TEMP.value if GlobalVariables().NEXT_GEN_HW == True else created_enum.D41_TEMP.value) extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.D16_TEMP.value) - extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D99_TEMP.value if GlobalVariables.NEXT_GEN_HW == True else created_enum.D75_TEMP.value) + extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D99_TEMP.value if GlobalVariables().NEXT_GEN_HW == True else created_enum.D75_TEMP.value) # Add aliases to be searchable (listed when pressed TAB) created_enum._member_names_.append('FIRST_PRESSURE_SENSOR') Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r89ad4ada524457a552b9afcde3828bda384d1765 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 89ad4ada524457a552b9afcde3828bda384d1765) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -360,7 +360,7 @@ # Add aliases extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.M3_TEMP.value) - extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables.NEXT_GEN_HW == True else created_enum.P17_TEMP.value) + extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().NEXT_GEN_HW == True else created_enum.P17_TEMP.value) extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.P10_TEMP.value) extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.P19_TEMP.value) extend_enum(created_enum, 'FIRST_FLOW_SENSOR', created_enum.P7_TEMP.value) Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r89ad4ada524457a552b9afcde3828bda384d1765 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 89ad4ada524457a552b9afcde3828bda384d1765) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -121,9 +121,12 @@ def update_enums(self) -> None: - for prop in self._properties: - self.__dict__.pop(prop, None) - self.__getattr__(prop) + for prop_name in self._properties: + # Cleans the cached value + self.__dict__.pop(prop_name, None) + + # Reinitializing the enum as it's not in the cache + self.__getattr__(prop_name) Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rd27c40205e18118f4689f62463a266da1f91dba6 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -56,8 +56,8 @@ dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0 } - if GlobalVariables.NEXT_GEN_HW: - self.fp_temperatures[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 + if GlobalVariables().NEXT_GEN_HW: + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 self.dd_conductivity_timestamp = 0.0 @@ -86,7 +86,9 @@ self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D74_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - if GlobalVariables.NEXT_GEN_HW: + if GlobalVariables().NEXT_GEN_HW: + if dd_enum_repository.DDConductivitySensorNames.D98_COND.name not in self.dd_conductivity: + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] Index: leahi_dialin/dd/modules/events.py =================================================================== diff -u -rd27c40205e18118f4689f62463a266da1f91dba6 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/dd/modules/events.py (.../events.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) +++ leahi_dialin/dd/modules/events.py (.../events.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -60,14 +60,14 @@ # Dictionary of the mode as key and the sub mode states enum class as the value self._dd_op_mode_2_sub_mode = {dd_enum_repository.DDOpModes.MODE_FAUL.name: dd_enum_repository.DDFaultStates, - dd_enum_repository.DDOpModes.MODE_SERV.name: dd_enum_repository.DDServiceModesStates, + dd_enum_repository.DDOpModes.MODE_SERV.name: dd_enum_repository.DDServiceStates, dd_enum_repository.DDOpModes.MODE_INIT.name: dd_enum_repository.DDInitStates, - dd_enum_repository.DDOpModes.MODE_STAN.name: dd_enum_repository.DDStandByModeStates, + dd_enum_repository.DDOpModes.MODE_STAN.name: dd_enum_repository.DDStandbyStates, dd_enum_repository.DDOpModes.MODE_PREG.name: dd_enum_repository.DDPreGenDialysateStates, dd_enum_repository.DDOpModes.MODE_GEND.name: dd_enum_repository.DDGenDialysateModeStates, - dd_enum_repository.DDOpModes.MODE_POSG.name: dd_enum_repository.DDPostGenDialysateState, - dd_enum_repository.DDOpModes.MODE_HEAT.name: dd_enum_repository.DDHeatersState, - dd_enum_repository.DDOpModes.MODE_HCOL.name: dd_enum_repository.DDHeatersCoolingStates, + dd_enum_repository.DDOpModes.MODE_POSG.name: dd_enum_repository.DDPostGenDialysateStates, + dd_enum_repository.DDOpModes.MODE_HEAT.name: dd_enum_repository.DDHeatDisinfectStates, + dd_enum_repository.DDOpModes.MODE_HCOL.name: dd_enum_repository.DDHeaterCoolingStates, dd_enum_repository.DDOpModes.MODE_ROPS.name: dd_enum_repository.DDROPermeateStates, dd_enum_repository.DDOpModes.MODE_NLEG.name: dd_enum_repository.DDNotLegalStates} Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -rd27c40205e18118f4689f62463a266da1f91dba6 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -56,8 +56,8 @@ dd_enum_repository.DDPressureSensorNames.D18_PRES.name: 0.0, dd_enum_repository.DDPressureSensorNames.D41_PRES.name: 0.0 } - if GlobalVariables.NEXT_GEN_HW: - self.fp_temperatures[dd_enum_repository.DDConductivitySensorNames.D87_PRES.name] = 0.0 + if GlobalVariables().NEXT_GEN_HW: + self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D87_PRES.name] = 0.0 self.dd_pressures_timestamp = 0 @@ -81,7 +81,10 @@ self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D41_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - if GlobalVariables.NEXT_GEN_HW: + if GlobalVariables().NEXT_GEN_HW: + if dd_enum_repository.DDPressureSensorNames.D87_PRES.name not in self.dd_pressures: + self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D87_PRES.name] = 0.0 + self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D87_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -rd27c40205e18118f4689f62463a266da1f91dba6 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -20,6 +20,7 @@ from .constants import NO_RESET, RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.dd_defs import dd_enum_repository +from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -58,6 +59,10 @@ dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0 } + if GlobalVariables().NEXT_GEN_HW: + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0 + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0 + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0 if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id @@ -73,63 +78,46 @@ @param message: published DD temperature sensors data message @returns none """ - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + sensor_list =[] + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D1_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_TEMP, 'f')) + if GlobalVariables().NEXT_GEN_HW: + if dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name not in self.dd_temperatures: + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0 + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D16_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D44_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D75_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP, 'f')) + if GlobalVariables().NEXT_GEN_HW: + if dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name not in self.dd_temperatures: + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0 + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D9_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D66_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D51_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D18_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D41_TEMP, 'f')) + if GlobalVariables().NEXT_GEN_HW: + if dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name not in self.dd_temperatures: + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0 + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP, 'f')) - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + i = 1 + for sensor in sensor_list: + start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}') + end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}') + self.dd_temperatures[sensor[0].name] = struct.unpack(sensor[1],bytearray(message['message'][start_pos:end_pos]))[0] + i += 1 - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D4_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D50_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D16_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D28_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D30_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D44_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D75_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D9_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] - - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] - self.dd_temperatures_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -re60ad12bcc58d5905d7268bbeaae139d8233e023 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision e60ad12bcc58d5905d7268bbeaae139d8233e023) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -53,7 +53,7 @@ fp_enum_repository.FPPressureSensorNames.P13_PRES.name: 0.0, fp_enum_repository.FPPressureSensorNames.P17_PRES.name: 0.0 } - if GlobalVariables.NEXT_GEN_HW: + if GlobalVariables().NEXT_GEN_HW: self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_PRES.name] = 0.0 self.fp_pressure_timestamp = 0.0 @@ -76,7 +76,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - if GlobalVariables.NEXT_GEN_HW: + if GlobalVariables().NEXT_GEN_HW: self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -re60ad12bcc58d5905d7268bbeaae139d8233e023 -r17b02f26012e7378daf831057c6f62c4ecdcfff0 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision e60ad12bcc58d5905d7268bbeaae139d8233e023) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 17b02f26012e7378daf831057c6f62c4ecdcfff0) @@ -53,7 +53,7 @@ fp_enum_repository.FPTemperatureSensorNames.P7_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name: 0.0, } - if GlobalVariables.NEXT_GEN_HW: + if GlobalVariables().NEXT_GEN_HW: self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = 0.0 @@ -89,7 +89,7 @@ self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - if GlobalVariables.NEXT_GEN_HW: + if GlobalVariables().NEXT_GEN_HW: self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]