Merge pull request #13 from aurycat/identify

Add 'Identify' button to Lighthouse dropdown menu

Author: kurotu

OVRLighthouseManager/Contracts/Services/ILighthouseGattService.cs

@@ -13,4 +13,6 @@ internal interface ILighthouseGattService
     public Task SleepAsync(Lighthouse lighthouse);
 
     public Task StandbyAsync(Lighthouse lighthouse);
+
+    public Task IdentifyAsync(Lighthouse lighthouse);
 }

OVRLighthouseManager/Helpers/LighthouseCommands.cs

@@ -258,3 +258,48 @@ public class PowerAllCommandParameter
     public string Command { get; set; } = string.Empty;
     public IEnumerable<LighthouseObject> Lighthouses { get; set; } = Enumerable.Empty<LighthouseObject>();
 }
+
+public class IdentifyCommand : AsyncCommandBase
+{
+    public override event EventHandler? CanExecuteChanged;
+    private Task? _task;
+    private readonly ILogger _log = LogHelper.ForContext<IdentifyCommand>();
+
+    public override bool CanExecute(object? parameter)
+    {
+        var isV1 = parameter is LighthouseObject lighthouse && new Lighthouse { Name = lighthouse.Name }.Version == LighthouseVersion.V1;
+        if (isV1)
+        {
+            return false;
+        }
+        return _task == null || _task.IsCompleted;
+    }
+
+    public async override Task ExecuteAsync(object? parameter)
+    {
+        if (parameter is LighthouseObject lighthouse)
+        {
+            var notification = App.GetService<INotificationService>();
+            try
+            {
+                _log.Information($"{lighthouse.Name} Identify");
+                var l = new Lighthouse { Name = lighthouse.Name, BluetoothAddress = lighthouse.BluetoothAddress, Id = lighthouse.Id };
+                _task = App.GetService<ILighthouseGattService>().IdentifyAsync(l);
+                CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+                await _task;
+                _task = null;
+                CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+                notification.Success(string.Format("Notification_Identify".GetLocalized(), lighthouse.Name));
+            }
+            catch (Exception ex)
+            {
+                _log.Error(ex, $"{lighthouse.Name} Failed to identify");
+                notification.Error(string.Format("Notification_CommunicationError".GetLocalized(), lighthouse.Name) + "\n" + ex.Message);
+            }
+        }
+        else
+        {
+            throw new ArgumentException("Invalid parameter");
+        }
+    }
+}

OVRLighthouseManager/Services/LighthouseGattService.cs

@@ -16,6 +16,7 @@ class LighthouseGattService : ILighthouseGattService
 
     private static readonly Guid V2ControlService = new("00001523-1212-efde-1523-785feabcd124");
     private static readonly Guid V2PowerCharacteristic = new("00001525-1212-efde-1523-785feabcd124");
+    private static readonly Guid V2IdentifyCharacteristic = new("00008421-1212-efde-1523-785feabcd124");
 
     private static readonly ILogger _log = LogHelper.ForContext<LighthouseGattService>();
 
@@ -59,6 +60,15 @@ public async Task StandbyAsync(Lighthouse lighthouse)
         await WriteV2PowerCharacteristic(lighthouse, 0x02);
     }
 
+    public async Task IdentifyAsync(Lighthouse lighthouse)
+    {
+        if (lighthouse.Version == LighthouseVersion.V1)
+        {
+            throw new LighthouseGattException("Identify is not supported for V1 lighthouses");
+        }
+        await WritePowerCharacteristicAsync(lighthouse, V2ControlService, V2IdentifyCharacteristic, new byte[] { 0x01 });
+    }
+
     private async Task ControlV1Async(Lighthouse lighthouse, bool powerOn)
     {
         byte[] bytes;

OVRLighthouseManager/Strings/en-us/Resources.resw

@@ -162,6 +162,9 @@
   <data name="Menu_Standby.Text" xml:space="preserve">
     <value>Standby</value>
   </data>
+  <data name="Menu_Identify.Text" xml:space="preserve">
+    <value>Identify</value>
+  </data>
   <data name="Shell_Main_BaseStationsLabel.Text" xml:space="preserve">
     <value>Base Stations</value>
   </data>
@@ -189,6 +192,9 @@
   <data name="Notification_Standby" xml:space="preserve">
     <value>{0} has been put to standby.</value>
   </data>
+  <data name="Notification_Identify" xml:space="preserve">
+    <value>{0} is identifying itself.</value>
+  </data>
   <data name="Shell_Main_PowerManagementDescription.Text" xml:space="preserve">
     <value>When you start SteamVR, they wake up from standby, and when you exit SteamVR, they go to standby. Neither HTC VIVE nor Valve Index required.</value>
   </data>

OVRLighthouseManager/Strings/ja-jp/Resources.resw

@@ -162,6 +162,9 @@
   <data name="Menu_Standby.Text" xml:space="preserve">
     <value>スタンバイ</value>
   </data>
+  <data name="Menu_Identify.Text" xml:space="preserve">
+    <value />
+  </data>
   <data name="Shell_Main_BaseStationsLabel.Text" xml:space="preserve">
     <value>ベースステーション</value>
   </data>
@@ -189,6 +192,9 @@
   <data name="Notification_Standby" xml:space="preserve">
     <value>{0}をスタンバイ状態にしました。</value>
   </data>
+  <data name="Notification_Identify" xml:space="preserve">
+    <value>{0}</value>
+  </data>
   <data name="Shell_Main_PowerManagementDescription.Text" xml:space="preserve">
     <value>SteamVRを起動するとスタンバイ状態から復帰し、SteamVRを終了するとスタンバイ状態にします。HTC VIVEおよびValve Indexは必要ありません。</value>
   </data>

OVRLighthouseManager/Views/LighthouseControl.xaml

@@ -13,6 +13,7 @@
         <helpers:PowerOnCommand x:Key="powerOnCommand" />
         <helpers:SleepCommand x:Key="sleepCommand" />
         <helpers:StandbyCommand x:Key="standbyCommand" />
+        <helpers:IdentifyCommand x:Key="identifyCommand" />
         <helpers:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </UserControl.Resources>
 
@@ -111,6 +112,12 @@
                         CommandParameter="{x:Bind LighthouseObject, Mode=OneWay}"
                         />
                     <MenuFlyoutSeparator />
+                    <MenuFlyoutItem
+                        x:Uid="Menu_Identify"
+                        Command="{StaticResource identifyCommand}"
+                        CommandParameter="{x:Bind LighthouseObject, Mode=OneWay}"
+                        />
+                    <MenuFlyoutSeparator />
                     <MenuFlyoutItem
                         x:Uid="Menu_EditId"
                         Command="{x:Bind LighthouseObject.EditIdCommand, Mode=OneWay}"