fix(TempSensor): 解决测温系统设置的兼容性问题。
PM模组配置测温传感器来源时,使用新的系统参数,避免软件升级或降级后,PM测温传感器配置信息丢失的问题。 IoTC对象中移除类似PMx.AKunTemp.t1这类数据注册,避免Charting中项目冗余的问题。
This commit is contained in:
parent
fd6d2ef245
commit
3f9595efc1
|
@ -454,13 +454,13 @@ namespace Aitex.Core.RT.Device.Devices
|
|||
|
||||
|
||||
|
||||
ScOuterTempValue = SC.GetStringValue($"PM.{Module}.TempSensor.OuterTemp");
|
||||
ScInnerTempValue = SC.GetStringValue($"PM.{Module}.TempSensor.InnerTemp");
|
||||
ScMiddleTempValue = SC.GetStringValue($"PM.{Module}.TempSensor.MiddleTemp");
|
||||
ScOuterTempValue = SC.GetStringValue($"PM.{Module}.TempSensor.Outer");
|
||||
ScInnerTempValue = SC.GetStringValue($"PM.{Module}.TempSensor.Inner");
|
||||
ScMiddleTempValue = SC.GetStringValue($"PM.{Module}.TempSensor.Middle");
|
||||
|
||||
SC.RegisterValueChangedCallback($"PM.{Module}.TempSensor.OuterTemp", (obj) => { ScOuterTempValue = obj.ToString(); });
|
||||
SC.RegisterValueChangedCallback($"PM.{Module}.TempSensor.InnerTemp", (obj) => { ScInnerTempValue = obj.ToString(); });
|
||||
SC.RegisterValueChangedCallback($"PM.{Module}.TempSensor.MiddleTemp", (obj) => { ScMiddleTempValue = obj.ToString(); });
|
||||
SC.RegisterValueChangedCallback($"PM.{Module}.TempSensor.Outer", (obj) => { ScOuterTempValue = obj.ToString(); });
|
||||
SC.RegisterValueChangedCallback($"PM.{Module}.TempSensor.Inner", (obj) => { ScInnerTempValue = obj.ToString(); });
|
||||
SC.RegisterValueChangedCallback($"PM.{Module}.TempSensor.Middle", (obj) => { ScMiddleTempValue = obj.ToString(); });
|
||||
|
||||
var v1 = ScOuterTempValue.Split('.')[1];
|
||||
var v2 = ScInnerTempValue.Split('.')[1];
|
||||
|
@ -472,17 +472,17 @@ namespace Aitex.Core.RT.Device.Devices
|
|||
if (!ScOuterTempValue.Contains("Disabled"))
|
||||
{
|
||||
//按照原有注册方式,PM名+测温硬件名+ Outer/Inner/Middle
|
||||
DATA.Subscribe($"{Module}.{ScOuterTempValue.Split('.')[1]}.Outer", () => OuterTemp);//SC存储的配置转化为Temp.AKunTemp.t3,拆分后取数组1编号,即可拆分出硬件的名字
|
||||
//DATA.Subscribe($"{Module}.{ScOuterTempValue.Split('.')[1]}.Outer", () => OuterTemp);//SC存储的配置转化为Temp.AKunTemp.t3,拆分后取数组1编号,即可拆分出硬件的名字
|
||||
DATA.Subscribe($"{Module}.Temp.Outer", () => OuterTemp);//上层调用按照固定Outer Inner Middle
|
||||
}
|
||||
if (!ScInnerTempValue.Contains("Disabled"))
|
||||
{
|
||||
DATA.Subscribe($"{Module}.{ScInnerTempValue.Split('.')[1]}.Inner", () => InnerTemp);
|
||||
//DATA.Subscribe($"{Module}.{ScInnerTempValue.Split('.')[1]}.Inner", () => InnerTemp);
|
||||
DATA.Subscribe($"{Module}.Temp.Inner", () => InnerTemp);
|
||||
}
|
||||
if (!ScMiddleTempValue.Contains("Disabled"))
|
||||
{
|
||||
DATA.Subscribe($"{Module}.{ScMiddleTempValue.Split('.')[1]}.Middle", () => MiddleTemp);
|
||||
//DATA.Subscribe($"{Module}.{ScMiddleTempValue.Split('.')[1]}.Middle", () => MiddleTemp);
|
||||
DATA.Subscribe($"{Module}.Temp.Middle", () => MiddleTemp);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -146,9 +146,9 @@ public abstract class TempSensorBase : BaseDevice, IDevice, IConnection, ITempSe
|
|||
Temp[i] = MinimalTemp;
|
||||
|
||||
var ch = i;
|
||||
DATA.Subscribe($"TempSensor.{Name}.T{ch + 1}", () => Temp[ch]);
|
||||
DATA.Subscribe($"TempSensor.{Name}.T{ch + 1}MAF", () => _tempFilters[ch].FilteredMAF);
|
||||
DATA.Subscribe($"TempSensor.{Name}.T{ch + 1}Raw", () => _tempFilters[ch].Raw);
|
||||
DATA.Subscribe($"TempSensor.{Name}.CH{ch + 1}", () => Temp[ch]);
|
||||
DATA.Subscribe($"TempSensor.{Name}.CH{ch + 1}MAF", () => _tempFilters[ch].FilteredMAF);
|
||||
DATA.Subscribe($"TempSensor.{Name}.CH{ch + 1}Raw", () => _tempFilters[ch].Raw);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue