Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r000435fa368dd45c129d30c5f1083c21cfe0e31c -r9ccbc0c7610d431e94566f93014f3a9663c4488c --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 000435fa368dd45c129d30c5f1083c21cfe0e31c) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 9ccbc0c7610d431e94566f93014f3a9663c4488c) @@ -399,7 +399,7 @@ intercept_byte_array = float_to_bytearray(intercept) payload = reset_byte_array + intercept_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_idd, message_id=MsgIds.MSG_ID_TD_BLOOD_FLOW_ALPHA_Y_INTERCEPT_OVERRIDE_REQUEST.value, payload=payload) @@ -430,7 +430,7 @@ term_byte_array = float_to_bytearray(a_term) payload = reset_byte_array + term_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_idd, message_id=MsgIds.MSG_ID_TD_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST.value, payload=payload) @@ -461,7 +461,7 @@ term_byte_array = float_to_bytearray(b_term) payload = reset_byte_array + term_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_idd, message_id=MsgIds.MSG_ID_TD_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST.value, payload=payload) Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -re5c5e1a8c10903e8caa793694b8f309125b2f6d8 -r9ccbc0c7610d431e94566f93014f3a9663c4488c --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision e5c5e1a8c10903e8caa793694b8f309125b2f6d8) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 9ccbc0c7610d431e94566f93014f3a9663c4488c) @@ -112,14 +112,9 @@ def cmd_ejector_request_command(self, cmd: int) -> int: """ Constructs and sends the ejector request command. - 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 + EJECTOR_OPERATION_HOME = 0, ///< Ejector home operation + EJECTOR_OPERATION_RETRACT, ///< Ejector retract operation + EJECTOR_OPERATION_EXTEND, ///< Ejector extend operation Constraints: Must be logged into TD. Index: tests/fp_dianogistic_logger.py =================================================================== diff -u -r6e95e1705ce73dd7f159564b2ac3fde75f29b215 -r9ccbc0c7610d431e94566f93014f3a9663c4488c --- tests/fp_dianogistic_logger.py (.../fp_dianogistic_logger.py) (revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215) +++ tests/fp_dianogistic_logger.py (.../fp_dianogistic_logger.py) (revision 9ccbc0c7610d431e94566f93014f3a9663c4488c) @@ -63,8 +63,8 @@ fp_log_setup() print ("Starting threads...") - float_control_thread = threading.Thread(target=fp_float_controller, args=(fp, CONTROL_INTERVAL),daemon=True) - float_control_thread.start() + #float_control_thread = threading.Thread(target=fp_float_controller, args=(fp, CONTROL_INTERVAL),daemon=True) + #float_control_thread.start() pressure_log_writer_thread = threading.Thread(target=fp_pressure_recorder, args=(fp, RECORDING_INTERVAL), daemon=True) temp_log_writer_thread = threading.Thread(target=fp_temperature_recorder, args=(fp, RECORDING_INTERVAL), daemon=True)