Index: leahi_dialin/dd/modules/balancing_chamber.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f --- leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) @@ -85,9 +85,10 @@ msg_list.append(('self.is_pressure_stabilized_during_fill', DataTypes.U32)) msg_list.append(('self.bal_chamber_switch_only_state', DataTypes.U32)) msg_list.append(('self.is_bal_chamber_switching_active', DataTypes.U32)) - + self.process_into_vars(decoder_list = msg_list, message = message) + self.dd_bal_chamber_timestamp = timestamp Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) @@ -156,7 +156,7 @@ self.process_into_vars(decoder_list = msg_list, message = message) - self.dd_conductivity_timestamp = timestamp + self.dd_blood_leak_status_timestamp = timestamp @publish(['msg_id_dd_send_blood_leak_emb_mode_response', 'blood_leak_emb_mode_cmd_response', Index: leahi_dialin/dd/modules/drybicart.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f --- leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) @@ -50,10 +50,10 @@ message_id = MsgIds.MSG_ID_DD_DRY_BICART_DATA.value, function = self._handler_dry_bicart_sync) - self.dd_dry_bicart_timestamp = 0 #: The timestamp of the last message + self.dd_dry_bicart_timestamp = 0.0 #: The timestamp of the last message self.dd_dry_bicart_fill_execution_state = 0 #: The Dry Bicart fill execution state self.dd_bicarb_chamber_fill_execution_state = 0 #: The Bicarb chamber fill execution state - self.dd_dry_bicart_drain_execution_state = 0 #: The Dry Bicart drain execution state + self.dd_dry_bicart_drain_execution_state = 0.0 #: The Dry Bicart drain execution state self.dd_dry_bicart_fill_cycle_counter = 0 #: The Dry Bicart fill cycle counter self.dd_dry_bicart_max_fill_cycle_count = 0 #: The Dry Bicart max fill cycle state self.dd_dry_bicart_fill_request = 0 #: Is fill requested for Dry Bicart or not @@ -93,7 +93,7 @@ msg_list.append(('self.dd_dryBiCartDrainTimePeriod', DataTypes.U32)) self.process_into_vars(decoder_list = msg_list, - message = message) + message = message,debug=True) self.dd_dry_bicart_timestamp = timestamp Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) @@ -49,7 +49,7 @@ message_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_MODE_DATA.value, function = self._handler_gen_dialysate_sync) - self.dd_gen_dialysate_timestamp = 0 #: The timestamp of the last message + self.dd_gen_dialysate_timestamp = 0.0 #: The timestamp of the last message self.execution_state = 0 #: The Execution state self.dialysate_delivery_in_progress = 0 #: Is Dialysate delivery in progress or not self.dialysate_good_to_deliver = 0 #: The Dialysate is good to delover or not Index: leahi_dialin/dd/modules/voltages.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f --- leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) @@ -50,7 +50,16 @@ self.dd_voltages_timestamp = 0.0 #: The timestamp of the latest message #: The Voltages data in list format - self.monitored_voltages = [0.0] * dd_enum_repository.DDMonitoredVoltages.NUM_OF_MONITORED_VOLTAGE_LINES.value + self.monitored_voltages = { + dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_1_2V.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_3_3V.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_24V_1.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_24V_2.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.name: 0.0, + dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.name: 0.0 + } @publish(["msg_id_dd_voltages_data","dd_voltages_timestamp","monitored_voltages"]) Index: leahi_dialin/fp/modules/boost_pump.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f --- leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) @@ -79,7 +79,7 @@ sensor_list.append((fp_enum_repository.FPBoostPumpNames.P40_PUMP.name, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name, DataTypes.U32)) sensor_list.append((fp_enum_repository.FPBoostPumpNames.P40_PUMP.name, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name, DataTypes.U32)) sensor_list.append((fp_enum_repository.FPBoostPumpNames.P40_PUMP.name, fp_enum_repository.FPPumpAttributes.SPEED.name, DataTypes.F32)) - sensor_list.append((fp_enum_repository.FPBoostPumpNames.P40_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_PRESSURE.name, DataTypes.F32)) + sensor_list.append((fp_enum_repository.FPBoostPumpNames.P40_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_PRES.name, DataTypes.F32)) sensor_list.append((fp_enum_repository.FPBoostPumpNames.P40_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name, DataTypes.F32)) sensor_list.append((fp_enum_repository.FPBoostPumpNames.P40_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE_PCT.name, DataTypes.F32)) sensor_list.append((fp_enum_repository.FPBoostPumpNames.P40_PUMP.name, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name, DataTypes.F32)) Index: leahi_dialin/utils/abstract_classes.py =================================================================== diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -rf1b8b4e9558e9cb95b994044f1d7d247c6c8be3f --- leahi_dialin/utils/abstract_classes.py (.../abstract_classes.py) (revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557) +++ leahi_dialin/utils/abstract_classes.py (.../abstract_classes.py) (revision f1b8b4e9558e9cb95b994044f1d7d247c6c8be3f) @@ -88,9 +88,12 @@ variable_name = decode_details[0] datatype: DataTypes = decode_details[-1] end_pos = start_pos + datatype.size() - value = struct.unpack(datatype.unpack_attrib(), bytearray(message['message'][start_pos:end_pos]))[0] + try: + value = struct.unpack(datatype.unpack_attrib(), bytearray(message['message'][start_pos:end_pos]))[0] + except Exception as e: + value = None if debug: - print(f'value: {value} ({datatype.name})') + print(f'{variable_name}: {value} ({datatype.name})') print(f'pos: {start_pos} - {end_pos}') if 'nan' in str(value).lower(): raise ValueError(f'{value} is not an accepted value!')