Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r57aed15d5b38f236deaea49daba706ce352162d2 -ra47869fc5e3c8947d1cff46a2b2038117d96919b --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 57aed15d5b38f236deaea49daba706ce352162d2) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision a47869fc5e3c8947d1cff46a2b2038117d96919b) @@ -353,7 +353,8 @@ Transition from current to requested op sub mode must be legal. NOTE: for POST the FP device shall be in Standby Mode - @param new_mode: ID of operation sub mode to transition to + @param new_mode: ID of operation mode to transition to + @param new_sub_mode: ID of operation sub mode to transition to @return: 1 if successful, zero otherwise """ @@ -362,25 +363,27 @@ payload = mode + sub_mode if self.fp_operation_mode == 0: - new_mode_enum = fp_enum_repository.FPFaultStates(new_mode) + new_sub_mode_enum = fp_enum_repository.FPFaultStates(new_mode) + elif self.fp_operation_mode == fp_enum_repository.FPOpModes.MODE_STAN.value: + new_sub_mode_enum = fp_enum_repository.FPStandbyStates(new_mode) elif self.fp_operation_mode == fp_enum_repository.FPOpModes.MODE_PRE_GENP.value: - new_mode_enum = fp_enum_repository.FPPreGenPermeateStates(new_mode) + new_sub_mode_enum = fp_enum_repository.FPPreGenPermeateStates(new_mode) elif self.fp_operation_mode == fp_enum_repository.FPOpModes.MODE_GENP.value: - new_mode_enum = fp_enum_repository.FPGenPermeateStates(new_mode) + new_sub_mode_enum = fp_enum_repository.FPGenPermeateStates(new_mode) elif self.fp_operation_mode == fp_enum_repository.FPOpModes.MODE_DPGP.value: - new_mode_enum = fp_enum_repository.FPPreGenPDefStates(new_mode) + new_sub_mode_enum = fp_enum_repository.FPPreGenPDefStates(new_mode) elif self.fp_operation_mode == fp_enum_repository.FPOpModes.MODE_DEGP.value: - new_mode_enum = fp_enum_repository.FPGenPermeateDefStates(new_mode) + new_sub_mode_enum = fp_enum_repository.FPGenPermeateDefStates(new_mode) else: - new_mode_enum = fp_enum_repository.FPOpModes.MODE_NLEG + new_sub_mode_enum = fp_enum_repository.FPOpModes.MODE_NLEG return cmd_generic_override( payload = payload, reset = NO_RESET, channel_id = DenaliChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_SET_OP_SUB_MODE_REQUEST, entity_name = 'FP Operation Sub Mode', - override_text = new_mode_enum.name, + override_text = new_sub_mode_enum.name, logger = self.logger, can_interface = self.can_interface)