Merge branch 'master' into develop

README.md

@@ -102,13 +102,13 @@ which results in `4008` for my PC.
 
 You can use [WMI Explorer](https://github.com/vinaypamnani/wmie2/tree/v2.0.0.2) to find see what data is available.
 
-### IdleTime
+### LastActive
 
-This sensor returns the amount of seconds the workstation has been idle for. It starts counting the moment you stop typing or moving your mouse.
+This sensor returns the date/time that the workstation was last active. Typing or moving your mouse will reset the date/time.
 
-### UpTime
+### LastBoot
 
-This sensor returns theup time from Windows in seconds.
+This sensor returns the date/time that Windows was last booted.
 
 ### SessionState
 

UserInterface/Views/AddSensorDialog.axaml.cs

@@ -135,16 +135,16 @@ namespace UserInterface.Views
                     item.ShowWindowNameInput = true;
                     item.UpdateInterval = 5;
                     break;
-                case AvailableSensors.IdleTimeSensor:
-                    item.Description = "This sensor returns the amount of seconds the workstation has been idle for. ";
-                    item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#idletime";
+                case AvailableSensors.LastActiveSensor:
+                    item.Description = "This sensor returns the date/time that the workstation was last active.";
+                    item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#lastactive";
                     item.ShowQueryInput = false;
                     item.ShowWindowNameInput = false;
                     item.UpdateInterval = 5;
                     break;
-                case AvailableSensors.UpTimeSensor:
-                    item.Description = "This sensor returns the uptime from Windows in seconds";
-                    item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#uptime";
+                case AvailableSensors.LastBootSensor:
+                    item.Description = "This sensor returns the date/time that Windows was last booted";
+                    item.MoreInfoLink = "https://github.com/sleevezipper/hass-workstation-service#lastboot";
                     item.ShowQueryInput = false;
                     item.ShowWindowNameInput = false;
                     item.UpdateInterval = 5;

hass-workstation-service/Communication/InterProcesCommunication/InterProcessApi.cs

@@ -115,11 +115,11 @@ namespace hass_workstation_service.Communication.InterProcesCommunication
                 case AvailableSensors.NamedWindowSensor:
                     sensorToCreate = new NamedWindowSensor(this._publisher, model.WindowName, model.Name, (int)model.UpdateInterval);
                     break;
-                case AvailableSensors.IdleTimeSensor:
-                    sensorToCreate = new IdleTimeSensor(this._publisher,(int)model.UpdateInterval, model.Name);
+                case AvailableSensors.LastActiveSensor:
+                    sensorToCreate = new LastActiveSensor(this._publisher,(int)model.UpdateInterval, model.Name);
                     break;
-                case AvailableSensors.UpTimeSensor:
-                    sensorToCreate = new UpTimeSensor(this._publisher, (int)model.UpdateInterval, model.Name);
+                case AvailableSensors.LastBootSensor:
+                    sensorToCreate = new LastBootSensor(this._publisher, (int)model.UpdateInterval, model.Name);
                     break;
                 case AvailableSensors.SessionStateSensor:
                     sensorToCreate = new SessionStateSensor(this._publisher, (int)model.UpdateInterval, model.Name);

hass-workstation-service/Communication/InterProcesCommunication/ServiceContractModels.cs

@@ -42,8 +42,8 @@ namespace hass_workstation_service.Communication.InterProcesCommunication.Models
         MicrophoneActiveSensor,
         ActiveWindowSensor,
         NamedWindowSensor,
-        IdleTimeSensor,
-        UpTimeSensor,
+        LastActiveSensor,
+        LastBootSensor,
         SessionStateSensor
     }
 }

hass-workstation-service/Data/ConfigurationService.cs

@@ -93,11 +93,11 @@ namespace hass_workstation_service.Data
                     case "NamedWindowSensor":
                         sensor = new NamedWindowSensor(publisher, configuredSensor.WindowName, configuredSensor.Name, configuredSensor.UpdateInterval, configuredSensor.Id);
                         break;
-                    case "IdleTimeSensor":
-                        sensor = new IdleTimeSensor(publisher, configuredSensor.UpdateInterval, configuredSensor.Name, configuredSensor.Id);
+                    case "LastActiveSensor":
+                        sensor = new LastActiveSensor(publisher, configuredSensor.UpdateInterval, configuredSensor.Name, configuredSensor.Id);
                         break;
-                    case "UpTimeSensor":
-                        sensor = new UpTimeSensor(publisher, configuredSensor.UpdateInterval, configuredSensor.Name, configuredSensor.Id);
+                    case "LastBootSensor":
+                        sensor = new LastBootSensor(publisher, configuredSensor.UpdateInterval, configuredSensor.Name, configuredSensor.Id);
                         break;
                     case "WebcamActiveSensor":
                         sensor = new WebcamActiveSensor(publisher, configuredSensor.UpdateInterval, configuredSensor.Name, configuredSensor.Id);

hass-workstation-service/Domain/Sensors/LastActiveSensor.cs

@@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
 
 namespace hass_workstation_service.Domain.Sensors
 {
-    public class IdleTimeSensor : AbstractSensor
+    public class LastActiveSensor : AbstractSensor
     {
         
-        public IdleTimeSensor(MqttPublisher publisher, int? updateInterval = 10, string name = "IdleTime", Guid id = default) : base(publisher, name ?? "IdleTime", updateInterval ?? 10, id){}
+        public LastActiveSensor(MqttPublisher publisher, int? updateInterval = 10, string name = "LastActive", Guid id = default) : base(publisher, name ?? "LastActive", updateInterval ?? 10, id){}
 
         public override AutoDiscoveryConfigModel GetAutoDiscoveryConfig()
         {
@@ -17,20 +17,17 @@ namespace hass_workstation_service.Domain.Sensors
                 Unique_id = this.Id.ToString(),
                 Device = this.Publisher.DeviceConfigModel,
                 State_topic = $"homeassistant/sensor/{Publisher.DeviceConfigModel.Name}/{this.Name}/state",
-                Icon = "mdi:clock-time-three-outline",
-                Unit_of_measurement = "seconds"
+                Icon = "mdi:clock-time-three-outline"
             });
         }
 
         public override string GetState()
         {
-            return GetLastInputTime().ToString();
+            return GetLastInputTime().ToString("s");
         }
-
-
         
 
-        static int GetLastInputTime()
+        static DateTime GetLastInputTime()
         {
             int idleTime = 0;
             LASTINPUTINFO lastInputInfo = new LASTINPUTINFO();
@@ -46,9 +43,9 @@ namespace hass_workstation_service.Domain.Sensors
                 idleTime = envTicks - lastInputTick;
             }
 
-            return ((idleTime > 0) ? (idleTime / 1000) : idleTime);
-        }
 
+            return idleTime > 0 ? DateTime.Now - TimeSpan.FromMilliseconds(idleTime) : DateTime.Now;
+        }
 
 
         [DllImport("User32.dll")]

hass-workstation-service/Domain/Sensors/LastBootSensor.cs

@@ -1,17 +1,13 @@
 using hass_workstation_service.Communication;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using HWND = System.IntPtr;
 
 namespace hass_workstation_service.Domain.Sensors
 {
-    public class UpTimeSensor : AbstractSensor
+    public class LastBootSensor : AbstractSensor
     {
         
-        public UpTimeSensor(MqttPublisher publisher, int? updateInterval = 10, string name = "UpTime", Guid id = default) : base(publisher, name ?? "UpTime", updateInterval ?? 10, id)
+        public LastBootSensor(MqttPublisher publisher, int? updateInterval = 10, string name = "LastBoot", Guid id = default) : base(publisher, name ?? "LastBoot", updateInterval ?? 10, id)
         {
         
 
@@ -25,15 +21,13 @@ namespace hass_workstation_service.Domain.Sensors
                 Unique_id = this.Id.ToString(),
                 Device = this.Publisher.DeviceConfigModel,
                 State_topic = $"homeassistant/sensor/{Publisher.DeviceConfigModel.Name}/{this.Name}/state",
-                Icon = "mdi:clock-time-three-outline",
-                Unit_of_measurement = "seconds"
+                Icon = "mdi:clock-time-three-outline"
             });
         }
 
         public override string GetState()
         {
-
-            return (GetTickCount64() / 1000).ToString(); //return in seconds
+            return (DateTime.Now - TimeSpan.FromMilliseconds(GetTickCount64())).ToString("s");
         }
 
         [DllImport("kernel32")]