修正PSU1强制禁用的逻辑。

This commit is contained in:
DESKTOP-GPE37UV\THINKAPD 2023-02-24 09:08:04 +08:00
parent 64a1b5a5d0
commit 8dfa7f2ee9
1 changed files with 12 additions and 11 deletions

View File

@ -195,23 +195,13 @@ namespace SicPM.Devices
OP.Subscribe($"{Module}.{Name}.SetPSUEnable", (function, args) =>
{
var forceDisable = SC.GetValue<bool>($"PM.{Module}.Heater.ForceDisableInnerHeater");
var isTrue = Convert.ToBoolean(args[0]);
// 如果系统设置中将InnerHeater设置为强制关闭则不要打开InnerHeater输出
if (forceDisable)
{
isTrue = false;
EV.PostWarningLog(Module, "Inner heater is forcibly disabled");
}
SetPSUEnable(isTrue, out reason);
return true;
});
OP.Subscribe($"{Module}.{Name}.SetPSUReset", (function, args) =>
{
bool isTrue = Convert.ToBoolean(args[0]);
var isTrue = Convert.ToBoolean(args[0]);
SetPSUReset(isTrue, out reason);
return true;
});
@ -223,6 +213,17 @@ namespace SicPM.Devices
{
reason = "";
// 如果系统设置中将InnerHeater设置为强制关闭则不要打开InnerHeater输出
if (Name == "PSU1")
{
var forceDisable = SC.GetValue<bool>($"PM.{Module}.Heater.ForceDisableInnerHeater");
if (forceDisable)
{
setValue = false;
EV.PostWarningLog(Module, "Inner heater is forcibly disabled");
}
}
if (!_doStatus.Check(setValue, out reason))
{
EV.PostWarningLog(Module, reason);