Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r76d5c2f8d0b12af4d95a9d94073be1d3afa08d78 -r5f282b10ac6cbf77b3f5852af81c6d8b9094b561 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 76d5c2f8d0b12af4d95a9d94073be1d3afa08d78) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 5f282b10ac6cbf77b3f5852af81c6d8b9094b561) @@ -117,12 +117,12 @@ MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60 MSG_ID_DD_BLOOD_LEAK_DATA = 0x61 - MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63 - MSG_ID_TD_BLOOD_PRESSURE_RESPONSE = 0x64 - MSG_ID_TD_BLOOD_PRESSURE_DATA = 0x65 + #MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63 MESSAGE DOESN'T EXIST ON STAGING_ALPHA + #MSG_ID_TD_BLOOD_PRESSURE_RESPONSE = 0x64 MESSAGE DOESN'T EXIST ON STAGING_ALPHA + #MSG_ID_TD_BLOOD_PRESSURE_DATA = 0x65 MESSAGE DOESN'T EXIST ON STAGING_ALPHA MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST = 0x66 MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x67 - MSG_ID_DD_RINSE_PUMP_DATA = 0x69 + MSG_ID_DD_RINSE_PUMP_DATA = 0x63 MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -270,6 +270,7 @@ MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA04F + MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA050 MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00 MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01 Index: leahi_dialin/common/test_config_defs.py =================================================================== diff -u -rf32337722f4ff798db8f260cc926b75781963046 -r5f282b10ac6cbf77b3f5852af81c6d8b9094b561 --- leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision f32337722f4ff798db8f260cc926b75781963046) +++ leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision 5f282b10ac6cbf77b3f5852af81c6d8b9094b561) @@ -23,7 +23,8 @@ TEST_CONFIG_BETA_HW = 0 # Test configuration using Beta Hardware TEST_CONFIG_DISABLE_BC_PRES_ALARM = 1 # Test configuration disabling BC pressure alarms TEST_CONFIG_DISABLE_DIENER_CONC_PUMP = 2 # Test configuration disabling Diener concentrate pump - NUM_OF_TEST_CONFIGS = 3 # Number of Test Configs + TEST_CONFIG_ENABLE_4WIRE_RINSE_PUMP = 3 # Test configuration Enabling 4 wire rinse pump + NUM_OF_TEST_CONFIGS = 4 # Number of Test Configs @unique class FPTestConfigOptions(DialinEnum): Index: leahi_dialin/dd/modules/rinse_pump.py =================================================================== diff -u -r42064e6cae7bbfd89bcebafc14e9d5865c53cb8e -r5f282b10ac6cbf77b3f5852af81c6d8b9094b561 --- leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision 42064e6cae7bbfd89bcebafc14e9d5865c53cb8e) +++ leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision 5f282b10ac6cbf77b3f5852af81c6d8b9094b561) @@ -99,4 +99,36 @@ return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: self.logger.error("Timeout!!!!") + return False + + def cmd_rinse_pump_pwm_percent_override(self, pwm_percent: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the rinse pump pwm percent override command + Constraints: + Must be logged into DD. + + @param pwm_percent: integer - percentage to override the pwm with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + + reset_byte_array = integer_to_bytearray(reset) + pwm = integer_to_bytearray(pwm_percent) + payload = reset_byte_array + pwm + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message_id=MsgIds.MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override DD Rinse Pump PWM percentage") + + # Send message + received_message = self.can_interface.send(message) + + # If there is content... + if received_message is not None: + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.error("Timeout!!!!") return False \ No newline at end of file