Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -rb1aca30a8e2ee9650899faba059f0e484df50809 -r457238a0363ebb5994f660d990cb19df1335dfba --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision b1aca30a8e2ee9650899faba059f0e484df50809) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 457238a0363ebb5994f660d990cb19df1335dfba) @@ -566,7 +566,7 @@ # If there is content... if received_message is not None: - self.logger.debug("HD Check-in interval ACK'd" + + self.logger.debug("DG Check-in interval ACK'd" + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] Index: dialin/dg/temperatures.py =================================================================== diff -u -r3263cf899c0b76f1521d600402df327546af6bd9 -r457238a0363ebb5994f660d990cb19df1335dfba --- dialin/dg/temperatures.py (.../temperatures.py) (revision 3263cf899c0b76f1521d600402df327546af6bd9) +++ dialin/dg/temperatures.py (.../temperatures.py) (revision 457238a0363ebb5994f660d990cb19df1335dfba) @@ -99,7 +99,7 @@ """ return self.temperatures[DGTemperaturesNames(sensor).name] - @publish(["dg_temperatures_timestamp","temperatures"]) + @publish(["dg_temperatures_timestamp", "dialysate_inlet_moving_avg", "redundant_outlet_moving_avg", "temperatures"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): """ Handles published temperature sensors message Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -rb1aca30a8e2ee9650899faba059f0e484df50809 -r457238a0363ebb5994f660d990cb19df1335dfba --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision b1aca30a8e2ee9650899faba059f0e484df50809) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 457238a0363ebb5994f660d990cb19df1335dfba) @@ -130,7 +130,7 @@ "measured_dialysate_outlet_pump_mc_current", "dialysate_outlet_pump_corr_offset", "dialysate_outlet_pump_calc_rate", - "uf_calculated_rate" + "uf_calculated_rate", "pwm_duty_cycle_pct", "rotor_hall_state" ]) Index: dialin/hd/ui_proxy.py =================================================================== diff -u -rb1aca30a8e2ee9650899faba059f0e484df50809 -r457238a0363ebb5994f660d990cb19df1335dfba --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision b1aca30a8e2ee9650899faba059f0e484df50809) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 457238a0363ebb5994f660d990cb19df1335dfba) @@ -234,6 +234,7 @@ self.active_alarm_list_reject_reason = 0 self.alarm_list_response = () self.ro_mode_status = 0 + self.ro_mode_rejection_status = 0 self.reject_reasons = OrderedDict() for attr in RequestRejectReasons: @@ -1107,13 +1108,17 @@ self.disinfects_dg_mode = dg_submode self.hd_disinfection_standby_timestamp = timestamp - @publish(["ro_mode_timestamp", "ro_mode_status"]) + @publish(["ro_mode_timestamp", "ro_mode_status", "ro_mode_rejection_status"]) def _handler_ro_mode_status(self, message: dict, timestamp=0.0) -> None: romode = struct.unpack('i', bytearray( + romode = struct.unpack(' None: @@ -1812,16 +1817,9 @@ self.logger.debug("Setting RO only mode to: {}".format(status)) - received_message = self.can_interface.send(message) + self.can_interface.send(message, 0) + return True - # 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.debug("Timeout!!!!") - return False - def cmd_ui_send_alarm_list_request(self) -> None: """ Constructs and sends a ui message to request the HD active alarm list.