Index: leahi_dialin/common/test_config_defs.py =================================================================== diff -u -r936f7910767c7b9f7c98e5da4d434ac8f2964299 -rde2ad3872a368c0ff224cbdcac79306aaf2f09c2 --- leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision 936f7910767c7b9f7c98e5da4d434ac8f2964299) +++ leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision de2ad3872a368c0ff224cbdcac79306aaf2f09c2) @@ -32,7 +32,8 @@ TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS = 9 # (FP) Test configuration to disable FP conductivity alarms TEST_CONFIG_DD_ENABLE_DOSING_OPEN_LOOP_CONTROL = 10 # (DD) Test configuration to switch to open loop control for concentrate dosing TEST_CONFIG_DD_ENABLE_UF_TEMP_COMP = 11 # (DD) Test configuration to enable Ultrafiltration temperature compensation - NUM_OF_TEST_CONFIGS = 12 # Number of Test Configs + TEST_CONFIG_DD_DRY_BICART_TEST = 12 # (DD) Test configuration to test drybicart initial fill from pre-gen + NUM_OF_TEST_CONFIGS = 13 # Number of Test Configs @unique class TDTestConfigOptions(DialinEnum): Index: leahi_dialin/dd/modules/drybicart.py =================================================================== diff -u -re2b4c560c69fa8c593dd59020b7d315b7ee315a8 -rde2ad3872a368c0ff224cbdcac79306aaf2f09c2 --- leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision e2b4c560c69fa8c593dd59020b7d315b7ee315a8) +++ leahi_dialin/dd/modules/drybicart.py (.../drybicart.py) (revision de2ad3872a368c0ff224cbdcac79306aaf2f09c2) @@ -17,7 +17,7 @@ from enum import unique from logging import Logger -from .constants import RESET, NO_RESET +from leahi_dialin.common.constants import NO_RESET , RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum @@ -67,6 +67,7 @@ "dd_dry_bicart_fill_request", "dry_bicarb_chamber_fill_request", "dd_dry_bicart_drain_request", "dd_dry_bicart_last_fill_time", "dd_dry_bicart_current_fill_time", "dd_dryBiCartType", "dd_dryBiCartDrainTimePeriod", "dd_dry_bicart_timestamp"]) + def _handler_dry_bicart_sync(self, message, timestamp=0.0): """ Handles published dry bicart data messages. @@ -203,6 +204,7 @@ else: self.logger.error("Timeout!!!!") return False + def cmd_dry_bicart_bicarb_chamber_fill_request_override(self, start_stop: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dry bicart bicarbonate chamber F fill request override command @@ -232,6 +234,7 @@ else: self.logger.error("Timeout!!!!") return False + def cmd_dry_bicart_drain_request_override(self, start_stop: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dry bicart drain request override command @@ -261,6 +264,7 @@ else: self.logger.error("Timeout!!!!") return False + def cmd_dry_bicart_cartridge_size_override(self, small_large: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dry bicart cartridge size override command