Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r6283fb6eb17b325b4e9c7947ac07a7b2e84c378d -ref2941249089bf9eeb6f771112ce13a4a1f39a36 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 6283fb6eb17b325b4e9c7947ac07a7b2e84c378d) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision ef2941249089bf9eeb6f771112ce13a4a1f39a36) @@ -131,6 +131,7 @@ MSG_ID_TD_DATE_AND_TIME_RESPONSE = 0x6D MSG_ID_DD_DATE_AND_TIME_REQUEST = 0x6E MSG_ID_DD_DATE_AND_TIME_RESPONSE = 0x6F + MSG_ID_DD_DRY_BICART_DATA = 0x70 MSG_ID_FP_RO_REJECTION_RATIO_DATA = 0x71 MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x72 MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x73 @@ -180,9 +181,9 @@ MSG_ID_TD_ISOLATED_UF_CONFIRM_RESPONSE = 0xA0 MSG_ID_UI_ADJUST_START_TREATMENT_REQUEST = 0xA1 MSG_ID_TD_ADJUST_START_TREATMENT_RESPONSE = 0xA2 - + MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 - + MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000 MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001 MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002 @@ -341,6 +342,12 @@ MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054 MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055 MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056 + MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA057 + MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA058 + MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059 + MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA05A + MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05B + MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05C # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -rf66c019100e98b49cd94fa0a69951a1a7c952da0 -ref2941249089bf9eeb6f771112ce13a4a1f39a36 --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision f66c019100e98b49cd94fa0a69951a1a7c952da0) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision ef2941249089bf9eeb6f771112ce13a4a1f39a36) @@ -100,6 +100,16 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_debug_event, self._handler_dd_debug_event_sync) + # For current builds and setups without UI, there are no CAN messages sent on the bus to let the + # subsystems know there are other nodes and start publishing. Dialin will send a plain ACK to the CANbus over + # the dd channel to start publishing. + message = DenaliMessage.build_message( + channel_id=DenaliChannels.dialin_to_dd_ch_id, + message_id=MsgIds.MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK.value, + payload=bytearray(), + seq=0) + if message is not None: + self.can_interface.send(message, 0, is_ack=True) # create properties self.dd_op_mode_timestamp = 0.0 Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r2bfa4ffb03efe85b31affb7b60dea4e33d368777 -ref2941249089bf9eeb6f771112ce13a4a1f39a36 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 2bfa4ffb03efe85b31affb7b60dea4e33d368777) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision ef2941249089bf9eeb6f771112ce13a4a1f39a36) @@ -63,6 +63,7 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_valves_states_data, self._handler_valves_sync) self.valve_states_all = 0x00000000 + self.d14_valv = {"id": dd_enum_repository.DDValveNames.D14_VALV.value, "state": DEENERGIZED} self.d52_valv = {"id": dd_enum_repository.DDValveNames.D52_VALV.value, "state": DEENERGIZED} self.d8_valv = {"id": dd_enum_repository.DDValveNames.D8_VALV.value, "state": DEENERGIZED}