Browse Source

Datalog添加高温Heater温度显示

lixiang 1 year ago
parent
commit
34bdc228de

+ 1 - 1
Venus/Framework/Common/CommonData/DeviceData/AITHighTemperatureHeaterData.cs

@@ -9,7 +9,7 @@ namespace MECF.Framework.Common.CommonData.DeviceData
 {
     [DataContract]
     [Serializable]
-    public class AITHighTemperatureHeaterData
+    public class AITHighTemperatureHeaterData : NotifiableItem
     {
         [DataMember]
         public string Module { get; set; }

+ 7 - 7
Venus/Venus_RT/Devices/AdTecRF.cs

@@ -372,15 +372,15 @@ namespace Venus_RT.Devices
 
 
 
-                _checkerReflectPower.Monitor(ReflectPower, double.MinValue, _scReflectPowerAlarmRange, _scReflectPowerAlarmTime);
+                //_checkerReflectPower.Monitor(ReflectPower, double.MinValue, _scReflectPowerAlarmRange, _scReflectPowerAlarmTime);
 
-                if (_checkerReflectPower.Trig)
-                {
-                    LOG.Write(eEvent.ERR_RF, Module,
-                        $"{Display} Reflect power {ReflectPower:0} out of range[0,{_scReflectPowerAlarmRange:0}] in {_scReflectPowerAlarmTime:0} seconds");
+                //if (_checkerReflectPower.Trig)
+                //{
+                //    LOG.Write(eEvent.ERR_RF, Module,
+                //        $"{Display} Reflect power {ReflectPower:0} out of range[0,{_scReflectPowerAlarmRange:0}] in {_scReflectPowerAlarmTime:0} seconds");
 
-                    SetPowerOnOff(false, out _);
-                }
+                //    SetPowerOnOff(false, out _);
+                //}
             }
 
             if (PMIntervalDays > 0)

+ 4 - 1
Venus/Venus_RT/Devices/IODevices/IoHighTemperatureHeater.cs

@@ -258,7 +258,10 @@ namespace Venus_RT.Devices.IODevices
                 HighTemperatureHighHeaterTemperature = Convert.ToSingle(args[0]);
                 return true;
             });
-            DATA.Subscribe($"{Module}.{Name}.DeviceData", () => DeviceData, SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{Module}.{Name}.DeviceData", () => DeviceData,SubscriptionAttribute.FLAG.IgnoreSaveDB);
+
+            DATA.Subscribe($"{Module}.{Name}.Temperature", () => DeviceData.HighTemperatureHeaterTemperature);
+
 
             _SetRealFloat(_aoLiftServoPosition1, 20);
             _SetRealFloat(_aoLiftServoPosition2, -30);