Explorar o código

Add Tru match release stop mode command

hecl hai 11 meses
pai
achega
b7ebfa6adf

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 15 - 14
Venus/Venus_MainPages/Views/OverVenusDEView.xaml


+ 1 - 0
Venus/Venus_RT/Devices/JetVenusDEPM.cs

@@ -1066,6 +1066,7 @@ namespace Venus_RT.Devices
             _TurboPump?.ReConnect();
             _pendulumValve?.ReConnect();
             _GeneratorBias.Reset();
+            _BiasMatch.Reset();
             _GeneratorBias.ReConnect();
         }
 

+ 17 - 14
Venus/Venus_RT/Devices/TruPlasmaRF.cs

@@ -42,6 +42,8 @@ namespace Venus_RT.Devices
                 _serial.OnBinaryDataChanged += SerialPortDataReceived;
                 _serial.OnErrorHappened += SerialPortErrorOccurred;
                 ResetCommand();
+                getcontrol();
+                SetPulseMode(false);
             }
             else
             {
@@ -268,7 +270,6 @@ namespace Venus_RT.Devices
             baseBytes = CRC16(baseBytes.ToArray());
             baseBytes.Add(0x55);
             _serial.Write(baseBytes.ToArray());
-
         }
         public override void SetPulseRateFreq(int nFreq)
         {
@@ -412,7 +413,7 @@ namespace Venus_RT.Devices
         public override bool Initialize()
         {
             base.Initialize();
-
+            SetPositionManual(50,50);
             if (_serial.Open())
             {
                 _serial.OnBinaryDataChanged += SerialBinaryPortDataReceived;
@@ -466,7 +467,7 @@ namespace Venus_RT.Devices
 
         public override void Monitor()
         {
-            ReadPosition(40, 20);//0x10 (present mode)CMD 可实现任意模式下只读不设值,0x08(auto then manual)在auto模式下可实现相同功能
+            ReadPosition(50,50);//0x10 (present mode)CMD 可实现任意模式下只读不设值,0x08(auto then manual)在auto模式下可实现相同功能
         }
 
         public override void Terminate()
@@ -475,6 +476,7 @@ namespace Venus_RT.Devices
 
         public override void Reset()
         {
+            SetPositionManual(50, 50);
         }
 
         /// <summary>
@@ -502,10 +504,13 @@ namespace Venus_RT.Devices
         //
         private void SerialBinaryPortDataReceived(byte[] message)
         {
+            
             if (message.Count() < 29)
             {
-                LOG.Write(eEvent.ERR_RF, Module, "收到 Match 数据为空");
-                return;
+                string hexString = BitConverter.ToString(message.ToArray()).Replace("-", " ");
+                LOG.Write(eEvent.ERR_MATCH, Module, hexString);
+                LOG.Write(eEvent.ERR_RF, Module, "收到 Match 数据格式不正确");
+                
             }
             else
             {
@@ -558,7 +563,7 @@ namespace Venus_RT.Devices
             LOG.Write(eEvent.ERR_RF, Module, $"AdTec Match error [{str}]");
         }
 
-        private void SetPositionManual(float c1val, float c2val)
+        private void SetPositionManualAuto(float c1val, float c2val)
         {
             List<byte> Len = new List<byte>() { 0x16, 0xE9 };
             List<byte> DstSrc = new List<byte>() { 0x00, 0x02, 0x00, 0x01 };
@@ -566,7 +571,7 @@ namespace Venus_RT.Devices
             byte[] val1Bytes = BitConverter.GetBytes(c1val / 100);
             byte[] val2Bytes = BitConverter.GetBytes(c2val / 100);
             List<byte> Act = new List<byte>() { 0x00 };
-            List<byte> Ctr123 = new List<byte> { 0x01, 0x00, 0x00 };
+            List<byte> Ctr123 = new List<byte> { 0x08, 0x00, 0x00 };
             List<byte> baseBytes = new List<byte>() { };
             baseBytes.AddRange(Len);
             baseBytes.AddRange(DstSrc);
@@ -587,9 +592,8 @@ namespace Venus_RT.Devices
             ackture[1] = ackbyte[0];
             baseBytes.AddRange(ackture);
             _serial.Write(baseBytes.ToArray());
-            string hexString = BitConverter.ToString(baseBytes.ToArray()).Replace("-", " ");
         }
-        private void SetPositionManualAuto(float c1val, float c2val)
+        private void SetPositionManual(float c1val, float c2val)
         {
             List<byte> Len = new List<byte>() { 0x16, 0xE9 };
             List<byte> DstSrc = new List<byte>() { 0x00, 0x02, 0x00, 0x01 };
@@ -597,7 +601,7 @@ namespace Venus_RT.Devices
             byte[] val1Bytes = BitConverter.GetBytes(c1val / 100);
             byte[] val2Bytes = BitConverter.GetBytes(c2val / 100);
             List<byte> Act = new List<byte>() { 0x00 };
-            List<byte> Ctr123 = new List<byte> { 0x08, 0x00, 0x00 };
+            List<byte> Ctr123 = new List<byte> { 0x01, 0x00, 0x00 };
             List<byte> baseBytes = new List<byte>() { };
             baseBytes.AddRange(Len);
             baseBytes.AddRange(DstSrc);
@@ -618,7 +622,6 @@ namespace Venus_RT.Devices
             ackture[1] = ackbyte[0];
             baseBytes.AddRange(ackture);
             _serial.Write(baseBytes.ToArray());
-            string hexString = BitConverter.ToString(baseBytes.ToArray()).Replace("-", " ");
         }
         private void ReadPosition(float c1val, float c2val)
         {
@@ -628,7 +631,7 @@ namespace Venus_RT.Devices
             byte[] val1Bytes = BitConverter.GetBytes(c1val / 100);
             byte[] val2Bytes = BitConverter.GetBytes(c2val / 100);
             List<byte> Act = new List<byte>() { 0x00 };
-            List<byte> Ctr123 = new List<byte> { 0x10, 0x00, 0x00 };
+            List<byte> Ctr123 = new List<byte> { 0x08, 0x00, 0x00 };
             List<byte> baseBytes = new List<byte>() { };
             baseBytes.AddRange(Len);
             baseBytes.AddRange(DstSrc);
@@ -648,8 +651,7 @@ namespace Venus_RT.Devices
             ackture[0] = ackbyte[1];
             ackture[1] = ackbyte[0];
             baseBytes.AddRange(ackture);
-            _serial.Write(baseBytes.ToArray());
-            string hexString = BitConverter.ToString(baseBytes.ToArray()).Replace("-", " ");
+            _serial.Write(baseBytes.ToArray());            
         }
         public override bool SetMatchMode(EnumRfMatchTuneMode enumRfMatchTuneMode, out string reason)
         {
@@ -661,6 +663,7 @@ namespace Venus_RT.Devices
         {
         }
 
+
         private void SetPresetMemory(byte gear)
         {
         }