Minor fixes

feat: added GPU temperature indication.

ASUSWmi.cs

@@ -183,7 +183,7 @@ public class ASUSWmi
         if (curve.Length != 16) return;
         if (curve.All(singleByte => singleByte == 0)) return;
 
-        Debug.WriteLine(BitConverter.ToString(curve));
+        Logger.WriteLine("Fans" + ((device == 1)?"GPU":"CPU") + " " + BitConverter.ToString(curve));
 
         if (device == 1)
             DeviceSet(DevsGPUFanCurve, curve);

App.config

@@ -3,8 +3,8 @@
 	<System.Windows.Forms.ApplicationConfigurationSection>
 		<add key="DpiAwareness" value="PerMonitorV2" />
 	</System.Windows.Forms.ApplicationConfigurationSection>
+	<appSettings>
+		<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
+	</appSettings>
 </configuration>
 
-<appSettings>
-	<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
-</appSettings>

GHelper.csproj

@@ -16,7 +16,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.25</AssemblyVersion>
+    <AssemblyVersion>0.26</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -39,6 +39,7 @@
   <ItemGroup>
     <PackageReference Include="hidlibrary" Version="3.3.40" />
     <PackageReference Include="HidSharpCore" Version="1.2.1.1" />
+    <PackageReference Include="NvAPIWrapper.Net" Version="0.8.1.101" />
     <PackageReference Include="System.Management" Version="7.0.0" />
     <PackageReference Include="TaskScheduler" Version="2.10.1" />
     <PackageReference Include="WinForms.DataVisualization" Version="1.7.0" />

Gpu/AmdAdl2.cs

@@ -0,0 +1,485 @@
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace AmdAdl2;
+
+#region Export Struct
+
+[StructLayout(LayoutKind.Sequential)]
+public struct ADLSingleSensorData {
+    public int Supported;
+    public int Value;
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public struct ADLPMLogDataOutput {
+    int Size;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = Adl2.ADL_PMLOG_MAX_SENSORS)]
+    public ADLSingleSensorData[] Sensors;
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public struct ADLGcnInfo
+{
+    public int CuCount; //Number of compute units on the ASIC.
+    public int TexCount; //Number of texture mapping units.
+    public int RopCount; //Number of Render backend Units.
+    public int ASICFamilyId; //Such SI, VI. See /inc/asic_reg/atiid.h for family ids
+    public int ASICRevisionId; //Such as Ellesmere, Fiji.   For example - VI family revision ids are stored in /inc/asic_reg/vi_id.h
+}
+
+[Flags]
+public enum ADLAsicFamilyType {
+    Undefined = 0,
+    Discrete = 1 << 0,
+    Integrated = 1 << 1,
+    Workstation = 1 << 2,
+    FireMV = 1 << 3,
+    Xgp = 1 << 4,
+    Fusion = 1 << 5,
+    Firestream = 1 << 6,
+    Embedded = 1 << 7,
+}
+
+public enum ADLSensorType {
+    SENSOR_MAXTYPES = 0,
+    PMLOG_CLK_GFXCLK = 1, // Current graphic clock value in MHz
+    PMLOG_CLK_MEMCLK = 2, // Current memory clock value in MHz
+    PMLOG_CLK_SOCCLK = 3,
+    PMLOG_CLK_UVDCLK1 = 4,
+    PMLOG_CLK_UVDCLK2 = 5,
+    PMLOG_CLK_VCECLK = 6,
+    PMLOG_CLK_VCNCLK = 7,
+    PMLOG_TEMPERATURE_EDGE = 8, // Current edge of the die temperature value in C
+    PMLOG_TEMPERATURE_MEM = 9,
+    PMLOG_TEMPERATURE_VRVDDC = 10,
+    PMLOG_TEMPERATURE_VRMVDD = 11,
+    PMLOG_TEMPERATURE_LIQUID = 12,
+    PMLOG_TEMPERATURE_PLX = 13,
+    PMLOG_FAN_RPM = 14, // Current fan RPM value
+    PMLOG_FAN_PERCENTAGE = 15, // Current ratio of fan RPM and max RPM
+    PMLOG_SOC_VOLTAGE = 16,
+    PMLOG_SOC_POWER = 17,
+    PMLOG_SOC_CURRENT = 18,
+    PMLOG_INFO_ACTIVITY_GFX = 19, // Current graphic activity level in percentage
+    PMLOG_INFO_ACTIVITY_MEM = 20, // Current memory activity level in percentage
+    PMLOG_GFX_VOLTAGE = 21, // Current graphic voltage in mV
+    PMLOG_MEM_VOLTAGE = 22,
+    PMLOG_ASIC_POWER = 23, // Current ASIC power draw in Watt
+    PMLOG_TEMPERATURE_VRSOC = 24,
+    PMLOG_TEMPERATURE_VRMVDD0 = 25,
+    PMLOG_TEMPERATURE_VRMVDD1 = 26,
+    PMLOG_TEMPERATURE_HOTSPOT = 27, // Current center of the die temperature value in C
+    PMLOG_TEMPERATURE_GFX = 28,
+    PMLOG_TEMPERATURE_SOC = 29,
+    PMLOG_GFX_POWER = 30,
+    PMLOG_GFX_CURRENT = 31,
+    PMLOG_TEMPERATURE_CPU = 32,
+    PMLOG_CPU_POWER = 33,
+    PMLOG_CLK_CPUCLK = 34,
+    PMLOG_THROTTLER_STATUS = 35, // A bit map of GPU throttle information. If a bit is set, the bit represented type of thorttling occurred in the last metrics sampling period
+    PMLOG_CLK_VCN1CLK1 = 36,
+    PMLOG_CLK_VCN1CLK2 = 37,
+    PMLOG_SMART_POWERSHIFT_CPU = 38,
+    PMLOG_SMART_POWERSHIFT_DGPU = 39,
+    PMLOG_BUS_SPEED = 40, // Current PCIE bus speed running
+    PMLOG_BUS_LANES = 41, // Current PCIE bus lanes using
+    PMLOG_TEMPERATURE_LIQUID0 = 42,
+    PMLOG_TEMPERATURE_LIQUID1 = 43,
+    PMLOG_CLK_FCLK = 44,
+    PMLOG_THROTTLER_STATUS_CPU = 45,
+    PMLOG_SSPAIRED_ASICPOWER = 46, // apuPower
+    PMLOG_SSTOTAL_POWERLIMIT = 47, // Total Power limit    
+    PMLOG_SSAPU_POWERLIMIT = 48, // APU Power limit
+    PMLOG_SSDGPU_POWERLIMIT = 49, // DGPU Power limit
+    PMLOG_TEMPERATURE_HOTSPOT_GCD = 50,
+    PMLOG_TEMPERATURE_HOTSPOT_MCD = 51,
+    PMLOG_THROTTLER_TEMP_EDGE_PERCENTAGE = 52,
+    PMLOG_THROTTLER_TEMP_HOTSPOT_PERCENTAGE = 53,
+    PMLOG_THROTTLER_TEMP_HOTSPOT_GCD_PERCENTAGE = 54,
+    PMLOG_THROTTLER_TEMP_HOTSPOT_MCD_PERCENTAGE = 55,
+    PMLOG_THROTTLER_TEMP_MEM_PERCENTAGE = 56,
+    PMLOG_THROTTLER_TEMP_VR_GFX_PERCENTAGE = 57,
+    PMLOG_THROTTLER_TEMP_VR_MEM0_PERCENTAGE = 58,
+    PMLOG_THROTTLER_TEMP_VR_MEM1_PERCENTAGE = 59,
+    PMLOG_THROTTLER_TEMP_VR_SOC_PERCENTAGE = 60,
+    PMLOG_THROTTLER_TEMP_LIQUID0_PERCENTAGE = 61,
+    PMLOG_THROTTLER_TEMP_LIQUID1_PERCENTAGE = 62,
+    PMLOG_THROTTLER_TEMP_PLX_PERCENTAGE = 63,
+    PMLOG_THROTTLER_TDC_GFX_PERCENTAGE = 64,
+    PMLOG_THROTTLER_TDC_SOC_PERCENTAGE = 65,
+    PMLOG_THROTTLER_TDC_USR_PERCENTAGE = 66,
+    PMLOG_THROTTLER_PPT0_PERCENTAGE = 67,
+    PMLOG_THROTTLER_PPT1_PERCENTAGE = 68,
+    PMLOG_THROTTLER_PPT2_PERCENTAGE = 69,
+    PMLOG_THROTTLER_PPT3_PERCENTAGE = 70,
+    PMLOG_THROTTLER_FIT_PERCENTAGE = 71,
+    PMLOG_THROTTLER_GFX_APCC_PLUS_PERCENTAGE = 72,
+    PMLOG_BOARD_POWER = 73,
+    PMLOG_MAX_SENSORS_REAL
+};
+
+//Throttle Status
+[Flags]
+public enum ADL_THROTTLE_NOTIFICATION {
+    ADL_PMLOG_THROTTLE_POWER = 1 << 0,
+    ADL_PMLOG_THROTTLE_THERMAL = 1 << 1,
+    ADL_PMLOG_THROTTLE_CURRENT = 1 << 2,
+};
+
+public enum ADL_PMLOG_SENSORS {
+    ADL_SENSOR_MAXTYPES = 0,
+    ADL_PMLOG_CLK_GFXCLK = 1,
+    ADL_PMLOG_CLK_MEMCLK = 2,
+    ADL_PMLOG_CLK_SOCCLK = 3,
+    ADL_PMLOG_CLK_UVDCLK1 = 4,
+    ADL_PMLOG_CLK_UVDCLK2 = 5,
+    ADL_PMLOG_CLK_VCECLK = 6,
+    ADL_PMLOG_CLK_VCNCLK = 7,
+    ADL_PMLOG_TEMPERATURE_EDGE = 8,
+    ADL_PMLOG_TEMPERATURE_MEM = 9,
+    ADL_PMLOG_TEMPERATURE_VRVDDC = 10,
+    ADL_PMLOG_TEMPERATURE_VRMVDD = 11,
+    ADL_PMLOG_TEMPERATURE_LIQUID = 12,
+    ADL_PMLOG_TEMPERATURE_PLX = 13,
+    ADL_PMLOG_FAN_RPM = 14,
+    ADL_PMLOG_FAN_PERCENTAGE = 15,
+    ADL_PMLOG_SOC_VOLTAGE = 16,
+    ADL_PMLOG_SOC_POWER = 17,
+    ADL_PMLOG_SOC_CURRENT = 18,
+    ADL_PMLOG_INFO_ACTIVITY_GFX = 19,
+    ADL_PMLOG_INFO_ACTIVITY_MEM = 20,
+    ADL_PMLOG_GFX_VOLTAGE = 21,
+    ADL_PMLOG_MEM_VOLTAGE = 22,
+    ADL_PMLOG_ASIC_POWER = 23,
+    ADL_PMLOG_TEMPERATURE_VRSOC = 24,
+    ADL_PMLOG_TEMPERATURE_VRMVDD0 = 25,
+    ADL_PMLOG_TEMPERATURE_VRMVDD1 = 26,
+    ADL_PMLOG_TEMPERATURE_HOTSPOT = 27,
+    ADL_PMLOG_TEMPERATURE_GFX = 28,
+    ADL_PMLOG_TEMPERATURE_SOC = 29,
+    ADL_PMLOG_GFX_POWER = 30,
+    ADL_PMLOG_GFX_CURRENT = 31,
+    ADL_PMLOG_TEMPERATURE_CPU = 32,
+    ADL_PMLOG_CPU_POWER = 33,
+    ADL_PMLOG_CLK_CPUCLK = 34,
+    ADL_PMLOG_THROTTLER_STATUS = 35, // GFX
+    ADL_PMLOG_CLK_VCN1CLK1 = 36,
+    ADL_PMLOG_CLK_VCN1CLK2 = 37,
+    ADL_PMLOG_SMART_POWERSHIFT_CPU = 38,
+    ADL_PMLOG_SMART_POWERSHIFT_DGPU = 39,
+    ADL_PMLOG_BUS_SPEED = 40,
+    ADL_PMLOG_BUS_LANES = 41,
+    ADL_PMLOG_TEMPERATURE_LIQUID0 = 42,
+    ADL_PMLOG_TEMPERATURE_LIQUID1 = 43,
+    ADL_PMLOG_CLK_FCLK = 44,
+    ADL_PMLOG_THROTTLER_STATUS_CPU = 45,
+    ADL_PMLOG_SSPAIRED_ASICPOWER = 46, // apuPower
+    ADL_PMLOG_SSTOTAL_POWERLIMIT = 47, // Total Power limit
+    ADL_PMLOG_SSAPU_POWERLIMIT = 48, // APU Power limit
+    ADL_PMLOG_SSDGPU_POWERLIMIT = 49, // DGPU Power limit
+    ADL_PMLOG_TEMPERATURE_HOTSPOT_GCD = 50,
+    ADL_PMLOG_TEMPERATURE_HOTSPOT_MCD = 51,
+    ADL_PMLOG_THROTTLER_TEMP_EDGE_PERCENTAGE = 52,
+    ADL_PMLOG_THROTTLER_TEMP_HOTSPOT_PERCENTAGE = 53,
+    ADL_PMLOG_THROTTLER_TEMP_HOTSPOT_GCD_PERCENTAGE = 54,
+    ADL_PMLOG_THROTTLER_TEMP_HOTSPOT_MCD_PERCENTAGE = 55,
+    ADL_PMLOG_THROTTLER_TEMP_MEM_PERCENTAGE = 56,
+    ADL_PMLOG_THROTTLER_TEMP_VR_GFX_PERCENTAGE = 57,
+    ADL_PMLOG_THROTTLER_TEMP_VR_MEM0_PERCENTAGE = 58,
+    ADL_PMLOG_THROTTLER_TEMP_VR_MEM1_PERCENTAGE = 59,
+    ADL_PMLOG_THROTTLER_TEMP_VR_SOC_PERCENTAGE = 60,
+    ADL_PMLOG_THROTTLER_TEMP_LIQUID0_PERCENTAGE = 61,
+    ADL_PMLOG_THROTTLER_TEMP_LIQUID1_PERCENTAGE = 62,
+    ADL_PMLOG_THROTTLER_TEMP_PLX_PERCENTAGE = 63,
+    ADL_PMLOG_THROTTLER_TDC_GFX_PERCENTAGE = 64,
+    ADL_PMLOG_THROTTLER_TDC_SOC_PERCENTAGE = 65,
+    ADL_PMLOG_THROTTLER_TDC_USR_PERCENTAGE = 66,
+    ADL_PMLOG_THROTTLER_PPT0_PERCENTAGE = 67,
+    ADL_PMLOG_THROTTLER_PPT1_PERCENTAGE = 68,
+    ADL_PMLOG_THROTTLER_PPT2_PERCENTAGE = 69,
+    ADL_PMLOG_THROTTLER_PPT3_PERCENTAGE = 70,
+    ADL_PMLOG_THROTTLER_FIT_PERCENTAGE = 71,
+    ADL_PMLOG_THROTTLER_GFX_APCC_PLUS_PERCENTAGE = 72,
+    ADL_PMLOG_BOARD_POWER = 73,
+    ADL_PMLOG_MAX_SENSORS_REAL
+}
+
+#region ADLAdapterInfo
+
+/// <summary> ADLAdapterInfo Structure</summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct ADLAdapterInfo {
+    /// <summary>The size of the structure</summary>
+    int Size;
+
+    /// <summary> Adapter Index</summary>
+    public int AdapterIndex;
+
+    /// <summary> Adapter UDID</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Adl2.ADL_MAX_PATH)]
+    public string UDID;
+
+    /// <summary> Adapter Bus Number</summary>
+    public int BusNumber;
+
+    /// <summary> Adapter Driver Number</summary>
+    public int DriverNumber;
+
+    /// <summary> Adapter Function Number</summary>
+    public int FunctionNumber;
+
+    /// <summary> Adapter Vendor ID</summary>
+    public int VendorID;
+
+    /// <summary> Adapter Adapter name</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Adl2.ADL_MAX_PATH)]
+    public string AdapterName;
+
+    /// <summary> Adapter Display name</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Adl2.ADL_MAX_PATH)]
+    public string DisplayName;
+
+    /// <summary> Adapter Present status</summary>
+    public int Present;
+
+    /// <summary> Adapter Exist status</summary>
+    public int Exist;
+
+    /// <summary> Adapter Driver Path</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Adl2.ADL_MAX_PATH)]
+    public string DriverPath;
+
+    /// <summary> Adapter Driver Ext Path</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Adl2.ADL_MAX_PATH)]
+    public string DriverPathExt;
+
+    /// <summary> Adapter PNP String</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Adl2.ADL_MAX_PATH)]
+    public string PNPString;
+
+    /// <summary> OS Display Index</summary>
+    public int OSDisplayIndex;
+}
+
+/// <summary> ADLAdapterInfo Array</summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct ADLAdapterInfoArray {
+    /// <summary> ADLAdapterInfo Array </summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = Adl2.ADL_MAX_ADAPTERS)]
+    public ADLAdapterInfo[] ADLAdapterInfo;
+}
+
+#endregion ADLAdapterInfo
+
+#region ADLDisplayInfo
+
+/// <summary> ADLDisplayID Structure</summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct ADLDisplayID {
+    /// <summary> Display Logical Index </summary>
+    public int DisplayLogicalIndex;
+
+    /// <summary> Display Physical Index </summary>
+    public int DisplayPhysicalIndex;
+
+    /// <summary> Adapter Logical Index </summary>
+    public int DisplayLogicalAdapterIndex;
+
+    /// <summary> Adapter Physical Index </summary>
+    public int DisplayPhysicalAdapterIndex;
+}
+
+/// <summary> ADLDisplayInfo Structure</summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct ADLDisplayInfo {
+    /// <summary> Display Index </summary>
+    public ADLDisplayID DisplayID;
+
+    /// <summary> Display Controller Index </summary>
+    public int DisplayControllerIndex;
+
+    /// <summary> Display Name </summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Adl2.ADL_MAX_PATH)]
+    public string DisplayName;
+
+    /// <summary> Display Manufacturer Name </summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Adl2.ADL_MAX_PATH)]
+    public string DisplayManufacturerName;
+
+    /// <summary> Display Type : < The Display type. CRT, TV,CV,DFP are some of display types,</summary>
+    public int DisplayType;
+
+    /// <summary> Display output type </summary>
+    public int DisplayOutputType;
+
+    /// <summary> Connector type</summary>
+    public int DisplayConnector;
+
+    ///<summary> Indicating the display info bits' mask.<summary>
+    public int DisplayInfoMask;
+
+    ///<summary> Indicating the display info value.<summary>
+    public int DisplayInfoValue;
+}
+
+#endregion ADLDisplayInfo
+
+#endregion Export Struct
+
+public class Adl2 {
+    public const string Atiadlxx_FileName = "atiadlxx.dll";
+
+    #region Internal Constant
+
+    /// <summary> Define the maximum path</summary>
+    public const int ADL_MAX_PATH = 256;
+
+    /// <summary> Define the maximum adapters</summary>
+    public const int ADL_MAX_ADAPTERS = 40 /* 150 */;
+
+    /// <summary> Define the maximum displays</summary>
+    public const int ADL_MAX_DISPLAYS = 40 /* 150 */;
+
+    /// <summary> Define the maximum device name length</summary>
+    public const int ADL_MAX_DEVICENAME = 32;
+
+    /// <summary> Define the successful</summary>
+    public const int ADL_SUCCESS = 0;
+
+    /// <summary> Define the failure</summary>
+    public const int ADL_FAIL = -1;
+
+    /// <summary> Define the driver ok</summary>
+    public const int ADL_DRIVER_OK = 0;
+
+    /// <summary> Maximum number of GL-Sync ports on the GL-Sync module </summary>
+    public const int ADL_MAX_GLSYNC_PORTS = 8;
+
+    /// <summary> Maximum number of GL-Sync ports on the GL-Sync module </summary>
+    public const int ADL_MAX_GLSYNC_PORT_LEDS = 8;
+
+    /// <summary> Maximum number of ADLMOdes for the adapter </summary>
+    public const int ADL_MAX_NUM_DISPLAYMODES = 1024;
+
+    /// <summary> Performance Metrics Log max sensors number </summary>
+    public const int ADL_PMLOG_MAX_SENSORS = 256;
+
+    #endregion Internal Constant
+
+    // ///// <summary> ADL Create Function to create ADL Data</summary>
+    /// <param name="enumConnectedAdapters">If it is 1, then ADL will only return the physical exist adapters </param>
+    ///// <returns> retrun ADL Error Code</returns>
+    public static int ADL2_Main_Control_Create(int enumConnectedAdapters, out IntPtr adlContextHandle) {
+        return NativeMethods.ADL2_Main_Control_Create(ADL_Main_Memory_Alloc_Impl_Reference, enumConnectedAdapters, out adlContextHandle);
+    }
+
+    public static void FreeMemory(IntPtr buffer) {
+        Memory_Free_Impl(buffer);
+    }
+
+    private static bool? isDllLoaded;
+
+    public static bool Load() {
+        if (isDllLoaded != null)
+            return isDllLoaded.Value;
+
+        try {
+            Marshal.PrelinkAll(typeof(Adl2));
+            isDllLoaded = true;
+        } catch (Exception e) when (e is DllNotFoundException or EntryPointNotFoundException) {
+            Debug.WriteLine(e);
+            isDllLoaded = false;
+        }
+
+        return isDllLoaded.Value;
+    }
+
+    private static NativeMethods.ADL_Main_Memory_Alloc ADL_Main_Memory_Alloc_Impl_Reference = Memory_Alloc_Impl;
+
+    /// <summary> Build in memory allocation function</summary>
+    /// <param name="size">input size</param>
+    /// <returns>return the memory buffer</returns>
+    private static IntPtr Memory_Alloc_Impl(int size) {
+        return Marshal.AllocCoTaskMem(size);
+    }
+
+    /// <summary> Build in memory free function</summary>
+    /// <param name="buffer">input buffer</param>
+    private static void Memory_Free_Impl(IntPtr buffer) {
+        if (IntPtr.Zero != buffer) {
+            Marshal.FreeCoTaskMem(buffer);
+        }
+    }
+
+    public static class NativeMethods {
+        /// <summary> ADL Memory allocation function allows ADL to callback for memory allocation</summary>
+        /// <param name="size">input size</param>
+        /// <returns> retrun ADL Error Code</returns>
+        public delegate IntPtr ADL_Main_Memory_Alloc(int size);
+
+        // ///// <summary> ADL Create Function to create ADL Data</summary>
+        /// <param name="callback">Call back functin pointer which is ised to allocate memeory </param>
+        /// <param name="enumConnectedAdapters">If it is 1, then ADL will only retuen the physical exist adapters </param>
+        ///// <returns> retrun ADL Error Code</returns>
+        [DllImport(Atiadlxx_FileName)]
+        public static extern int ADL2_Main_Control_Create(ADL_Main_Memory_Alloc callback, int enumConnectedAdapters, out IntPtr adlContextHandle);
+
+        /// <summary> ADL Destroy Function to free up ADL Data</summary>
+        /// <returns> retrun ADL Error Code</returns>
+        [DllImport(Atiadlxx_FileName)]
+        public static extern int ADL2_Main_Control_Destroy(IntPtr adlContextHandle);
+
+        /// <summary> ADL Function to get the number of adapters</summary>
+        /// <param name="numAdapters">return number of adapters</param>
+        /// <returns> retrun ADL Error Code</returns>
+        [DllImport(Atiadlxx_FileName)]
+        public static extern int ADL2_Adapter_NumberOfAdapters_Get(IntPtr adlContextHandle, out int numAdapters);
+
+        /// <summary> ADL Function to get the GPU adapter information</summary>
+        /// <param name="info">return GPU adapter information</param>
+        /// <param name="inputSize">the size of the GPU adapter struct</param>
+        /// <returns> retrun ADL Error Code</returns>
+        [DllImport(Atiadlxx_FileName)]
+        public static extern int ADL2_Adapter_AdapterInfo_Get(IntPtr adlContextHandle, IntPtr info, int inputSize);
+
+        /// <summary> Function to determine if the adapter is active or not.</summary>
+        /// <remarks>The function is used to check if the adapter associated with iAdapterIndex is active</remarks>  
+        /// <param name="adapterIndex"> Adapter Index.</param>
+        /// <param name="status"> Status of the adapter. True: Active; False: Dsiabled</param>
+        /// <returns>Non zero is successfull</returns> 
+        [DllImport(Atiadlxx_FileName)]
+        public static extern int ADL2_Adapter_Active_Get(IntPtr adlContextHandle, int adapterIndex, out int status);
+
+        /// <summary>Get display information based on adapter index</summary>
+        /// <param name="adapterIndex">Adapter Index</param>
+        /// <param name="numDisplays">return the total number of supported displays</param>
+        /// <param name="displayInfoArray">return ADLDisplayInfo Array for supported displays' information</param>
+        /// <param name="forceDetect">force detect or not</param>
+        /// <returns>return ADL Error Code</returns>
+        [DllImport(Atiadlxx_FileName)]
+        public static extern int ADL2_Display_DisplayInfo_Get(
+            IntPtr adlContextHandle,
+            int adapterIndex,
+            out int numDisplays,
+            out IntPtr displayInfoArray,
+            int forceDetect
+        );
+
+        [DllImport(Atiadlxx_FileName)]
+        public static extern int ADL2_Overdrive_Caps(
+            IntPtr adlContextHandle,
+            int adapterIndex,
+            out int supported,
+            out int enabled,
+            out int version
+        );
+
+        [DllImport(Atiadlxx_FileName)]
+        public static extern int ADL2_New_QueryPMLogData_Get(IntPtr adlContextHandle, int adapterIndex, out ADLPMLogDataOutput adlpmLogDataOutput);
+
+        [DllImport(Atiadlxx_FileName)]
+        public static extern int ADL2_Adapter_ASICFamilyType_Get(IntPtr adlContextHandle, int adapterIndex, out ADLAsicFamilyType asicFamilyType, out int asicFamilyTypeValids);
+    }
+}

Gpu/AmdGpuTemperatureProvider.cs

@@ -0,0 +1,92 @@
+using System.Runtime.InteropServices;
+using AmdAdl2;
+
+namespace GHelper.Gpu;
+
+// Reference: https://github.com/GPUOpen-LibrariesAndSDKs/display-library/blob/master/Sample-Managed/Program.cs
+public class AmdGpuTemperatureProvider : IGpuTemperatureProvider {
+    private bool _isReady;
+    private IntPtr _adlContextHandle;
+    private readonly ADLAdapterInfo _internalDiscreteAdapter;
+
+    public AmdGpuTemperatureProvider() {
+        if (!Adl2.Load())
+            return;
+
+        if (Adl2.ADL2_Main_Control_Create(1, out _adlContextHandle) != Adl2.ADL_SUCCESS)
+            return;
+
+        Adl2.NativeMethods.ADL2_Adapter_NumberOfAdapters_Get(_adlContextHandle, out int numberOfAdapters);
+        if (numberOfAdapters <= 0)
+            return;
+
+        ADLAdapterInfoArray osAdapterInfoData = new();
+        int osAdapterInfoDataSize = Marshal.SizeOf(osAdapterInfoData);
+        IntPtr AdapterBuffer = Marshal.AllocCoTaskMem(osAdapterInfoDataSize);
+        Marshal.StructureToPtr(osAdapterInfoData, AdapterBuffer, false);
+        if (Adl2.NativeMethods.ADL2_Adapter_AdapterInfo_Get(_adlContextHandle, AdapterBuffer, osAdapterInfoDataSize) != Adl2.ADL_SUCCESS)
+            return;
+
+        osAdapterInfoData = (ADLAdapterInfoArray) Marshal.PtrToStructure(AdapterBuffer, osAdapterInfoData.GetType())!;
+
+        const int amdVendorId = 1002;
+        
+        // Determine which GPU is internal discrete AMD GPU
+        ADLAdapterInfo internalDiscreteAdapter = 
+            osAdapterInfoData.ADLAdapterInfo
+                .FirstOrDefault(adapter => {
+                    if (adapter.Exist == 0 || adapter.Present == 0)
+                        return false;
+                    
+                    if (adapter.VendorID != amdVendorId)
+                        return false;
+
+                    if (Adl2.NativeMethods.ADL2_Adapter_ASICFamilyType_Get(_adlContextHandle, adapter.AdapterIndex, out ADLAsicFamilyType asicFamilyType, out int asicFamilyTypeValids) != Adl2.ADL_SUCCESS)
+                        return false;
+
+                    asicFamilyType = (ADLAsicFamilyType) ((int) asicFamilyType & asicFamilyTypeValids);
+                    
+                    // FIXME: is this correct for G14 2022?
+                    return (asicFamilyType & ADLAsicFamilyType.Discrete) != 0; 
+                });
+        
+        if (internalDiscreteAdapter.Exist == 0)
+            return;
+
+        _internalDiscreteAdapter = internalDiscreteAdapter;
+        _isReady = true;
+    }
+
+    public bool IsValid => _isReady && _adlContextHandle != IntPtr.Zero;
+
+    public int? GetCurrentTemperature() {
+        if (!IsValid)
+            return null;
+        
+        if (Adl2.NativeMethods.ADL2_New_QueryPMLogData_Get(_adlContextHandle, _internalDiscreteAdapter.AdapterIndex, out ADLPMLogDataOutput adlpmLogDataOutput) != Adl2.ADL_SUCCESS)
+            return null;
+        
+        ADLSingleSensorData temperatureSensor = adlpmLogDataOutput.Sensors[(int) ADLSensorType.PMLOG_TEMPERATURE_EDGE];
+        if (temperatureSensor.Supported == 0)
+            return null;
+
+        return temperatureSensor.Value;
+    }
+
+    private void ReleaseUnmanagedResources() {
+        if (_adlContextHandle != IntPtr.Zero) {
+            Adl2.NativeMethods.ADL2_Main_Control_Destroy(_adlContextHandle);
+            _adlContextHandle = IntPtr.Zero;
+            _isReady = false;
+        }
+    }
+
+    public void Dispose() {
+        ReleaseUnmanagedResources();
+        GC.SuppressFinalize(this);
+    }
+
+    ~AmdGpuTemperatureProvider() {
+        ReleaseUnmanagedResources();
+    }
+}

Gpu/IGpuTemperatureProvider.cs

@@ -0,0 +1,6 @@
+namespace GHelper.Gpu;
+
+public interface IGpuTemperatureProvider : IDisposable {
+    bool IsValid { get; }
+    int? GetCurrentTemperature();
+}

Gpu/NvidiaGpuTemperatureProvider.cs

@@ -0,0 +1,44 @@
+using NvAPIWrapper.GPU;
+using NvAPIWrapper.Native;
+using NvAPIWrapper.Native.Exceptions;
+using NvAPIWrapper.Native.GPU;
+using NvAPIWrapper.Native.Interfaces.GPU;
+
+namespace GHelper.Gpu; 
+
+public class NvidiaGpuTemperatureProvider : IGpuTemperatureProvider {
+    private readonly PhysicalGPU? _internalGpu;
+
+    public NvidiaGpuTemperatureProvider() {
+        _internalGpu = GetInternalDiscreteGpu();
+    }
+
+    public bool IsValid => _internalGpu != null;
+
+    public int? GetCurrentTemperature() {
+        if (!IsValid)
+            return null;
+
+        IThermalSensor? gpuSensor = 
+            GPUApi.GetThermalSettings(_internalGpu!.Handle).Sensors
+            .FirstOrDefault(s => s.Target == ThermalSettingsTarget.GPU);
+
+        if (gpuSensor == null)
+            return null;
+
+        return gpuSensor.CurrentTemperature;
+    }
+
+    public void Dispose() {
+    }
+    
+    private static PhysicalGPU? GetInternalDiscreteGpu() {
+        try {
+            return PhysicalGPU
+                .GetPhysicalGPUs()
+                .FirstOrDefault(gpu => gpu.SystemType == SystemType.Laptop);
+        } catch {
+            return null;
+        }
+    }
+}

HardwareMonitor.cs

@@ -0,0 +1,63 @@
+using System.Diagnostics;
+using GHelper.Gpu;
+
+public class HardwareMonitor
+{
+    private static IGpuTemperatureProvider? GpuTemperatureProvider;
+
+    public static float? cpuTemp = -1;
+    public static float? batteryDischarge = -1;
+    public static int? gpuTemp = null;
+
+    public static void ReadSensors()
+    {
+        cpuTemp = -1;
+        batteryDischarge = -1;
+
+        try
+        {
+            var ct = new PerformanceCounter("Thermal Zone Information", "Temperature", @"\_TZ.THRM", true);
+            cpuTemp = ct.NextValue() - 273;
+            ct.Dispose();
+
+            var cb = new PerformanceCounter("Power Meter", "Power", "Power Meter (0)", true);
+            batteryDischarge = cb.NextValue() / 1000;
+            cb.Dispose();
+
+            gpuTemp = GpuTemperatureProvider?.GetCurrentTemperature();
+        }
+        catch
+        {
+            Logger.WriteLine("Failed reading sensors");
+        }
+    }
+
+    public static void RecreateGpuTemperatureProvider() {
+        try {
+            if (GpuTemperatureProvider != null) {
+                GpuTemperatureProvider.Dispose();
+            }
+            
+            // Detect valid GPU temperature provider.
+            // We start with NVIDIA because there's always at least an integrated AMD GPU
+            IGpuTemperatureProvider gpuTemperatureProvider = new NvidiaGpuTemperatureProvider();
+            if (gpuTemperatureProvider.IsValid) {
+                GpuTemperatureProvider = gpuTemperatureProvider;
+                return;
+            }
+        
+            gpuTemperatureProvider.Dispose();
+            gpuTemperatureProvider = new AmdGpuTemperatureProvider();
+            if (gpuTemperatureProvider.IsValid) {
+                GpuTemperatureProvider = gpuTemperatureProvider;
+                return;
+            }
+        
+            gpuTemperatureProvider.Dispose();
+        
+            GpuTemperatureProvider = null;
+        } finally {
+            Debug.WriteLine($"GpuTemperatureProvider: {GpuTemperatureProvider?.GetType().Name}");
+        }
+    }
+}

NativeMethods.cs

@@ -1,9 +1,8 @@
-using System.ComponentModel;
+using System.Collections;
+using System;
+using System.ComponentModel;
 using System.Diagnostics;
-using System.Management;
 using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using Tools;
 using static Tools.ScreenInterrogatory;
 
 namespace Tools
@@ -310,6 +309,62 @@ namespace Tools
 public class NativeMethods
 {
 
+    // Monitor Power detection
+
+    internal const uint DEVICE_NOTIFY_WINDOW_HANDLE = 0x0;
+    internal const uint DEVICE_NOTIFY_SERVICE_HANDLE = 0x1;
+    internal const int WM_POWERBROADCAST = 0x0218;
+    internal const int PBT_POWERSETTINGCHANGE = 0x8013;
+
+    [DllImport("User32.dll", SetLastError = true)]
+    internal static extern IntPtr RegisterPowerSettingNotification(IntPtr hWnd, [In] Guid PowerSettingGuid, uint Flags);
+
+    [DllImport("User32.dll", SetLastError = true)]
+    internal static extern bool UnregisterPowerSettingNotification(IntPtr hWnd);
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    internal struct POWERBROADCAST_SETTING
+    {
+        public Guid PowerSetting;
+        public uint DataLength;
+        public byte Data;
+    }
+
+    public class PowerSettingGuid
+    {
+        // 0=Powered by AC, 1=Powered by Battery, 2=Powered by short-term source (UPC)
+        public Guid AcdcPowerSource { get; } = new Guid("5d3e9a59-e9D5-4b00-a6bd-ff34ff516548");
+        // POWERBROADCAST_SETTING.Data = 1-100
+        public Guid BatteryPercentageRemaining { get; } = new Guid("a7ad8041-b45a-4cae-87a3-eecbb468a9e1");
+        // Windows 8+: 0=Monitor Off, 1=Monitor On, 2=Monitor Dimmed
+        public Guid ConsoleDisplayState { get; } = new Guid("6fe69556-704a-47a0-8f24-c28d936fda47");
+        // Windows 8+, Session 0 enabled: 0=User providing Input, 2=User Idle
+        public Guid GlobalUserPresence { get; } = new Guid("786E8A1D-B427-4344-9207-09E70BDCBEA9");
+        // 0=Monitor Off, 1=Monitor On.
+        public Guid MonitorPowerGuid { get; } = new Guid("02731015-4510-4526-99e6-e5a17ebd1aea");
+        // 0=Battery Saver Off, 1=Battery Saver On.
+        public Guid PowerSavingStatus { get; } = new Guid("E00958C0-C213-4ACE-AC77-FECCED2EEEA5");
+
+        // Windows 8+: 0=Off, 1=On, 2=Dimmed
+        public Guid SessionDisplayStatus { get; } = new Guid("2B84C20E-AD23-4ddf-93DB-05FFBD7EFCA5");
+
+        // Windows 8+, no Session 0: 0=User providing Input, 2=User Idle
+        public Guid SessionUserPresence { get; } = new Guid("3C0F4548-C03F-4c4d-B9F2-237EDE686376");
+        // 0=Exiting away mode 1=Entering away mode
+        public Guid SystemAwaymode { get; } = new Guid("98a7f580-01f7-48aa-9c0f-44352c29e5C0");
+
+        /* Windows 8+ */
+        // POWERBROADCAST_SETTING.Data not used
+        public Guid IdleBackgroundTask { get; } = new Guid(0x515C31D8, 0xF734, 0x163D, 0xA0, 0xFD, 0x11, 0xA0, 0x8C, 0x91, 0xE8, 0xF1);
+
+        public Guid PowerSchemePersonality { get; } = new Guid(0x245D8541, 0x3943, 0x4422, 0xB0, 0x25, 0x13, 0xA7, 0x84, 0xF6, 0x79, 0xB7);
+
+        // The Following 3 Guids are the POWERBROADCAST_SETTING.Data result of PowerSchemePersonality
+        public Guid MinPowerSavings { get; } = new Guid("8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c");
+        public Guid MaxPowerSavings { get; } = new Guid("a1841308-3541-4fab-bc81-f71556f20b4a");
+        public Guid TypicalPowerSavings { get; } = new Guid("381b4222-f694-41f0-9685-ff5bb260df2e");
+    }
+
 
     public const int KEYEVENTF_EXTENDEDKEY = 1;
     public const int KEYEVENTF_KEYUP = 2;
@@ -499,14 +554,16 @@ public class NativeMethods
                 //Debug.WriteLine(device.monitorFriendlyDeviceName);
             }
 
-            if (Screen.AllScreens.Length != count)
+            var screens = Screen.AllScreens;
+
+            if (screens.Length != count)
             {
                 Debug.WriteLine("Mismatch between enumerated and available screens");
                 return null;
             }
 
             count = 0;
-            foreach (var screen in Screen.AllScreens)
+            foreach (var screen in screens)
             {
                 if (count == displayNum)
                 {
@@ -515,7 +572,8 @@ public class NativeMethods
                 //Debug.WriteLine(screen.DeviceName);
                 count++;
             }
-        } catch
+        }
+        catch
         {
             Debug.WriteLine("Can't find internal screen");
         }

Program.cs

@@ -1,37 +1,24 @@
 using Microsoft.Win32;
-using System;
 using System.Diagnostics;
 using System.Management;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text.Json;
-
+public static class Logger
-public class HardwareMonitor
 {
-
+    public static void WriteLine(string logMessage)
-    public static float? cpuTemp = -1;
-    public static float? batteryDischarge = -1;
-
-
-    public static void ReadSensors()
     {
-        cpuTemp = -1;
+        var appPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\GHelper";
-        batteryDischarge = -1;
+        var logFile = appPath + "\\log.txt";
 
-        try
+        if (!Directory.Exists(appPath)) Directory.CreateDirectory(appPath);
-        {
-            var ct = new PerformanceCounter("Thermal Zone Information", "Temperature", @"\_TZ.THRM", true);
-            cpuTemp = ct.NextValue() - 273;
-            ct.Dispose();
 
-            var cb = new PerformanceCounter("Power Meter", "Power", "Power Meter (0)", true);
+        using (StreamWriter w = File.AppendText(logFile))
-            batteryDischarge = cb.NextValue() / 1000;
-            cb.Dispose();
-        }
-        catch
         {
-            Debug.WriteLine("Failed reading sensors");
+            Debug.WriteLine(logMessage);
+            w.WriteLine($"{DateTime.Now}: {logMessage}");
         }
+
     }
 
 }
@@ -41,6 +28,7 @@ namespace GHelper
     static class Program
     {
 
+
         // Native methods for sleep detection
 
         [DllImport("Powrprof.dll", SetLastError = true)]
@@ -79,6 +67,11 @@ namespace GHelper
         public static SettingsForm settingsForm = new SettingsForm();
         public static ToastForm toast = new ToastForm();
 
+        private static IntPtr unRegPowerNotify;
+        private static IntPtr ds;
+
+        private static long lastAuto;
+
         // The main entry point for the application
         public static void Main()
         {
@@ -101,6 +94,8 @@ namespace GHelper
 
             Application.EnableVisualStyles();
 
+            ds = settingsForm.Handle;
+
             trayIcon.MouseClick += TrayIcon_MouseClick; ;
 
             wmi.SubscribeToEvents(WatcherEventArrived);
@@ -115,6 +110,9 @@ namespace GHelper
 
             SetAutoModes();
 
+            // Subscribing for native power change events
+
+            /*
             IntPtr registrationHandle = new IntPtr();
             DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS recipient = new DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS();
             recipient.Callback = new DeviceNotifyCallbackRoutine(DeviceNotifyCallback);
@@ -124,30 +122,29 @@ namespace GHelper
             Marshal.StructureToPtr(recipient, pRecipient, false);
 
             uint result = PowerRegisterSuspendResumeNotification(DEVICE_NOTIFY_CALLBACK, ref recipient, ref registrationHandle);
+            */
 
+            // Subscribing for monitor power on events
+            var settingGuid = new NativeMethods.PowerSettingGuid();
+            unRegPowerNotify = NativeMethods.RegisterPowerSettingNotification(ds, settingGuid.ConsoleDisplayState, NativeMethods.DEVICE_NOTIFY_WINDOW_HANDLE);
+
+            // Subscribing for system power change events
             SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;
 
-            IntPtr ds = settingsForm.Handle;
 
             CheckForUpdates();
-
             Application.Run();
 
         }
 
-
         private static int DeviceNotifyCallback(IntPtr context, int type, IntPtr setting)
         {
-            //Debug.WriteLine($"Power callback type: {type}");
+            Logger.WriteLine($"Power callback {type}");
             switch (type)
             {
                 case PBT_APMRESUMEAUTOMATIC:
                     settingsForm.BeginInvoke(delegate
                     {
-                        // Fix for bugging buios on wake up
-                        Program.wmi.DeviceSet(ASUSWmi.PerformanceMode, (config.getConfig("performance_mode")+1) % 3);
-                        Thread.Sleep(500);
-
                         SetAutoModes();
                     });
                     break;
@@ -183,18 +180,24 @@ namespace GHelper
                     }
 
                 }
-            } catch {
+            }
-                Debug.WriteLine("Failed to get update");
+            catch
+            {
+                Logger.WriteLine("Failed to get update");
             }
 
         }
 
 
-        private static void SetAutoModes()
+        public static void SetAutoModes()
         {
+
+            if (Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastAuto) < 1000) return;
+            lastAuto = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+
             PowerLineStatus isPlugged = SystemInformation.PowerStatus.PowerLineStatus;
 
-            Debug.WriteLine(isPlugged.ToString());
+            Logger.WriteLine("AutoSetting for " + isPlugged.ToString());
 
             settingsForm.SetBatteryChargeLimit(config.getConfig("charge_limit"));
 
@@ -203,10 +206,19 @@ namespace GHelper
 
             settingsForm.SetMatrix(isPlugged);
 
+            HardwareMonitor.RecreateGpuTemperatureProvider();
+
+            // Re-enabling the discrete GPU takes a bit of time,
+            // so a simple workaround is to refresh again after that happens
+            Task.Run(async () => {
+                await Task.Delay(TimeSpan.FromSeconds(3));
+                HardwareMonitor.RecreateGpuTemperatureProvider();
+            });
         }
 
         private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
         {
+            Logger.WriteLine("Windows - Power Mode Changed");
             SetAutoModes();
         }
 
@@ -223,7 +235,7 @@ namespace GHelper
             }
             catch
             {
-                Debug.WriteLine("Failed to run " + fileName);
+                Logger.WriteLine("Failed to run " + fileName);
             }
 
 
@@ -300,7 +312,7 @@ namespace GHelper
 
             int EventID = int.Parse(e.NewEvent["EventID"].ToString());
 
-            Debug.WriteLine(EventID);
+            Logger.WriteLine("WMI event " + EventID);
 
             switch (EventID)
             {
@@ -348,6 +360,7 @@ namespace GHelper
         static void OnExit(object sender, EventArgs e)
         {
             trayIcon.Visible = false;
+            NativeMethods.UnregisterPowerSettingNotification(unRegPowerNotify);
             Application.Exit();
         }
     }

Settings.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Drawing.Imaging;
 using System.Timers;
 
+
 namespace GHelper
 {
 
@@ -97,6 +98,38 @@ namespace GHelper
 
         }
 
+
+        protected override void WndProc(ref Message m)
+        {
+            switch (m.Msg)
+            {
+                case NativeMethods.WM_POWERBROADCAST:
+                    if (m.WParam == (IntPtr)NativeMethods.PBT_POWERSETTINGCHANGE)
+                    {
+                        var settings = (NativeMethods.POWERBROADCAST_SETTING)m.GetLParam(typeof(NativeMethods.POWERBROADCAST_SETTING));
+                        switch (settings.Data)
+                        {
+                            case 0:
+                                Logger.WriteLine("Monitor Power Off");
+                                break;
+                            case 1:
+                                Logger.WriteLine("Monitor Power On");
+                                Program.settingsForm.BeginInvoke(delegate
+                                {
+                                    Program.SetAutoModes();
+                                });
+                                break;
+                            case 2:
+                                Logger.WriteLine("Monitor Dimmed");
+                                break;
+                        }
+                    }
+                    m.Result = (IntPtr)1;
+                    break;
+            }
+            base.WndProc(ref m);
+        }
+
         private void CheckGPU_CheckedChanged(object? sender, EventArgs e)
         {
             if (sender is null) return;
@@ -508,8 +541,12 @@ namespace GHelper
         {
 
             int currentFrequency = NativeMethods.GetRefreshRate();
-            if (currentFrequency < 0)  // Laptop screen not detected or has unknown refresh rate
+            
+            if (currentFrequency < 0) // Laptop screen not detected or has unknown refresh rate
+            {
+                InitScreen();
                 return;
+            }
 
             if (frequency >= 1000)
             {
@@ -525,7 +562,7 @@ namespace GHelper
                 Program.wmi.DeviceSet(ASUSWmi.ScreenOverdrive, overdrive);
 
             InitScreen();
-            Debug.WriteLine(frequency);
+            Logger.WriteLine("Screen "+ frequency.ToString() + "Hz");
 
         }
 
@@ -559,7 +596,7 @@ namespace GHelper
             }
             catch
             {
-                Debug.WriteLine("Screen Overdrive not supported");
+                Logger.WriteLine("Screen Overdrive not supported");
             }
 
             button60Hz.FlatAppearance.BorderSize = buttonInactive;
@@ -653,6 +690,10 @@ namespace GHelper
             if (HardwareMonitor.batteryDischarge > 0)
                 battery = "Discharging: " + Math.Round((decimal)HardwareMonitor.batteryDischarge, 1).ToString() + "W";
 
+            if (HardwareMonitor.gpuTemp != null) {
+                gpuTemp = $": {HardwareMonitor.gpuTemp}°C - ";
+            }
+
             Program.settingsForm.BeginInvoke(delegate
             {
                 Program.settingsForm.labelCPUFan.Text = "CPU" + cpuTemp + cpuFan;
@@ -680,6 +721,7 @@ namespace GHelper
                 aTimer.Interval = 300;
                 aTimer.Enabled = true;
 
+                //RefreshSensors();
             }
             else
             {
@@ -702,7 +744,7 @@ namespace GHelper
             Program.wmi.DeviceSet(ASUSWmi.PPT_TotalA1, limit_total);
             Program.wmi.DeviceSet(ASUSWmi.PPT_CPUB0, limit_cpu);
 
-            Debug.WriteLine(limit_total.ToString() + ", " + limit_cpu.ToString());
+            Logger.WriteLine("PowerLimits "+limit_total.ToString() + ", " + limit_cpu.ToString());
 
 
         }
@@ -760,7 +802,7 @@ namespace GHelper
             Program.config.setConfig("performance_mode", PerformanceMode);
 
             Program.wmi.DeviceSet(ASUSWmi.PerformanceMode, PerformanceMode);
-            Debug.WriteLine("Perf:" + PerformanceMode);
+            Logger.WriteLine("PerfMode " + perfName + " "+ PerformanceMode);
 
             if (notify && (oldMode != PerformanceMode))
             {
@@ -992,7 +1034,7 @@ namespace GHelper
                     break;
                 default:
                     buttonStandard.FlatAppearance.BorderSize = buttonActive;
-                    labelGPU.Text = "GPU Mode: iGPU and dGPU";
+                    labelGPU.Text = "GPU Mode: iGPU + dGPU";
                     Program.trayIcon.Icon = GHelper.Properties.Resources.standard;
                     break;
             }

Startup.cs

@@ -29,6 +29,7 @@ public class Startup
 
         td.Settings.StopIfGoingOnBatteries = false;
         td.Settings.DisallowStartIfOnBatteries = false;
+        td.Settings.ExecutionTimeLimit = TimeSpan.Zero;
 
         Debug.WriteLine(strExeFilePath);
         Debug.WriteLine(userId);
@@ -36,9 +37,9 @@ public class Startup
         try
         {
             TaskService.Instance.RootFolder.RegisterTaskDefinition(taskName, td);
-        } catch
+        } catch (Exception e)
         {
-            MessageBox.Show("Can't schedule task", "Scheduler Error", MessageBoxButtons.OK);
+            MessageBox.Show(e.ToString(), "Scheduler Error", MessageBoxButtons.OK);
         }
 
     }