Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r88cf855ac0d2a8612f610d35a96ac0cd5accf74c -r02d624e411573936da1445c7b1104096395c0996 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 88cf855ac0d2a8612f610d35a96ac0cd5accf74c) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 02d624e411573936da1445c7b1104096395c0996) @@ -341,6 +341,11 @@ MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054 MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055 MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056 + MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA057 + MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA058 + MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059 + MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA05A + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05B # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 @@ -397,12 +402,26 @@ MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB030 MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB031 MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xB032 - # MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB032 - MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB033 - MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB034 - MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB035 - MSG_ID_FP_DEF_STATUS_REQUEST = 0xB049 - MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB04A + MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB033 + MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB034 + MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB035 + MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB036 + MSG_ID_FP_RO_GET_CALCULATED_DUTY_CYCLE_REQUEST = 0xB037 + MSG_ID_FP_RO_CALCULATED_DUTY_CYCLE_RESPONSE = 0xB038 + MSG_ID_FP_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB039 + MSG_ID_FP_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST = 0xB03A + MSG_ID_FP_FLUSH_PERMEATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB03B + MSG_ID_FP_FLUSH_PERMEATE_TIMER_OVERRIDE_REQUEST = 0xB03C + MSG_ID_FP_FLUSH_PERMEATE_ALARM_TIMER_OVERRIDE_REQUEST = 0xB03D + MSG_ID_FP_FLUSH_CONCENTRATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB03E + MSG_ID_FP_FLUSH_CONCENTRATE_TIMER_OVERRIDE_REQUEST = 0xB03F + MSG_ID_FP_DEF_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB040 + MSG_ID_FP_DEF_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST = 0xB041 + MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB042 + MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB043 + MSG_ID_FP_DEF_STATUS_REQUEST = 0xB044 + MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045 + MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB046 MSG_ID_TD_DEBUG_EVENT = 0xFFF1 MSG_ID_DD_DEBUG_EVENT = 0xFFF2 Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -rb9e9c4477d1083db8d96beafd98ae6cd96ea432f -r02d624e411573936da1445c7b1104096395c0996 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision b9e9c4477d1083db8d96beafd98ae6cd96ea432f) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 02d624e411573936da1445c7b1104096395c0996) @@ -98,13 +98,13 @@ self.cmd_log_in_to_fp() # create properties + self.fp_defeatured = False self.fp_defeatured_timestamp = 0.0 self.fp_op_mode_timestamp = 0.0 self.fp_debug_events_timestamp = 0.0 self.fp_version_response_timestamp = 0.0 self.fp_operation_mode = fp_enum_repository.FPOpModes.MODE_INIT.value self.fp_operation_sub_mode = 0 - self.fp_defeatured = None self.fp_logged_in = False self.fp_set_logged_in_status(False) self.fp_version = None @@ -127,7 +127,7 @@ self.temperatures = FPTemperatureSensors(self.can_interface, self.logger) self.test_configs = FPTestConfig(self.can_interface, self.logger) self.valves = FPValves(self.can_interface, self.logger) - self.dd_proxy = DDProxy(self.can_interface, self.logger) + self.dd_proxy = DDProxy(self.can_interface, self.logger, fp = self) @publish(["msg_id_fp_debug_event", "fp_debug_events_timestamp","fp_debug_events"]) @@ -226,7 +226,7 @@ self.fp_op_mode_timestamp = timestamp - @publish(["msg_id_fp_def_status_response", "is_fp_defeatured"]) + @publish(["msg_id_fp_def_status_response", "fp_defeatured"]) def _handler_fp_defeatured_response(self, message, timestamp = 0.0): """ Handler for response from FP regarding its defeatured status.