chore: Updated to new 2.0 API (#763)

Author: kjy5

Assets/Scripts/EphysLink/CommunicationManager.cs

@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using BestHTTP.SecureProtocol.Org.BouncyCastle.Crypto.Signers;
 using BestHTTP.SocketIO3;
 using UnityEngine;
 
@@ -351,30 +352,33 @@ private async Awaitable<string> GetVersion()
         }
 
         /// <summary>
-        ///     Get the platform type.
+        ///     Get the platform info.
         /// </summary>
-        /// <param name="onSuccessCallback">Callback function to handle incoming platform type info.</param>
+        /// <param name="onSuccessCallback">Callback function to handle incoming platform info.</param>
         /// <param name="onErrorCallback">Callback function to handle errors.</param>
-        public void GetPlatformType(Action<string> onSuccessCallback, Action onErrorCallback = null)
+        public void GetPlatformInfo(Action<PlatformInfo> onSuccessCallback, Action onErrorCallback = null)
         {
             _connectionManager
                 .Socket.ExpectAcknowledgement<string>(data =>
                 {
                     if (DataKnownAndNotEmpty(data))
-                        onSuccessCallback?.Invoke(data);
+                    {
+                        var parsedData = ParseJson<PlatformInfo>(data);
+                        onSuccessCallback?.Invoke(parsedData);
+                    }
                     else
                         onErrorCallback?.Invoke();
                 })
-                .Emit("get_platform_type");
+                .Emit("get_platform_info");
         }
 
         /// <summary>
-        ///     Get the platform type.
+        ///     Get the platform info.
         /// </summary>
-        /// <returns>Platform type.</returns>
-        public async Awaitable<string> GetPlatformType()
+        /// <returns>Platform info.</returns>
+        public async Awaitable<PlatformInfo> GetPlatformInfo()
         {
-            return await EmitAndGetStringResponse<object>("get_platform_type", null);
+            return await EmitAndGetResponse<PlatformInfo, object>("get_platform_info", null);
         }
 
         /// <summary>
@@ -867,4 +871,4 @@ private static string ToJson<T>(T data)
 
         #endregion
     }
-}
+}

Assets/Scripts/EphysLink/EphysLinkModels.cs

@@ -1,5 +1,5 @@
-using UnityEngine;
 using System;
+using UnityEngine;
 
 [Serializable]
 public struct AngularResponse
@@ -39,7 +39,16 @@ public struct EphysLinkOptions
     public int MpmPort;
     public string Serial;
 
-    public EphysLinkOptions(bool background, bool ignoreUpdates, string type, bool debug, bool useProxy, string proxyAddress, int mpmPort, string serial)
+    public EphysLinkOptions(
+        bool background,
+        bool ignoreUpdates,
+        string type,
+        bool debug,
+        bool useProxy,
+        string proxyAddress,
+        int mpmPort,
+        string serial
+    )
     {
         Background = background;
         IgnoreUpdates = ignoreUpdates;
@@ -52,24 +61,35 @@ public EphysLinkOptions(bool background, bool ignoreUpdates, string type, bool d
     }
 }
 
-
 [Serializable]
 public struct GetManipulatorsResponse
 {
     public string[] Manipulators;
-    public int NumAxes;
-    public Vector4 Dimensions;
     public string Error;
 
-    public GetManipulatorsResponse(string[] manipulators, int numAxes, Vector4 dimensions, string error)
+    public GetManipulatorsResponse(string[] manipulators, string error)
     {
         Manipulators = manipulators;
-        NumAxes = numAxes;
-        Dimensions = dimensions;
         Error = error;
     }
 }
 
+[Serializable]
+public struct PlatformInfo
+{
+    public string Name;
+    public string CliName;
+    public int AxesCount;
+    public Vector4 Dimensions;
+
+    public PlatformInfo(string name, string cliName, int axesCount, Vector4 dimensions)
+    {
+        Name = name;
+        CliName = cliName;
+        AxesCount = axesCount;
+        Dimensions = dimensions;
+    }
+}
 
 [Serializable]
 public struct PositionalResponse
@@ -125,7 +145,6 @@ public SetInsideBrainRequest(string manipulatorId, bool inside)
     }
 }
 
-
 [Serializable]
 public struct SetPositionRequest
 {
@@ -152,5 +171,4 @@ public ShankCountResponse(int shankCount, string error)
         ShankCount = shankCount;
         Error = error;
     }
-}
-
+}

Assets/Scripts/Pinpoint/Probes/ManipulatorBehaviorController/ManipulatorBehaviorController.cs

@@ -141,19 +141,13 @@ private void OnDisable()
         /// <param name="calibrated">Whether this manipulator has been calibrated.</param>
         public async void Initialize(string manipulatorID, bool calibrated)
         {
-            // Get manipulator information
-            var manipulatorResponse = await CommunicationManager.Instance.GetManipulators();
-            if (CommunicationManager.HasError(manipulatorResponse.Error))
-                return;
-
-            // Shortcut exit if we have an invalid manipulator ID
-            if (!manipulatorResponse.Manipulators.Contains(manipulatorID))
-                return;
+            // Get platform information
+            var platformInfoResponse = await CommunicationManager.Instance.GetPlatformInfo();
 
             // Set manipulator ID, number of axes, and dimensions
             ManipulatorID = manipulatorID;
-            NumAxes = manipulatorResponse.NumAxes;
-            Dimensions = manipulatorResponse.Dimensions;
+            NumAxes = platformInfoResponse.AxesCount;
+            Dimensions = platformInfoResponse.Dimensions;
 
             // Update transform and space
             UpdateSpaceAndTransform();