模拟器读取chamber bug修改

Venus/Venus_RT/Devices/AdTecRF.cs

@@ -17,6 +17,7 @@ using MECF.Framework.Common.DataCenter;
 using MECF.Framework.Common.Device.Bases;
 using MECF.Framework.Common.Equipment;
 using Venus_Core;
+using System.Collections.Generic;
 
 namespace Venus_RT.Devices
 {
@@ -213,8 +214,20 @@ namespace Venus_RT.Devices
             _scCalibrationTable       = SC.GetConfigItem($"{Module}.{Name}.CalibrationTable");
 
             _diIntlk = IO.DI[$"{Module}.DI_RF_Generator_Interlock"];
-        }
 
+            SerachCommandList = new List<string>()
+            {
+            AdTecRfMessage.QUERY
+            };
+            sendDataChangedEvent += SkyPump_sendDataChangedEvent;
+            baseStopwatch.Start();
+            baseTimer.Enabled = true;
+        }
+        private void SkyPump_sendDataChangedEvent(string obj)
+        {
+            var newstr = obj + "\r";
+            _serial?.Write(newstr);
+        }
         ~AdTecGenerator()
         {
             _serial?.Close();
@@ -272,11 +285,11 @@ namespace Venus_RT.Devices
         public override void Monitor()
         {
             // 状态查询
-            if (_timerQueryStatus.IsTimeout())
-            {
-                this.SendCmd(AdTecRfMessage.QUERY);
-                _timerQueryStatus.Start(QUERY_INTERVAL);
-            }
+            //if (_timerQueryStatus.IsTimeout())
+            //{
+            //    this.SendCmd(AdTecRfMessage.QUERY);
+            //    _timerQueryStatus.Start(QUERY_INTERVAL);
+            //}
 
             // power on triggered
             _rfOnTrigger.CLK = IsPowerOn;
@@ -633,7 +646,9 @@ namespace Venus_RT.Devices
             {
                 LOG.Write(eEvent.EV_DEVICE_INFO, Module, $"Generator send [{str}]");
             }
-            return _serial.Write(str + "\r");
+            SetPointCommandQueue.Add(str);
+            return true;
+            //return _serial.Write(str + "\r");
         }
     }
 

Venus/Venus_Simulator/App.xaml.cs

@@ -14,6 +14,8 @@ namespace Venus_Simulator
         {
             base.OnStartup(e);
             SystemConfig.Instance.Initialize();
+            SimulatorJetChamber.CurrentPMAChamber = (JetChamber)SystemConfig.Instance.GetValue<int>($"PMA.ChamberType");
+            SimulatorJetChamber.CurrentPMBChamber = (JetChamber)SystemConfig.Instance.GetValue<int>($"PMB.ChamberType");
 
 
             UiApplication.Instance.Initialize(new UiInstance());

Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -41,8 +41,7 @@ namespace Venus_Simulator.Instances
             //_MockDevices.Add(ModuleName.PMB, new AdTecMatchMock());
 
             // TODO
-            SimulatorJetChamber.CurrentPMAChamber = (JetChamber)SystemConfig.Instance.GetValue<int>($"PMA.ChamberType");
-            SimulatorJetChamber.CurrentPMBChamber = (JetChamber)SystemConfig.Instance.GetValue<int>($"PMB.ChamberType");
+            
         }
 
         ~SimulatorSystem()

Venus/Venus_Simulator/JetChamber.cs

@@ -5,8 +5,8 @@ namespace Venus_Simulator
 {
     public class SimulatorJetChamber
     {
-        public static JetChamber CurrentPMAChamber = JetChamber.Venus;
-        public static JetChamber CurrentPMBChamber = JetChamber.Kepler2300;
+        public static JetChamber CurrentPMAChamber = JetChamber.None;
+        public static JetChamber CurrentPMBChamber = JetChamber.None;
         public static JetChamber CurrentPMCChamber = JetChamber.None;
         public static JetChamber CurrentPMDChamber = JetChamber.None;
     }