Merge commit 'e6c9dd9853a58a971010bf9c89e3b307dc778104' into dev

# Conflicts:
#	LibreHardwareMonitor/LibreHardwareMonitor.csproj
#	LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj

Author: sergiye

OpenHardwareMonitorLib/Hardware/Motherboard/Identification.cs

@@ -597,6 +597,8 @@ public static Model GetModel(string name)
                 return Model.ROG_STRIX_Z790_I_GAMING_WIFI;
             case var _ when name.Equals("ROG STRIX Z790-E GAMING WIFI", StringComparison.OrdinalIgnoreCase):
                 return Model.ROG_STRIX_Z790_E_GAMING_WIFI;
+            case var _ when name.Equals("ROG STRIX Z790-E GAMING WIFI II", StringComparison.OrdinalIgnoreCase):
+                return Model.ROG_STRIX_Z790_E_GAMING_WIFI_II;
             case var _ when name.Equals("MPG X570 GAMING PLUS (MS-7C37)",StringComparison.OrdinalIgnoreCase):
                 return Model.X570_Gaming_Plus;
             case var _ when name.Equals("ROG MAXIMUS Z790 FORMULA", StringComparison.OrdinalIgnoreCase):

OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/EC/EmbeddedController.cs

@@ -255,6 +255,11 @@ public abstract class EmbeddedController : Hardware
         new(Model.ROG_STRIX_Z790_E_GAMING_WIFI,
             BoardFamily.Intel700,
             ECSensor.TempWaterIn),
+        new(Model.ROG_STRIX_Z790_E_GAMING_WIFI_II,
+            BoardFamily.Intel700,
+            ECSensor.TempTSensor,
+            ECSensor.TempVrm,
+            ECSensor.FanCPUOpt),
         new(Model.ROG_MAXIMUS_Z790_FORMULA,
             BoardFamily.Intel700,
             ECSensor.TempWaterIn,

OpenHardwareMonitorLib/Hardware/Motherboard/Model.cs

@@ -71,6 +71,7 @@ public enum Model
     ROG_MAXIMUS_Z690_EXTREME_GLACIAL,
     ROG_STRIX_Z790_I_GAMING_WIFI,
     ROG_STRIX_Z790_E_GAMING_WIFI,
+    ROG_STRIX_Z790_E_GAMING_WIFI_II,
     M2N_SLI_Deluxe,
     M4A79XTD_EVO,
     P5W_DH_Deluxe,

OpenHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs

@@ -4243,6 +4243,32 @@ private static void GetNuvotonConfigurationD(ISuperIO superIO, Manufacturer manu
 
                         break;
 
+                    case Model.ROG_STRIX_Z790_E_GAMING_WIFI_II: //NCT6798D
+
+                        t.Add(new Temperature("CPU Package", 0));
+                        t.Add(new Temperature("Motherboard", 2));
+                        t.Add(new Temperature("Chipset", 12));
+                        t.Add(new Temperature("PCH", 13));
+                        t.Add(new Temperature("CPU", 22));
+
+                        f.Add(new Fan("Chassis Fan #1", 0));
+                        f.Add(new Fan("CPU Fan", 1));
+                        f.Add(new Fan("Chassis Fan #2", 2));
+                        f.Add(new Fan("Chassis Fan #3", 3));
+                        f.Add(new Fan("Chassis Fan #4", 4));
+                        f.Add(new Fan("Chassis FAN #5", 5));
+                        f.Add(new Fan("AIO Pump", 6));
+
+                        c.Add(new Control("Chassis Fan #1", 0));
+                        c.Add(new Control("CPU Fan", 1));
+                        c.Add(new Control("Chassis Fan #2", 2));
+                        c.Add(new Control("Chassis Fan #3", 3));
+                        c.Add(new Control("Chassis Fan #4", 4));
+                        c.Add(new Control("Chassis Fan #5", 5));
+                        c.Add(new Control("AIO Pump", 6));
+
+                        break;
+
                     case Model.ROG_STRIX_B550_I_GAMING: //NCT6798D
                         v.Add(new Voltage("Vcore", 0, 10, 10));
                         v.Add(new Voltage("+5V", 1, 4, 1)); //Probably not updating properly