Index: leahi_dialin/dd/proxies/td_proxy.py =================================================================== diff -u -r78814f5e551360517b569f81dc2a7455f15ac2bc -r1c9f9429a04e8fddcb102ef955eccb288dcf113f --- leahi_dialin/dd/proxies/td_proxy.py (.../td_proxy.py) (revision 78814f5e551360517b569f81dc2a7455f15ac2bc) +++ leahi_dialin/dd/proxies/td_proxy.py (.../td_proxy.py) (revision 1c9f9429a04e8fddcb102ef955eccb288dcf113f) @@ -92,10 +92,11 @@ byp = integer_to_bytearray(bypass) acd = integer_to_bytearray(acid) bic = integer_to_bytearray(bicarb) - payload = bic +acd + byp + temp + uf + dial + stt + #payload = bic +acd + byp + temp + uf + dial + stt + payload = stt + dial + uf + temp + byp + acd + bic message = DenaliMessage.build_message(channel_id=DenaliChannels.td_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA.value, payload=payload) self.logger.debug("Sending TD gen dialysate data request to DD.") - self.can_interface.send(message, 0) \ No newline at end of file + self.can_interface.send(message, 0) Index: tests/test_dd.py =================================================================== diff -u -r10d688e57d9594c505de2d9de21aa7cbbe70136a -r1c9f9429a04e8fddcb102ef955eccb288dcf113f --- tests/test_dd.py (.../test_dd.py) (revision 10d688e57d9594c505de2d9de21aa7cbbe70136a) +++ tests/test_dd.py (.../test_dd.py) (revision 1c9f9429a04e8fddcb102ef955eccb288dcf113f) @@ -5,6 +5,7 @@ # 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 test_dd.py # # @author (last) Vinayakam Mani @@ -72,13 +73,13 @@ # collect sensors log from DD while True: - if dd.levels.floater1 == 1: + #if dd.levels.floater1 == 2: #print (" float level is high") - dd.valves.cmd_valve_override(12,False,0) - else: + #dd.valves.cmd_valve_override(12,False,0) + #else: #print (" float level is low") - dd.valves.cmd_valve_override(12,True,0) - sleep(0.2) + #dd.valves.cmd_valve_override(12,True,0) + sleep(0.25) dialPump = ", DP.fr, " + '{:7.1f}'.format(dd.dialysate_pumps.dial_pump_target_rpm_fresh) + \ ", DP.sr, " + '{:7.1f}'.format(dd.dialysate_pumps.dial_pump_target_rpm_spent) + \ ", DP.fs, " + '{:6.1f}'.format(dd.dialysate_pumps.dial_pump_measured_spd_fresh) + \ @@ -117,6 +118,36 @@ ", Tfd, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_fresh_dialysate_temp) + \ ", Ttm, " + '{:8.1f}'.format(dd.pressure_sensors.transmembrane_temp) valves = ", DDVlvs, " + '{:8X}'.format(dd.valves.valve_states_all) + Levels = "L.f1, " + '{:2d}'.format(dd.levels.floater1) + \ + ", L.Bi, " + '{:2d}'.format(dd.levels.bicarb_level) + \ + ", L.s, " + '{:2d}'.format(dd.levels.spent_dialysate_level) + Temperature = "Temp " + '{}'.format(dd.temperature_sensors.dd_temperatures) + ConcPumps = ", 1SetS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp1_current_set_speed) + \ + ", 1MeS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp1_measured_speed) + \ + ", 2SetS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp2_current_set_speed ) + \ + ", 2MeS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp2_measured_speed) + \ + ", 1TRev, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp1_target_rev_count) + \ + ", 1Mrev, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp1_measured_rev_count) + \ + ", 2Trev, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp2_target_rev_count) + \ + ", 2Mrev, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp2_measured_rev_count) + \ + ", 1Ex, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp1_current_state) + \ + ", 2Ex, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp2_current_state) + \ + ", 1Pul, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp1_pulse_us) + \ + ", 2Pul, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp2_pulse_us) + \ + ", 1TS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp1_target_speed) + \ + ", 2TS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp2_target_speed) + \ + ", 1P, " + '{:b}'.format(dd.concentrate_pumps.concentrate_pump_cp1_parked) + \ + ", 2P, " + '{:b}'.format(dd.concentrate_pumps.concentrate_pump_cp2_parked) + \ + ", 1PF, " + '{:b}'.format(dd.concentrate_pumps.concentrate_pump_cp1_park_fault) + \ + ", 2PF, " + '{:b}'.format(dd.concentrate_pumps.concentrate_pump_cp2_park_fault ) + Heaters = ", PCnt, " + '{:8.1f}'.format(dd.heaters.main_primary_heater_duty_cycle) + \ + ", TCnt, " + '{:8.1f}'.format(dd.heaters.trimmer_heater_duty_cycle) + \ + ", PTemp, " + '{:8.1f}'.format(dd.heaters.primary_heaters_target_temperature) + \ + ", TTemp, " + '{:8.1f}'.format(dd.heaters.trimmer_heater_target_temperature) + \ + ", PSt, " + '{:2d}'.format(dd.heaters.primary_heater_state ) + \ + ", Tst, " + '{:2d}'.format(dd.heaters.trimmer_heater_state) + \ + ", PCtr, " + '{:2d}'.format(dd.heaters.primary_control_counter) + \ + ", TCtr, " + '{:2d}'.format(dd.heaters.trimmer_control_counter) BalChamber = ", ExSt, " + '{:2d}'.format(dd.balancing_chamber.execution_state) + \ ", SwSt, " + '{:2d}'.format(dd.balancing_chamber.switching_state) + \ ", SwFr, " + '{:8.1f}'.format(dd.balancing_chamber.switching_frequency) + \ @@ -138,15 +169,21 @@ f.write(dialPump) f.write(Levels) f.write(pressure) + f.write(Temperature) f.write(valves) + f.write(ConcPumps) + f.write(Heaters) f.write(BalChamber) f.write(GenDialysate) f.write("\n") # print to console #print("Dialysate Pumps: "+dialPump) #print(" Levels: "+Levels) + #print(" Heaters: " +Heaters) print(" Pressure: "+pressure) + #print(" Temperature: "+Temperature) + #print(" ConcenPumps: "+ConcPumps) #print(" DD Valves: "+valves) - #print("Balancing Chamb: "+BalChamber) + print("Balancing Chamb: "+BalChamber) #print(" Gen Dialysate: "+GenDialysate)