Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r919980c660e89393848ffc6af4ef25c8309a05dd -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 919980c660e89393848ffc6af4ef25c8309a05dd) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -176,7 +176,7 @@ if len(major) > 0 and len(minor) > 0 and len(micro) > 0 and len(build) > 0: self.dg_version = f"v{major[0]}.{minor[0]}.{micro[0]}-{build[0]}" - print(self.dg_version) + self.print_and_log(self.dg_version) return self.dg_version @@ -210,19 +210,19 @@ message_id=self.MSG_ID_LOGIN_TO_DG, payload=list(map(int, map(ord, self.DG_LOGIN_PASSWORD)))) - print("login") + self.print_and_log("login") # Send message received_message = self.can_interface.send(message) if received_message is not None: if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - print("Logged In") + self.print_and_log("Logged In") else: - print("Log In Failed.") + self.print_and_log("Log In Failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_ui_request_dg_version(self): @@ -234,7 +234,7 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=self.MSG_ID_DG_REQUEST_DG_VERSION) - print("Sending Dialin request for version to DG") + self.print_and_log("Sending Dialin request for version to DG") self.can_interface.send(message, 0) @@ -251,18 +251,18 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=self.MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE) - print("overriding DG safety shutdown") + self.print_and_log("overriding DG safety shutdown") # Send message received_message = self.can_interface.send(message) if received_message is not None: if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - print("Safety shutdown signal overridden") + self.print_and_log("Safety shutdown signal overridden") else: - print("Safety shutdown signal override failed.") + self.print_and_log("Safety shutdown signal override failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/dg/drain_pump.py =================================================================== diff -u -r1647ec71451f356dc8c61528781a5eff30859604 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision 1647ec71451f356dc8c61528781a5eff30859604) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -107,24 +107,24 @@ message_id=self.MSG_ID_DG_DRAIN_PUMP_SET_SPEED_OVERRIDE, payload=payload) - print("override drain pump speed set point") + self.print_and_log("override drain pump speed set point") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(speed) - print("Drain pump set point overridden to " + str_res + " RPM: " + + self.print_and_log("Drain pump set point overridden to " + str_res + " RPM: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_drain_pump_data_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -144,23 +144,23 @@ message_id=self.MSG_ID_DG_DRAIN_PUMP_BROADAST_INTERVAL_OVERRIDE, payload=payload) - print("override drain pump data broadcast interval") + self.print_and_log("override drain pump data broadcast interval") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(mis) - print( + self.print_and_log( "Drain pump data broadcast interval overridden to " + str_res + " ms: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/dg/hd_proxy.py =================================================================== diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095) +++ dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -64,7 +64,7 @@ message_id=self.MSG_ID_HD_SWITCH_RESERVOIRS_CMD, payload=payload) - print("switch reservoirs cmd sent to DG") + self.print_and_log("switch reservoirs cmd sent to DG") # Send message received_message = self.can_interface.send(message) @@ -74,7 +74,7 @@ # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_fill(self, volume=1500): @@ -92,7 +92,7 @@ message_id=self.MSG_ID_HD_FILL_CMD, payload=payload) - print("fill cmd sent to DG") + self.print_and_log("fill cmd sent to DG") # Send message received_message = self.can_interface.send(message) @@ -102,7 +102,7 @@ # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_drain(self, volume=200): @@ -120,7 +120,7 @@ message_id=self.MSG_ID_HD_DRAIN_CMD, payload=payload) - print("drain cmd sent to DG") + self.print_and_log("drain cmd sent to DG") # Send message received_message = self.can_interface.send(message) @@ -130,7 +130,7 @@ # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_start_stop_dg(self, start=True): @@ -153,7 +153,7 @@ message_id=self.MSG_ID_HD_START_STOP_DG_CMD, payload=payload) - print(str+"DG cmd sent to DG") + self.print_and_log(str+"DG cmd sent to DG") # Send message received_message = self.can_interface.send(message) @@ -163,7 +163,7 @@ # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_start_stop_trimmer_heater(self, start=True): @@ -186,7 +186,7 @@ message_id=self.MSG_ID_HD_START_STOP_DG_TRIMMER_HEATER, payload=payload) - print(str+"DG trimmer heater cmd sent to DG") + self.print_and_log(str+"DG trimmer heater cmd sent to DG") # Send message received_message = self.can_interface.send(message) @@ -196,6 +196,6 @@ # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/dg/heaters.py =================================================================== diff -u -r414ee5c06661993d4e847b7a61067c1718340cbf -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/dg/heaters.py (.../heaters.py) (revision 414ee5c06661993d4e847b7a61067c1718340cbf) +++ dialin/dg/heaters.py (.../heaters.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -82,7 +82,7 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=self.MSG_ID_START_STOP_PRIMARY_HEATER, payload=payload) - print("Starting the Primary heater") + self.print_and_log("Starting the Primary heater") self.can_interface.send(message, 0) def cmd_stop_primary_heater(self): @@ -96,7 +96,7 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=self.MSG_ID_START_STOP_PRIMARY_HEATER, payload=payload) - print("Stopping the Primary heater") + self.print_and_log("Stopping the Primary heater") self.can_interface.send(message, 0) def cmd_start_trimmer_heater(self): @@ -110,7 +110,7 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=self.MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD, payload=payload) - print("Starting the Trimmer heater") + self.print_and_log("Starting the Trimmer heater") self.can_interface.send(message, 0) def cmd_stop_trimmer_heater(self): @@ -124,7 +124,7 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=self.MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD, payload=payload) - print("Stopping the Trimmer heater") + self.print_and_log("Stopping the Trimmer heater") self.can_interface.send(message, 0) def cmd_set_dialysate_target_temperature(self, pirmary_target_temp=37.0, trimmer_target_temp=38.0): @@ -141,7 +141,7 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=self.MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS, payload=payload) - print("Setting Primary Heater to {} C and Trimmer Heater to {} C".format(pirmary_target_temp, trimmer_target_temp)) + self.print_and_log("Setting Primary Heater to {} C and Trimmer Heater to {} C".format(pirmary_target_temp, trimmer_target_temp)) self.can_interface.send(message, 0) def cmd_heaters_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -160,7 +160,7 @@ message_id=self.MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE, payload=payload) - print("Sending {} ms publish interval to the Heaters module".format(ms)) + self.print_and_log("Sending {} ms publish interval to the Heaters module".format(ms)) # Send message received_message = self.can_interface.send(message) @@ -169,7 +169,7 @@ # Response payload is OK or not return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/dg/load_cells.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/dg/load_cells.py (.../load_cells.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -127,7 +127,7 @@ message_id=self.MSG_ID_DG_LOAD_CELL_OVERRIDE, payload=payload) - print("override load cell weight value for sensor " + str(sensor)) + self.print_and_log("override load cell weight value for sensor " + str(sensor)) # Send message received_message = self.can_interface.send(message) @@ -137,7 +137,7 @@ # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_load_cell_data_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -157,7 +157,7 @@ message_id=self.MSG_ID_DG_LOAD_CELL_DATA_BROADCAST_INTERVAL_OVERRIDE, payload=payload) - print("override DG load cell broadcast interval") + self.print_and_log("override DG load cell broadcast interval") # Send message received_message = self.can_interface.send(message) @@ -168,11 +168,11 @@ str_res = "reset back to normal: " else: str_res = str(ms) + " ms: " - print("Load cell data broadcast interval overridden to " + str_res + + self.print_and_log("Load cell data broadcast interval overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/dg/pressures.py =================================================================== diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/dg/pressures.py (.../pressures.py) (revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095) +++ dialin/dg/pressures.py (.../pressures.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -133,7 +133,7 @@ message_id=self.MSG_ID_DG_PRESSURE_OVERRIDE, payload=payload) - print("override pressure sensor") + self.print_and_log("override pressure sensor") # Send message received_message = self.can_interface.send(message) @@ -143,7 +143,7 @@ # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_pressure_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -164,7 +164,7 @@ message_id=self.MSG_ID_DG_PRESSURE_DATA_BROADCAST_INTERVAL_OVERRIDE, payload=payload) - print("override pressure data broadcast interval") + self.print_and_log("override pressure data broadcast interval") # Send message received_message = self.can_interface.send(message) @@ -174,5 +174,5 @@ # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/dg/ro_pump.py =================================================================== diff -u -r5d58d1eeb80237a7cafbb31bc800cb29e19615e0 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision 5d58d1eeb80237a7cafbb31bc800cb29e19615e0) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -125,25 +125,25 @@ message_id=self.MSG_ID_DG_RO_PUMP_PRESSURE_SET_PT_OVERRIDE, payload=payload) - print("override RO pump pressure set point") + self.print_and_log("override RO pump pressure set point") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(pressure) - print( + self.print_and_log( "RO pump pressure set point overridden to " + str_res + " PSI: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_ro_flow_rate_override(self, flow, reset=NO_RESET): @@ -163,25 +163,25 @@ message_id=self.MSG_ID_DG_RO_FLOW_RATE_OVERRIDE, payload=payload) - print("override RO pump pressure set point") + self.print_and_log("override RO pump pressure set point") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(flo) - print( + self.print_and_log( "RO flow rate overridden to " + str_res + " L/min: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_ro_pump_data_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -201,24 +201,24 @@ message_id=self.MSG_ID_DG_RO_PUMP_BROADCAST_INTERVAL_OVERRIDE, payload=payload) - print("override RO pump data broadcast interval") + self.print_and_log("override RO pump data broadcast interval") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(mis) - print( + self.print_and_log( "RO pump data broadcast interval overridden to " + str_res + " ms: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/dg/temperature_sensors.py =================================================================== diff -u -r414ee5c06661993d4e847b7a61067c1718340cbf -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 414ee5c06661993d4e847b7a61067c1718340cbf) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -161,7 +161,7 @@ message_id=self.MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE, payload=payload) - print("Sending {} ms publish interval to the Temperature Sensors module".format(ms)) + self.print_and_log("Sending {} ms publish interval to the Temperature Sensors module".format(ms)) # Send message received_message = self.can_interface.send(message) @@ -170,7 +170,7 @@ # Response payload is OK or not return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_temperature_sensors_override_value(self, sensor_index, sensor_value, reset=NO_RESET): @@ -191,7 +191,7 @@ message_id=self.MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE, payload=payload) - print("Setting sensor {} to {} C".format(sensor_index, sensor_value)) + self.print_and_log("Setting sensor {} to {} C".format(sensor_index, sensor_value)) # Send message received_message = self.can_interface.send(message) @@ -201,6 +201,6 @@ # Response payload is OK or not return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/dg/valves.py =================================================================== diff -u -rd025f73c8fce9bc87364e625db92c4ba07a66904 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/dg/valves.py (.../valves.py) (revision d025f73c8fce9bc87364e625db92c4ba07a66904) +++ dialin/dg/valves.py (.../valves.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -146,7 +146,7 @@ 'valve_state_VRO': {'id': 3, 'state': True}, 'valve_state_VSP': {'id': 9, 'state': True}, 'valve_states_all': 8191} - >>> print(dg.valves.sort_by_id(observation)) + >>> self.print_and_log(dg.valves.sort_by_id(observation)) ('valve_state_VRF', 0, True) ('valve_state_VRI', 1, True) ('valve_state_VRD', 2, True) @@ -259,7 +259,7 @@ message_id=self.MSG_ID_DG_VALVE_STATE_OVERRIDE, payload=payload) - print("override valve state") + self.print_and_log("override valve state") # Send message received_message = self.can_interface.send(message) @@ -269,7 +269,7 @@ # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_valve_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -290,7 +290,7 @@ message_id=self.MSG_ID_DG_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE, payload=payload) - print("override valves states publish interval") + self.print_and_log("override valves states publish interval") # Send message received_message = self.can_interface.send(message) @@ -300,5 +300,5 @@ # Response payload is OK or not return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/hd/alarms.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/alarms.py (.../alarms.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/alarms.py (.../alarms.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -308,7 +308,7 @@ # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: @@ -336,24 +336,24 @@ message_id=self.MSG_ID_HD_ALARM_TIME_OVERRIDE, payload=payload) - print("override alarm time since activated") + self.print_and_log("override alarm time since activated") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(time_ms) - print("Alarm time since activated overridden to " + str_res + " ms: " + str( + self.print_and_log("Alarm time since activated overridden to " + str_res + " ms: " + str( received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_alarm_lamp_pattern_override(self, pattern, reset=NO_RESET): @@ -381,14 +381,14 @@ message_id=self.MSG_ID_HD_ALARM_LAMP_OVERRIDE, payload=payload) - print("Override Alarm Lamp Pattern") + self.print_and_log("Override Alarm Lamp Pattern") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - print(received_message) + self.print_and_log(received_message) if reset == RESET: str_pat = "reset back to normal" elif pattern == self.HD_ALARM_LAMP_PATTERN_OFF: @@ -405,12 +405,12 @@ str_pat = "low" else: str_pat = "manual" - print("Alarm lamp pattern overridden to " + str_pat + ":" + + self.print_and_log("Alarm lamp pattern overridden to " + str_pat + ":" + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def get_current_alarms_state(self): Index: dialin/hd/blood_flow.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -192,25 +192,25 @@ message_id=self.MSG_ID_HD_BLOOD_FLOW_SET_RATE_OVERRIDE, payload=payload) - print("override blood flow set point") + self.print_and_log("override blood flow set point") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(flow) - print( + self.print_and_log( "Blood flow set point overridden to " + str_res + " mL/min: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_blood_flow_measured_override(self, flow, reset=NO_RESET): @@ -230,24 +230,24 @@ message_id=self.MSG_ID_HD_BLOOD_FLOW_MEAS_RATE_OVERRIDE, payload=payload) - print("override measured blood flow") + self.print_and_log("override measured blood flow") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(flow) - print("Blood flow (measured)) overridden to " + str_res + " mL/min: " + + self.print_and_log("Blood flow (measured)) overridden to " + str_res + " mL/min: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_blood_pump_mc_measured_speed_override(self, speed, reset=NO_RESET): @@ -268,24 +268,24 @@ message_id=self.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE, payload=payload) - print("override measured blood pump motor controller speed") + self.print_and_log("override measured blood pump motor controller speed") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(speed) - print("Blood pump MC speed (measured) overridden to " + str_res + " RPM: " + + self.print_and_log("Blood pump MC speed (measured) overridden to " + str_res + " RPM: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_blood_pump_measured_current_override(self, curr, reset=NO_RESET): @@ -305,24 +305,24 @@ message_id=self.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_CURRENT_OVERRIDE, payload=payload) - print("override measured blood pump motor controller current") + self.print_and_log("override measured blood pump motor controller current") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(curr) - print("Blood pump MC current (measured) overridden to " + str_res + " mA: " + + self.print_and_log("Blood pump MC current (measured) overridden to " + str_res + " mA: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_blood_pump_measured_speed_override(self, speed, reset=NO_RESET): @@ -343,24 +343,24 @@ message_id=self.MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE, payload=payload) - print("override measured blood pump speed") + self.print_and_log("override measured blood pump speed") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(speed) - print("Blood pump speed (measured) overridden to " + str_res + " RPM: " + + self.print_and_log("Blood pump speed (measured) overridden to " + str_res + " RPM: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_blood_pump_rotor_measured_speed_override(self, speed, reset=NO_RESET): @@ -381,24 +381,24 @@ message_id=self.MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, payload=payload) - print("override measured blood pump rotor speed") + self.print_and_log("override measured blood pump rotor speed") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(speed) - print("Blood pump rotor speed (measured) overridden to " + str_res + " RPM: " + + self.print_and_log("Blood pump rotor speed (measured) overridden to " + str_res + " RPM: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_blood_flow_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -418,22 +418,22 @@ message_id=self.MSG_ID_HD_BLOOD_FLOW_PUBLISH_INTERVAL_OVERRIDE, payload=payload) - print("override blood flow broadcast interval") + self.print_and_log("override blood flow broadcast interval") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal: " else: str_res = str(ms) + " ms: " - print("Blood flow broadcast interval overridden to " + str_res + + self.print_and_log("Blood flow broadcast interval overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/hd/buttons.py =================================================================== diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/buttons.py (.../buttons.py) (revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095) +++ dialin/hd/buttons.py (.../buttons.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -58,7 +58,7 @@ message_id=self.MSG_ID_HD_OFF_BUTTON_OVERRIDE, payload=payload) - print("override off button") + self.print_and_log("override off button") # Send message received_message = self.can_interface.send(message) @@ -70,12 +70,12 @@ else: str_res = ("pressed" if state != 0 else "released") - print("Off button overridden to " + str_res + ":" + + self.print_and_log("Off button overridden to " + str_res + ":" + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_stop_button_override(self, state, reset=NO_RESET): @@ -96,7 +96,7 @@ message_id=self.MSG_ID_HD_STOP_BUTTON_OVERRIDE, payload=payload) - print("override stop button") + self.print_and_log("override stop button") # Send message received_message = self.can_interface.send(message) @@ -107,11 +107,11 @@ str_res = "reset back to normal" else: str_res = ("pressed" if state != 0 else "released") - print("Stop button overridden to " + str_res + ":" + + self.print_and_log("Stop button overridden to " + str_res + ":" + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message["message"][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/hd/dialysate_inlet_flow.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -190,25 +190,25 @@ message_id=self.MSG_ID_HD_DIAL_IN_FLOW_SET_RATE_OVERRIDE, payload=payload) - print("override dialysate flow set point") + self.print_and_log("override dialysate flow set point") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(flow) - print( + self.print_and_log( "Dialysate flow set point overridden to " + str_res + " mL/min: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_inlet_flow_measured_override(self, flow, reset=NO_RESET): @@ -228,24 +228,24 @@ message_id=self.MSG_ID_HD_DIAL_IN_FLOW_MEAS_RATE_OVERRIDE, payload=payload) - print("override measured dialysate flow") + self.print_and_log("override measured dialysate flow") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(flow) - print("Dialysate flow (measured)) overridden to " + str_res + " mL/min: " + + self.print_and_log("Dialysate flow (measured)) overridden to " + str_res + " mL/min: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_inlet_pump_mc_measured_speed_override(self, speed, reset=NO_RESET): @@ -266,24 +266,24 @@ message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE, payload=payload) - print("override measured dialysate inlet pump motor controller speed") + self.print_and_log("override measured dialysate inlet pump motor controller speed") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(speed) - print("Dialysate pump MC speed (measured) overridden to " + str_res + " RPM: " + + self.print_and_log("Dialysate pump MC speed (measured) overridden to " + str_res + " RPM: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_inlet_pump_measured_current_override(self, curr, reset=NO_RESET): @@ -303,24 +303,24 @@ message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_CURRENT_OVERRIDE, payload=payload) - print("override measured dialysate inlet pump motor controller current") + self.print_and_log("override measured dialysate inlet pump motor controller current") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(curr) - print("Dialysate inlet pump MC current (measured) overridden to " + str_res + " mA: " + + self.print_and_log("Dialysate inlet pump MC current (measured) overridden to " + str_res + " mA: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_inlet_pump_measured_speed_override(self, speed, reset=NO_RESET): @@ -341,24 +341,24 @@ message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE, payload=payload) - print("override measured dialysate inlet pump speed") + self.print_and_log("override measured dialysate inlet pump speed") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(speed) - print("Dialysate inlet pump speed (measured) overridden to " + str_res + " RPM: " + + self.print_and_log("Dialysate inlet pump speed (measured) overridden to " + str_res + " RPM: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_inlet_pump_rotor_measured_speed_override(self, speed, reset=NO_RESET): @@ -379,24 +379,24 @@ message_id=self.MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, payload=payload) - print("override measured dialysate inlet pump rotor speed") + self.print_and_log("override measured dialysate inlet pump rotor speed") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = str(speed) - print("Dialysate inlet pump rotor speed (measured) overridden to " + str_res + " RPM: " + + self.print_and_log("Dialysate inlet pump rotor speed (measured) overridden to " + str_res + " RPM: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_inlet_flow_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -416,7 +416,7 @@ message_id=self.MSG_ID_HD_DIAL_IN_FLOW_PUBLISH_INTERVAL_OVERRIDE, payload=payload) - print("override dialysate inlet flow broadcast interval") + self.print_and_log("override dialysate inlet flow broadcast interval") # Send message received_message = self.can_interface.send(message) @@ -427,10 +427,10 @@ str_res = "reset back to normal: " else: str_res = str(ms) + " ms: " - print("Dialysate inlet flow broadcast interval overridden to " + str_res + + self.print_and_log("Dialysate inlet flow broadcast interval overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -188,25 +188,25 @@ message_id=self.MSG_ID_HD_DIAL_OUT_UF_REF_VOLUME_OVERRIDE, payload=payload) - print("override UF reference volume with " + str(refvol) + "mL.") + self.print_and_log("override UF reference volume with " + str(refvol) + "mL.") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal. " else: str_res = "overridden to " + str(refvol) + " mL. " - print( + self.print_and_log( "UF reference volume " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_outlet_measured_uf_volume_override(self, measvol, reset=NO_RESET): @@ -226,24 +226,24 @@ message_id=self.MSG_ID_HD_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE, payload=payload) - print("override measured UF volume with " + str(measvol) + " mL.") + self.print_and_log("override measured UF volume with " + str(measvol) + " mL.") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal. " else: str_res = "overridden to " + str(measvol) + " mL. " - print("UF measured volume " + str_res + + self.print_and_log("UF measured volume " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_outlet_pump_mc_measured_speed_override(self, speed, reset=NO_RESET): @@ -264,24 +264,24 @@ message_id=self.measured_dialysate_outlet_pump_mc_speed, payload=payload) - print("override measured dialysate outlet pump motor controller speed to " + str(spd) + " RPM.") + self.print_and_log("override measured dialysate outlet pump motor controller speed to " + str(spd) + " RPM.") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal. " else: str_res = "overridden to " + str(speed) + " RPM. " - print("Dialysate outlet pump MC speed (measured) " + str_res + + self.print_and_log("Dialysate outlet pump MC speed (measured) " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_outlet_pump_measured_current_override(self, curr, reset=NO_RESET): @@ -301,24 +301,24 @@ message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_MC_MEAS_CURRENT_OVERRIDE, payload=payload) - print("override measured dialysate outlet pump motor controller current") + self.print_and_log("override measured dialysate outlet pump motor controller current") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal. " else: str_res = "overridden to " + str(curr) + " mA. " - print("Dialysate outlet pump MC current (measured) " + str_res + + self.print_and_log("Dialysate outlet pump MC current (measured) " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_outlet_pump_measured_speed_override(self, speed, reset=NO_RESET): @@ -339,24 +339,24 @@ message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE, payload=payload) - print("override measured dialysate outlet pump speed to " + str(speed) + " RPM.") + self.print_and_log("override measured dialysate outlet pump speed to " + str(speed) + " RPM.") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal. " else: str_res = "overridden to " + str(speed) + " RPM. " - print("Dialysate outlet pump speed (measured) " + str_res + + self.print_and_log("Dialysate outlet pump speed (measured) " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_outlet_pump_rotor_measured_speed_override(self, speed, reset=NO_RESET): @@ -377,24 +377,24 @@ message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, payload=payload) - print("override measured dialysate outlet pump rotor speed to " + str(speed) + " RPM.") + self.print_and_log("override measured dialysate outlet pump rotor speed to " + str(speed) + " RPM.") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal. " else: str_res = "overridden to " + str(speed) + " RPM. " - print("Dialysate outlet pump rotor speed (measured) " + str_res + + self.print_and_log("Dialysate outlet pump rotor speed (measured) " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_outlet_flow_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -414,24 +414,24 @@ message_id=self.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISH_INTERVAL_OVERRIDE, payload=payload) - print("override dialysate outlet flow broadcast interval to " + str(ms) + " ms.") + self.print_and_log("override dialysate outlet flow broadcast interval to " + str(ms) + " ms.") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal. " else: str_res = "overridden to " + str(ms) + " ms. " - print("Dialysate outlet flow broadcast interval " + str_res + + self.print_and_log("Dialysate outlet flow broadcast interval " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_outlet_pump_load_cell_weight_override(self, weight, sensor, reset=NO_RESET): @@ -459,24 +459,24 @@ message_id=self.MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE, payload=payload) - print("override measured load cell weight to " + str(weight) + " grams for load cell # " + str(sensor)) + self.print_and_log("override measured load cell weight to " + str(weight) + " grams for load cell # " + str(sensor)) # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal. " else: str_res = "overridden to " + str(weight) + " grams. " - print("Load cell # " + str(sensor) + " " + str_res + + self.print_and_log("Load cell # " + str(sensor) + " " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_set_load_cell_weights(self, r1p, r1b, r2p, r2b): @@ -500,7 +500,7 @@ message_id=self.MSG_ID_HD_LOAD_CELL_READINGS, payload=payload) - print("measured load cell weights set.") + self.print_and_log("measured load cell weights set.") # Send message self.can_interface.send(message, 0) Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -139,19 +139,19 @@ message_id=self.MSG_ID_LOGIN_TO_HD, payload=list(map(int, map(ord, self.HD_LOGIN_PASSWORD)))) - print("Logging in...") + self.print_and_log("Logging in...") # Send message received_message = self.can_interface.send(message) if received_message is not None: if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - print("Success: Logged In") + self.print_and_log("Success: Logged In") else: - print("Failure: Log In Failed.") + self.print_and_log("Failure: Log In Failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Login Timeout!!!!") + self.print_and_log("Login Timeout!!!!") return False def cmd_hd_safety_shutdown_override(self): @@ -169,17 +169,17 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=self.MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE) - print("overriding HD safety shutdown") + self.print_and_log("overriding HD safety shutdown") # Send message received_message = self.can_interface.send(message) if received_message is not None: if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - print("Safety shutdown signal overridden") + self.print_and_log("Safety shutdown signal overridden") else: - print("Safety shutdown signal override failed.") + self.print_and_log("Safety shutdown signal override failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -157,7 +157,7 @@ message_id=self.MSG_ID_HD_PRESSURE_ARTERIAL_OVERRIDE, payload=payload) - print("override measured arterial pressure") + self.print_and_log("override measured arterial pressure") # Send message received_message = self.can_interface.send(message) @@ -168,12 +168,12 @@ str_res = "reset back to normal. " else: str_res = str(pres) + " mmHg. " - print("Arterial pressure (measured)) overridden to " + str_res + + self.print_and_log("Arterial pressure (measured)) overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_venous_pressure_measured_override(self, pres, reset=NO_RESET): @@ -194,7 +194,7 @@ message_id=self.MSG_ID_HD_PRESSURE_VENOUS_OVERRIDE, payload=payload) - print("override measured venous pressure") + self.print_and_log("override measured venous pressure") # Send message received_message = self.can_interface.send(message) @@ -205,12 +205,12 @@ str_res = "reset back to normal. " else: str_res = str(pres) + " mmHg. " - print("Venous pressure (measured) overridden to " + str_res + + self.print_and_log("Venous pressure (measured) overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_blood_pump_measured_occlusion_override(self, occl, reset=NO_RESET): @@ -230,7 +230,7 @@ message_id=self.MSG_ID_HD_OCCLUSION_BLOOD_PUMP_OVERRIDE, payload=payload) - print("override measured blood pump occlusion pressure") + self.print_and_log("override measured blood pump occlusion pressure") # Send message received_message = self.can_interface.send(message) @@ -241,12 +241,12 @@ str_res = "reset back to normal. " else: str_res = str(occl) + " mmHg. " - print("Blood pump occlusion pressure (measured) overridden to " + str_res + + self.print_and_log("Blood pump occlusion pressure (measured) overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_inlet_pump_measured_occlusion_override(self, occl, reset=NO_RESET): @@ -267,7 +267,7 @@ message_id=self.MSG_ID_HD_OCCLUSION_DIAL_IN_PUMP_OVERRIDE, payload=payload) - print("override measured dialysate inlet pump occlusion pressure") + self.print_and_log("override measured dialysate inlet pump occlusion pressure") # Send message received_message = self.can_interface.send(message) @@ -278,12 +278,12 @@ str_res = "reset back to normal. " else: str_res = str(occl) + " mmHg. " - print("Dialysate inlet pump occlusion pressure (measured) overridden to " + str_res + + self.print_and_log("Dialysate inlet pump occlusion pressure (measured) overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_dialysate_outlet_pump_measured_occlusion_override(self, occl, reset=NO_RESET): @@ -304,7 +304,7 @@ message_id=self.MSG_ID_HD_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE, payload=payload) - print("override measured dialysate outlet pump occlusion pressure") + self.print_and_log("override measured dialysate outlet pump occlusion pressure") # Send message received_message = self.can_interface.send(message) @@ -315,12 +315,12 @@ str_res = "reset back to normal. " else: str_res = str(occl) + " mmHg. " - print("Dialysate outlet pump occlusion pressure (measured) overridden to " + str_res + + self.print_and_log("Dialysate outlet pump occlusion pressure (measured) overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False def cmd_pressure_occlusion_broadcast_interval_override(self, ms, reset=NO_RESET): @@ -340,7 +340,7 @@ message_id=self.MSG_ID_HD_PRES_OCCL_SEND_INTERVAL_OVERRIDE, payload=payload) - print("override pressure/occlusion broadcast interval") + self.print_and_log("override pressure/occlusion broadcast interval") # Send message received_message = self.can_interface.send(message) @@ -351,12 +351,12 @@ str_res = "reset back to normal: " else: str_res = str(ms) + " ms: " - print("Pressure/occlusion broadcast interval overridden to " + str_res + + self.print_and_log("Pressure/occlusion broadcast interval overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False # TEST CODE *************************************** Index: dialin/hd/rtc.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/rtc.py (.../rtc.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/rtc.py (.../rtc.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -90,20 +90,20 @@ message_id=self.MSG_ID_SET_RTC_DATE_TIME, payload=payload) - print("Setting time and date to rtc") + self.print_and_log("Setting time and date to rtc") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - print(received_message) + self.print_and_log(received_message) # str_res = str(flow) - print("Time and Date in rtc set to seconds: " + str(sec) + " minutes: " + str(min) + " hours: " + + self.print_and_log("Time and Date in rtc set to seconds: " + str(sec) + " minutes: " + str(min) + " hours: " + str(hour) + " days: " + str(day) + " months: " + str(month) + " years: " + str(year) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/hd/ui_proxy.py =================================================================== diff -u -ra51e2af877a26c03f4d75b8f8fc7136c23e8a5d7 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision a51e2af877a26c03f4d75b8f8fc7136c23e8a5d7) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -415,7 +415,7 @@ if len(major) > 0 and len(minor) > 0 and len(micro) > 0 and len(build) > 0: self.hd_version = f"v{major[0]}.{minor[0]}.{micro[0]}-{build[0]}" - print(self.hd_version) + self.print_and_log(self.hd_version) return self.hd_version @_publish([ @@ -631,7 +631,7 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=self.MSG_ID_UI_CHECKIN_WITH_HD) - print("Sending ui checkin w/ HD") + self.print_and_log("Sending ui checkin w/ HD") self.can_interface.send(message, 0) @@ -646,7 +646,7 @@ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=self.MSG_ID_UI_REQUEST_HD_VERSION) - print("Sending ui request for version to HD") + self.print_and_log("Sending ui request for version to HD") self.can_interface.send(message, 0) @@ -668,7 +668,7 @@ str_cmd = "pause" else: str_cmd = "resume" - print("Sending UF " + str_cmd + " command.") + self.print_and_log("Sending UF " + str_cmd + " command.") self.can_interface.send(message, 0) @@ -691,7 +691,7 @@ message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER, payload=volume) - print("Sending UF settings change request.") + self.print_and_log("Sending UF settings change request.") self.can_interface.send(message, 0) @@ -718,7 +718,7 @@ message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER, payload=payload) - print("Sending UF settings change request.") + self.print_and_log("Sending UF settings change request.") self.can_interface.send(message, 0) @@ -745,7 +745,7 @@ message_id=self.MSG_ID_UF_SETTINGS_CHANGE_CONFIRMED_BY_USER, payload=payload) - print("Sending UF settings change confirmation.") + self.print_and_log("Sending UF settings change confirmation.") self.can_interface.send(message, 0) @@ -765,7 +765,7 @@ message_id=self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_REQUEST, payload=payload) - print("Sending treatment duration setting change request.") + self.print_and_log("Sending treatment duration setting change request.") # Send message self.can_interface.send(message, 0) @@ -789,7 +789,7 @@ message_id=self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_REQUEST_BY_USER, payload=payload) - print("Sending blood & dialysate flow rate settings change request.") + self.print_and_log("Sending blood & dialysate flow rate settings change request.") self.can_interface.send(message, 0) Index: dialin/hd/watchdog.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/hd/watchdog.py (.../watchdog.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/watchdog.py (.../watchdog.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -58,22 +58,22 @@ message_id=self.MSG_ID_HD_WD_CHECKIN_OVERRIDE, payload=payload) - print("override watchdog task check-in state") + self.print_and_log("override watchdog task check-in state") # Send message received_message = self.can_interface.send(message) # If there is content... if received_message is not None: - # print(received_message) + # self.print_and_log(received_message) if reset == RESET: str_res = "reset back to normal" else: str_res = ("checked in" if state != 0 else "not checked in") - print("watchdog task check-in overridden to " + str_res + ":" + + self.print_and_log("watchdog task check-in overridden to " + str_res + ":" + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: - print("Timeout!!!!") + self.print_and_log("Timeout!!!!") return False Index: dialin/utils/base.py =================================================================== diff -u -rd025f73c8fce9bc87364e625db92c4ba07a66904 -rb8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6 --- dialin/utils/base.py (.../base.py) (revision d025f73c8fce9bc87364e625db92c4ba07a66904) +++ dialin/utils/base.py (.../base.py) (revision b8ffb510f830ad9dd0eed6cdf4f5f7eb663e2ca6) @@ -59,6 +59,7 @@ """ return log_level is not None and log_level.upper() in self.get_logging_levels() + @staticmethod def get_logging_levels(self): """ Gets all possible logging levels @@ -152,7 +153,7 @@ elif log_level == logging.CRITICAL: self.logger.critical(message) - + @staticmethod def get_available_log_path(self, filepath:str): """ Gets an available log path from filepath