Index: leahi_dialin/dd/modules/post_gen_dialysate.py =================================================================== diff -u -r2dab2b0329a56006e07cd36a3883ed099d7a367a -r84343d0460bb04169cf6fedb023b5eaf332bfc65 --- leahi_dialin/dd/modules/post_gen_dialysate.py (.../post_gen_dialysate.py) (revision 2dab2b0329a56006e07cd36a3883ed099d7a367a) +++ leahi_dialin/dd/modules/post_gen_dialysate.py (.../post_gen_dialysate.py) (revision 84343d0460bb04169cf6fedb023b5eaf332bfc65) @@ -26,15 +26,15 @@ class DDPostGenDialysate(AbstractSubSystem): """ - Gen Dialysate + Post Gen Dialysate - Dialysate Delivery (DD) Dialin API sub-class for gen dialysate related commands. + Dialysate Delivery (DD) Dialin API sub-class for post gen dialysate related commands. """ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Leahi Can Messenger object """ super().__init__() @@ -52,9 +52,9 @@ def _handler_post_gen_dialysate_sync(self, message, timestamp=0.0): """ - Handles published gen dialysate data messages. + Handles published post gen dialysate data messages. - @param message: published gen dialysate data message + @param message: published post gen dialysate data message @return: None """ @@ -65,7 +65,7 @@ def cmd_post_gen_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ - Constructs and sends broadcast time interval. + Constructs and sends the broadcast time interval override for post gen dialysate data. Constraints: Must be logged into DD. Given interval must be non-zero and a multiple of the DD general task interval (50 ms). Index: leahi_dialin/dd/modules/pre_gen_dialysate.py =================================================================== diff -u -r2dab2b0329a56006e07cd36a3883ed099d7a367a -r84343d0460bb04169cf6fedb023b5eaf332bfc65 --- leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 2dab2b0329a56006e07cd36a3883ed099d7a367a) +++ leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 84343d0460bb04169cf6fedb023b5eaf332bfc65) @@ -26,15 +26,15 @@ class DDPreGenDialysate(AbstractSubSystem): """ - Gen Dialysate + Pre Gen Dialysate - Dialysate Delivery (DD) Dialin API sub-class for gen dialysate related commands. + Dialysate Delivery (DD) Dialin API sub-class for pre gen dialysate related commands. """ def __init__(self, can_interface, logger: Logger): """ - @param can_interface: Denali Can Messenger object + @param can_interface: Leahi Can Messenger object """ super().__init__() @@ -57,9 +57,9 @@ def _handler_pre_gen_state_sync(self, message, timestamp=0.0): """ - Handles published gen dialysate data messages. + Handles published pre gen dialysate data messages. - @param message: published gen dialysate data message + @param message: published pre gen dialysate data message @return: None """ @@ -70,7 +70,7 @@ def cmd_pre_gen_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ - Constructs and sends broadcast time interval. + Constructs and sends the broadcast time interval override for pre gen dialysate data. Constraints: Must be logged into DD. Given interval must be non-zero and a multiple of the DD general task interval (50 ms). Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -rc966c7c19e22d99c67c32de16ba0de8d81954f39 -r84343d0460bb04169cf6fedb023b5eaf332bfc65 --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision c966c7c19e22d99c67c32de16ba0de8d81954f39) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 84343d0460bb04169cf6fedb023b5eaf332bfc65) @@ -67,60 +67,21 @@ self.td_air_pump_timestamp = timestamp - def cmd_ejector_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: - """ - Constructs and sends the ejector data broadcast interval override command - Constraints: - Must be logged into TD. - Given interval must be non-zero and a multiple of the TD general task interval (50 ms). - - @param ms: integer - interval (in ms) to override with - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise - """ - - if not check_broadcast_interval_override_ms(ms): - return False - - rst = integer_to_bytearray(reset) - mis = integer_to_bytearray(ms) - payload = rst + mis - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override TD ejector data broadcast interval") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - if reset == RESET: - str_res = "reset back to normal: " - else: - str_res = str(ms) + " ms: " - self.logger.debug("Ejector 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: - self.logger.debug("Timeout!!!!") - return False - def cmd_ejector_request_command(self, cmd: int) -> int: """ Constructs and sends the ejector request command. - EJECTOR_OPERATION_HOME = 0, ///< Ejector home operation - EJECTOR_OPERATION_RETRACT, ///< Ejector retract operation - EJECTOR_OPERATION_EXTEND, ///< Ejector extend operation - NUM_OF_EJECTOR_OPERATIONS, ///< Number of ejector operations + EJECTOR_STATE_INIT = 0, ///< Ejector Initial (un-homed) state + EJECTOR_STATE_HOMING, ///< Ejector Homing state + EJECTOR_STATE_RETRACTED, ///< Ejector Retracted state + EJECTOR_STATE_EXTENDED, ///< Ejector Extended state + EJECTOR_STATE_RETRACTING, ///< Ejector Retracting state + EJECTOR_STATE_EXTENDING, ///< Ejector Extending state + EJECTOR_STATE_DIR_CHANGE_STOP, ///< Ejector Direction Change Stop state + EJECTOR_STATE_RETRACT_BACKOFF, ///< Ejector Backing Off Retracted state Constraints: Must be logged into TD. - @param cmd: integer - state value to set the ejector - + @param cmd: integer - ID of an ejector operation that is being requested @return: 1 if successful, zero otherwise """ @@ -146,11 +107,11 @@ def cmd_ejector_set_motor_speed_request(self, speed: int) -> int: """ - Constructs and sends the ejector set speed command. + Constructs and sends the ejector set speed command. Negative values imply reverse ( retract ) direction. Constraints: Must be logged into TD. - @param speed: float - value to set the motor speed + @param speed: float - value to set the motor speed in RPM. @return: 1 if successful, zero otherwise """