Index: leahi_dialin/protocols/CAN.py =================================================================== diff -u -ra2b122c638fb8a6853a9b94c99444cb887312867 -r7bc77fbed67b88c023d9b659dc7b7b27ec9b8741 --- leahi_dialin/protocols/CAN.py (.../CAN.py) (revision a2b122c638fb8a6853a9b94c99444cb887312867) +++ leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 7bc77fbed67b88c023d9b659dc7b7b27ec9b8741) @@ -277,19 +277,19 @@ } else: channel_rx_tx_pairs = { - DenaliChannels.hd_alarm_broadcast_ch_id: None, - DenaliChannels.dg_alarm_broadcast_ch_id: None, + DenaliChannels.td_alarm_broadcast_ch_id: None, + DenaliChannels.dd_alarm_broadcast_ch_id: None, DenaliChannels.ui_alarm_broadcast_ch_id: None, - DenaliChannels.hd_to_dg_ch_id: DenaliChannels.dialin_to_hd_ch_id, - DenaliChannels.dg_to_hd_ch_id: DenaliChannels.dialin_to_dg_ch_id, - DenaliChannels.hd_to_ui_ch_id: DenaliChannels.dialin_to_hd_ch_id, - DenaliChannels.hd_sync_broadcast_ch_id: None, - DenaliChannels.dg_to_ui_ch_id: DenaliChannels.dialin_to_dg_ch_id, - DenaliChannels.dg_sync_broadcast_ch_id: None, - DenaliChannels.ui_to_hd_ch_id: DenaliChannels.dialin_to_ui_ch_id, + DenaliChannels.td_to_dd_ch_id: DenaliChannels.dialin_to_td_ch_id, + DenaliChannels.dd_to_td_ch_id: DenaliChannels.dialin_to_dd_ch_id, + DenaliChannels.td_to_ui_ch_id: DenaliChannels.dialin_to_td_ch_id, + DenaliChannels.td_sync_broadcast_ch_id: None, + # DenaliChannels.dd_to_ui_ch_id: DenaliChannels.dialin_to_dd_ch_id, + DenaliChannels.dd_sync_broadcast_ch_id: None, + DenaliChannels.ui_to_td_ch_id: DenaliChannels.dialin_to_ui_ch_id, DenaliChannels.ui_sync_broadcast_ch_id: DenaliChannels.dialin_to_ui_ch_id, - DenaliChannels.hd_to_dialin_ch_id: DenaliChannels.dialin_to_hd_ch_id, - DenaliChannels.dg_to_dialin_ch_id: DenaliChannels.dialin_to_dg_ch_id, + DenaliChannels.td_to_dialin_ch_id: DenaliChannels.dialin_to_td_ch_id, + DenaliChannels.dd_to_dialin_ch_id: DenaliChannels.dialin_to_dd_ch_id, DenaliChannels.ui_to_dialin_ch_id: DenaliChannels.dialin_to_ui_ch_id } Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r9904f1ca279d6c71e6ee12e6503ec609d52fa3e0 -r7bc77fbed67b88c023d9b659dc7b7b27ec9b8741 --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 9904f1ca279d6c71e6ee12e6503ec609d52fa3e0) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 7bc77fbed67b88c023d9b659dc7b7b27ec9b8741) @@ -167,20 +167,10 @@ # If there is content... if received_message is not None: - # self.logger.debug(received_message) - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(flow) - - if mode == PUMP_CONTROL_MODE_OPEN_LOOP: - str_mode = " (open loop): " - else: - str_mode = " (closed loop): " - self.logger.debug( - "Blood flow set point overridden to " + str_res + " mL/min" + str_mode + - - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + # # self.logger.debug(received_message) + # self.logger.debug( + # "Blood flow set point overridden to " + str_res + " mL/min" + str_mode + + # str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r7bc77fbed67b88c023d9b659dc7b7b27ec9b8741 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 7bc77fbed67b88c023d9b659dc7b7b27ec9b8741) @@ -228,8 +228,8 @@ if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: self.logger.debug("Success: Logged In") self.td_set_logged_in_status(True) - self._send_td_checkin_message() # Timer starts interval first - self.can_interface.transmit_interval_dictionary[self.callback_id].start() +# self._send_td_checkin_message() # Timer starts interval first +# self.can_interface.transmit_interval_dictionary[self.callback_id].start() else: self.logger.debug("Failure: Log In Failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] Index: tests/test_dd.py =================================================================== diff -u -re4ea016b22780f3c5924479812ab07394c05ae29 -r7bc77fbed67b88c023d9b659dc7b7b27ec9b8741 --- tests/test_dd.py (.../test_dd.py) (revision e4ea016b22780f3c5924479812ab07394c05ae29) +++ tests/test_dd.py (.../test_dd.py) (revision 7bc77fbed67b88c023d9b659dc7b7b27ec9b8741) @@ -20,6 +20,7 @@ from leahi_dialin.dd.dialysate_delivery import DD #from leahi_dialin.td.valves import ValvesEnum #from leahi_dialin.dd.temperatures import DGTemperaturesNames +from leahi_dialin.dd.modules.constants import NO_RESET, RESET from time import sleep if __name__ == "__main__": @@ -40,12 +41,25 @@ if dd.cmd_log_in_to_dd() == 0: #sleep(1) exit(1) - sleep(1) + sleep(2) + # valves = '{:4X}'.format(dd.valves.valve_states_all) + # print("DD Valves: " + valves) + # dd.valves.cmd_valve_override(1, True, NO_RESET) + # sleep(2) + # valves = '{:4X}'.format(dd.valves.valve_states_all) + # print("DD Valves: " + valves) + # sleep(5) + # dd.valves.cmd_valve_override(1, False, NO_RESET) + # exit(1) -# td.bloodflow.cmd_blood_flow_set_point_override(0) -# exit(1) + # dd.dialysate_pumps.cmd_dialysate_pump_target_speed_override(0, 100.0, NO_RESET) + # sleep(5) + # dd.dialysate_pumps.cmd_dialysate_pump_target_speed_override(0, 0.0, NO_RESET) + # exit(1) + # dd.pressure_sensors.cmd_pressure_readings_override(1,10.0, RESET) + # create log file with open("DD_test.log", "w") as f: Index: tests/test_uf.py =================================================================== diff -u -r80d96ceab5f2c664d8a9a49ed05634ebf72ff362 -r7bc77fbed67b88c023d9b659dc7b7b27ec9b8741 --- tests/test_uf.py (.../test_uf.py) (revision 80d96ceab5f2c664d8a9a49ed05634ebf72ff362) +++ tests/test_uf.py (.../test_uf.py) (revision 7bc77fbed67b88c023d9b659dc7b7b27ec9b8741) @@ -33,17 +33,17 @@ # ro = RO(log_level="DEBUG") sleep(2) - # log in to TD, DD and RO as tester - if td.cmd_log_in_to_td() == 0: - exit(1) + # log in to TD, DD and RO as tester + if td.cmd_log_in_to_td() == 0: + exit(1) # if dd.cmd_log_in_to_dd() == 0: # exit(1) # if ro.cmd_log_in_to_ro() == 0: # exit(1) # sleep(1) # send command to show round-trip communication w/ firmware is working - td.blood_flow.cmd_blood_flow_set_speed_rate_request(100) + td.blood_flow.cmd_blood_flow_set_speed_rate_request(500) # create log file with open("TD_test.log", "w") as f: @@ -55,40 +55,40 @@ ", TD.s, " + '{:2d}'.format(td.td_operation_sub_mode) # ", DD.m, " + '{:2d}'.format(dd.dd_operation_mode) + \ # ", DD.s, " + '{:2d}'.format(dd.dd_operation_sub_mode) - pumpSetPts = ", BP.sf, " + '{:4d}'.format(td.blood_flow.target_blood_flow_rate) + \ + pumpSetPts = ", BP.sf, " + '{:4d}'.format(td.blood_flow.set_blood_flow_rate) + \ ", BP.ss, " + '{:9.2f}'.format(td.blood_flow.set_rpm) # ", ROP.s, " + '{:9.2f}'.format(ro.ro_pump.TBD) pumpMeasSpds = ", BP.m, " + '{:7.1f}'.format(td.blood_flow.measured_blood_pump_speed) # ", BP.r, " + '{:6.1f}'.format(td.blood_flow.measured_blood_pump_rotor_speed) + \ # ", BP.f, " + '{:7.1f}'.format(td.blood_flow.measured_blood_flow_rate) press = ", PBA, " + '{:9.2f}'.format(td.pressure_sensors.arterial_pressure) + \ ", PBV, " + '{:9.2f}'.format(td.pressure_sensors.venous_pressure) - valves = ", VBA, " + td.valves.valves_status[ValvesEnum.VBA.name]["PosID"] + \ - ", VBV, " + td.valves.valves_status[ValvesEnum.VBV.name]["PosID"] - air = ", ADV, " + '{:1d}'.format(td.bubbles.air_bubbles_status) + \ - ", ULBl, " + '{:1d}'.format(td.air_trap.lower_level) + \ - ", ULBu, " + '{:1d}'.format(td.air_trap.upper_level) + \ - ", AP, " + '{:1d}'.format(td.air_pump.air_pump_state) + \ - ", VBT, " + '{:1d}'.format(td.air_trap.valve_state) - alarms = ", AL.s, " + '{:1d}'.format(td.alarms.get_current_alarms_state()) + \ - ", AL.t, " + '{:4d}'.format(td.alarms.alarm_top) + # valves = ", VBA, " + td.valves.valves_status[ValvesEnum.VBA.name]["PosID"] + \ + # ", VBV, " + td.valves.valves_status[ValvesEnum.VBV.name]["PosID"] + # air = ", ADV, " + '{:1d}'.format(td.bubbles.air_bubbles_status) + \ + # ", ULBl, " + '{:1d}'.format(td.air_trap.lower_level) + \ + # ", ULBu, " + '{:1d}'.format(td.air_trap.upper_level) + \ + # ", AP, " + '{:1d}'.format(td.air_pump.air_pump_state) + \ + # ", VBT, " + '{:1d}'.format(td.air_trap.valve_state) + # alarms = ", AL.s, " + '{:1d}'.format(td.alarms.get_current_alarms_state()) + \ + # ", AL.t, " + '{:4d}'.format(td.alarms.alarm_top) # log data f.write(modes) f.write(pumpSetPts) f.write(pumpMeasSpds) f.write(press) - f.write(valves) - f.write(air) - f.write(alarms) + # f.write(valves) + # f.write(air) + # f.write(alarms) f.write("\n") # print to console print(" Modes: "+modes) print("Pump Set Pts: "+pumpSetPts) print(" Pump Speeds: "+pumpMeasSpds) print(" Pressures: "+press) - print(" Valves: "+valves) - print(" Air: "+air) - print(" Alarms: "+alarms) + # print(" Valves: "+valves) + # print(" Air: "+air) + # print(" Alarms: "+alarms)