Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -re7001f4257e9f0d0f242989bafb05fbbcc65607b -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision e7001f4257e9f0d0f242989bafb05fbbcc65607b) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -338,6 +338,10 @@ MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST = 0x8058 MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8059 MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST = 0x8060 + TBD_8061 = 0x8061 + TBD_8061 = 0x8062 + MSG_ID_BATTERY_REGISTERS_OVERRIDE_REQUEST = 0x8063 + MSG_ID_TD_BATTERY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8064 MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999 Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -850,6 +850,38 @@ @unique +class TDBatteryRegisterNames(DialinEnum): + REMAINING_CAPACITY = 0 # Remaining capacity in mAh + BATTERY_STATUS = 1 # Battery pack status + BATTERY_CHARGE_STATUS = 2 # Battery charge status + BATTERY_I2C_STATUS = 3 # Battery I2C status + FAULT_STATUS = 4 # Charger fault status + THERMISTOR_PCT = 5 # Thermistor percentage + BATTERY_VOLTAGE = 6 # Battery voltage in mV + SYSTEM_VOLTAGE = 7 # System voltage in mV + BATTERY_CURRENT = 8 # Battery current in mAh + RELATIVE_STATE_OF_CHARGE = 9 # Relative state of charge + FULL_CHARGE_CAPACITY = 10 # Full charge capacity in mAh + NUM_OF_BATTERIES = 11 # Number of Batteries + +TDBatteryRegisterNames._str_list = { + # Official Name : Accepted strings + 'REMAINING_CAPACITY': [], + 'BATTERY_STATUS': [], + 'BATTERY_CHARGE_STATUS': [], + 'BATTERY_I2C_STATUS': [], + 'FAULT_STATUS': [], + 'THERMISTOR_PCT': [], + 'BATTERY_VOLTAGE': [], + 'SYSTEM_VOLTAGE': [], + 'BATTERY_CURRENT': [], + 'RELATIVE_STATE_OF_CHARGE': [], + 'FULL_CHARGE_CAPACITY': [], + 'NUM_OF_BATTERIES': [], +} + + +@unique class TDEjectorNames(DialinEnum): H5_MOTOR = 0 # TD Ejector Motor NUM_OF_EJECTOR_MOTORS = 1 # Number of Ejector Motors Index: leahi_dialin/common/td_defs_proxy.py =================================================================== diff -u -r636775bd0ba262967bcf06e194658b97720e2517 -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision 636775bd0ba262967bcf06e194658b97720e2517) +++ leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -70,6 +70,7 @@ TDAirTrapValveNames = td_defs.TDAirTrapValveNames TDAirTrapLevelSensorNames = td_defs.TDAirTrapLevelSensorNames TDAirBubbleDetectorNames = td_defs.TDAirBubbleDetectorNames + TDBatteryRegisterNames = td_defs.TDBatteryRegisterNames TDEjectorNames = td_defs.TDEjectorNames TDPressureSensorNames = td_defs.TDPressureSensorNames TDTemperatureSensorNames = td_defs.TDTemperatureSensorNames Index: leahi_dialin/td/modules/air_pump.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -32,8 +32,6 @@ class TDAirPump(AbstractSubSystem): """ - TDAirPump - Treatment Delivery (TD) Dialin API sub-class for air pump related commands. """ Index: leahi_dialin/td/modules/air_trap.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -31,8 +31,6 @@ class TDAirTrap(AbstractSubSystem): """ - TDAirTrap - Treatment Delivery (TD) Dialin API sub-class for air trap related commands. """ Index: leahi_dialin/td/modules/battery.py =================================================================== diff -u --- leahi_dialin/td/modules/battery.py (revision 0) +++ leahi_dialin/td/modules/battery.py (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -0,0 +1,133 @@ +########################################################################### +# +# Copyright (c) 2020-2024 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 air_trap.py +# +# @author (last) Zoltan Miskolci +# @date (last) 05-May-2026 +# @author (original) Sean Nash +# @date (original) 21-Sep-2020 +# +############################################################################ + +# Module imports +from logging import Logger + +# Project imports +from leahi_dialin.common.constants import NO_RESET +from leahi_dialin.common.generic_defs import DataTypes +from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override +from leahi_dialin.common import td_enum_repository +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels +from leahi_dialin.utils.abstract_classes import AbstractSubSystem +from leahi_dialin.utils.base import publish +from leahi_dialin.utils.conversions import integer_to_bytearray + + +class TDBattery(AbstractSubSystem): + """ + Treatment Delivery (TD) Dialin API sub-class for battery related commands. + """ + + def __init__(self, can_interface: CanMessenger, logger: Logger): + """ + @param can_interface: Can Messenger object + """ + super().__init__() + self.can_interface = can_interface + self.logger = logger + + if self.can_interface is not None: + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_TD_BATTERY_DATA.value, + function = self._handler_battery_sync) + + self.battery_broadcast_timestamp = 0.0 #: The timestamp of the last message + + #: The Battery data in dictionary format + self.battery_data = { + td_enum_repository.TDBatteryRegisterNames.x.name: 0, + } + + + @publish(["msg_id_td_battery_data", + "battery_data", + "battery_broadcast_timestamp"]) + def _handler_battery_sync(self, message, timestamp=0.0): + """ + Handles published battery data messages. + Battery data are captured for reference. + + @param message: published data message + @return: None + """ + sensor_list =[] + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.REMAINING_CAPACITY.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.BATTERY_STATUS.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.BATTERY_CHARGE_STATUS.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.BATTERY_I2C_STATUS.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.FAULT_STATUS.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.THERMISTOR_PCT.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.BATTERY_VOLTAGE.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.SYSTEM_VOLTAGE.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.BATTERY_CURRENT.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.RELATIVE_STATE_OF_CHARGE.name, DataTypes.U32)) + sensor_list.append((td_enum_repository.TDBatteryRegisterNames.FULL_CHARGE_CAPACITY.name, DataTypes.U32)) + + self.process_into_dict(dict_to_update = self.battery_data, + decoder_list = sensor_list, + message = message) + + self.battery_broadcast_timestamp = timestamp + + + def cmd_battery_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the battery data broadcast interval override command + Constraints: + Must be logged into TD. + Given interval must be non-zero and a multiple of the TD general task interval (50 ms). + + @param ms: integer - interval (in ms) to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + return cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = CanChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_BATTERY_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'TD Battery', + logger = self.logger, + can_interface = self.can_interface) + + + def cmd_battery_override(self, battery_id: int, power: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the battery override command + Constraints: + Must be logged into TD. + Given interval must be non-zero and a multiple of the TD general task interval (50 ms). + + @param power: integer - power to override the level lower to it + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + payload = integer_to_bytearray(reset) + payload += integer_to_bytearray(battery_id) + payload += integer_to_bytearray(power) + + return cmd_generic_override( + payload = payload, + reset = reset, + channel_id = CanChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_BATTERY_REGISTERS_OVERRIDE_REQUEST, + entity_name = f'TD Battery power', + override_text = f'{str(power)}', + logger = self.logger, + can_interface = self.can_interface) Index: leahi_dialin/td/modules/bubble_detector.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -31,8 +31,6 @@ class TDBubbleDetector(AbstractSubSystem): """ - TDBubbleDetector - Treatment Delivery (TD) Dialin API sub-class for air bubbles related commands. ADA: Air bubble Detector Arterial ADV: Air bubble Detector Venous Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -31,8 +31,6 @@ class TDEjector(AbstractSubSystem): """ - TDEjector - Treatment Delivery (TD) Dialin API sub-class for ejector motor related commands. """ Index: leahi_dialin/td/modules/switches.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/td/modules/switches.py (.../switches.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/td/modules/switches.py (.../switches.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -31,7 +31,7 @@ class TDSwitches(AbstractSubSystem): """ - @brief Treatment Device (TD) Dialin API sub-class for TD switches related commands. + Treatment Device (TD) Dialin API sub-class for TD switches related commands. """ def __init__(self, can_interface: CanMessenger, logger: Logger): Index: leahi_dialin/td/modules/syringe_pump.py =================================================================== diff -u -r60a4cdf7272161c64bb60aac93b26acf50465494 -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/td/modules/syringe_pump.py (.../syringe_pump.py) (revision 60a4cdf7272161c64bb60aac93b26acf50465494) +++ leahi_dialin/td/modules/syringe_pump.py (.../syringe_pump.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -28,8 +28,6 @@ class TDSyringePump(AbstractSubSystem): """ - TDSyringePump - Treatment Delivery (TD) Dialin API sub-class for syringe pump related commands. """ Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -r88eea899fa8d03596f944505285bf3049e64312b -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 88eea899fa8d03596f944505285bf3049e64312b) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) @@ -22,6 +22,7 @@ from .modules.air_pump import TDAirPump from .modules.air_trap import TDAirTrap from .modules.alarms import TDAlarms +from .modules.battery import TDBattery from .modules.blood_flow import TDBloodFlow from .modules.bubble_detector import TDBubbleDetector from .modules.buttons import TDButtons @@ -128,6 +129,7 @@ self.air_pump = TDAirPump(self.can_interface, self.logger) #: The Air Pump module self.air_trap = TDAirTrap(self.can_interface, self.logger) #: The Air Trap module self.alarms = TDAlarms(self.can_interface, self.logger) #: The Alarms module + self.battery = TDBattery(self.can_interface, self.logger) #: The Battery module self.blood_flow = TDBloodFlow(self.can_interface, self.logger) #: The Blood Flow module self.bubbles = TDBubbleDetector(self.can_interface, self.logger) #: The Bubble Detector module self.buttons = TDButtons(self.can_interface, self.logger) #: The Buttons module