Browse Source

弓箭串口通信

17600099689 1 year ago
parent
commit
2bf145c217

+ 5 - 6
Assets/BowArrow/Scripts/ArrowSerialPort.cs

@@ -212,19 +212,18 @@ public class ArrowSerialPort : MonoBehaviour
     private void OnDeviceButton(byte[] bytes)
     {
         Debug.Log($"{PortName} 收到设备按键消息!");
-        var check = bytes[1] + bytes[2] + bytes[3];//校验:命令+长度+数据内容
+        var check = bytes[1] + bytes[2] + bytes[3];
+        //校验:命令+长度+数据内容
         //if (check != bytes[4])
         //{
         //    LOG("OnDeviceButton 数据校验错误!");
         //}
         //else
-        if (bytes[3] == 0x01 || bytes[3] == 0x02 || bytes[3] == 0x03)
-        {
+
+        if (string.IsNullOrEmpty(UserSettings.ins.selectDevicesName))
             //开机
             RequestDeviceIno();
-            return;
-        }
-            SerialPortHelper.aim?.Invoke(bytes);
+        SerialPortHelper.aim?.Invoke(bytes);
     }
     
     #endregion

+ 8 - 0
Assets/BowArrow/Scripts/SerialPortHelper.cs

@@ -90,6 +90,14 @@ public class SerialPortHelper : MonoBehaviour
 
         switch (bytes[3])
         {
+            case 0x01:
+                if (UserSettings.ins.selectDevicesName == "ARTEMIS Pro")
+                    AimHandler.ins.OnDataReceived(new byte[] { 0x66, 0x31 });
+                break;
+            case 0x03:
+                if (UserSettings.ins.selectDevicesName == "ARTEMIS Pro")
+                    AimHandler.ins.OnDataReceived(new byte[] { 0x66, 0x32 });
+                break;
             case 0x04:
                 AimHandler.ins.OnDataReceived(new byte[] { 0x66, 0x31 });
                 break;

+ 2 - 2
Assets/BowArrow/Scripts/SerialPortTest.cs

@@ -42,7 +42,7 @@ public class SerialPortTest : MonoBehaviour
             case 4://Ͷ±ÒºÐ×Ó
                 foreach (var item in SerialPortExampleGroup)
                 {
-                    if (item.name.Contains("com0"))
+                    if (item.name.Contains("com4"))
                     {
                         item.PrintFrame(data.ToArray());
                         break;
@@ -52,7 +52,7 @@ public class SerialPortTest : MonoBehaviour
             case 6://Ͷ±Ò»ú
                 foreach (var item in SerialPortExampleGroup)
                 {
-                    if (item.name.Contains("com8"))
+                    if (item.name.Contains("com6"))
                     {
 
                         break;