Merge remote-tracking branch 'lib/master' into dev

# Conflicts:
#	OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs

Author: sergiye

OpenHardwareMonitorLib/Hardware/Motherboard/Identification.cs

@@ -389,6 +389,8 @@ public static Model GetModel(string name)
                 return Model.TUF_X470_PLUS_GAMING;
             case var _ when name.Equals("B360M PRO-VDH (MS-7B24)", StringComparison.OrdinalIgnoreCase):
                 return Model.B360M_PRO_VDH;
+            case var _ when name.Equals("B360M H", StringComparison.OrdinalIgnoreCase):
+                return Model.B360M_H;
             case var _ when name.Equals("B550-A PRO (MS-7C56)", StringComparison.OrdinalIgnoreCase):
             case var _ when name.Equals("PRO B550-VC (MS-7C56)", StringComparison.OrdinalIgnoreCase):
                 return Model.B550A_PRO;
@@ -629,10 +631,14 @@ public static Model GetModel(string name)
                 return Model.Z890_EDGE_TI_WIFI;
             case var _ when name.Equals("X11SWN-E", StringComparison.OrdinalIgnoreCase):
                 return Model.X11SWN_E;
+            case var _ when name.Equals("PRO B840-P WIFI (MS-7E57)", StringComparison.OrdinalIgnoreCase):
+                return Model.B840P_PRO_WIFI;
             case var _ when name.Equals("PRO B850-P WIFI (MS-7E56)", StringComparison.OrdinalIgnoreCase):
                 return Model.B850P_PRO_WIFI;
             case var _ when name.Equals("B850 GAMING PLUS WIFI (MS-7E56)", StringComparison.OrdinalIgnoreCase):
                 return Model.B850_GAMING_PLUS_WIFI;
+            case var _ when name.Equals("MAG B850M MORTAR WIFI (MS-7E61)", StringComparison.OrdinalIgnoreCase):
+                return Model.B850M_MORTAR_WIFI;
             case var _ when name.Equals("MAG B850 TOMAHAWK MAX WIFI (MS-7E62)", StringComparison.OrdinalIgnoreCase):
                 return Model.B850_TOMAHAWK_MAX_WIFI;
             case var _ when name.Equals("MPG B850 EDGE TI WIFI (MS-7E62)", StringComparison.OrdinalIgnoreCase):

OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs

@@ -386,8 +386,10 @@ private bool DetectWinbondFintek(LpcPort port, Motherboard motherboard)
                     case 0x92:                                
                         switch (motherboard.Model)
                         {
+                            case Model.B840P_PRO_WIFI:
                             case Model.B850_GAMING_PLUS_WIFI:
                             case Model.B850P_PRO_WIFI:
+                            case Model.B850M_MORTAR_WIFI:
                             case Model.B850_TOMAHAWK_MAX_WIFI:
                             case Model.B850_EDGE_TI_WIFI:
                             case Model.X870_GAMING_PLUS_WIFI:

OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs

@@ -1007,7 +1007,7 @@ private void Set6687DRControl(int index, byte? value)
             else
             {
                 // Write 7-point fan curve
-                for (int count = 0; count < 14; count = count + 2)
+                for (int count = 0; count < 14; count += 2)
                 {
                     targetFanCurveAddr = initFanCurveReg+count;
                     targetFanCurveReg = Convert.ToUInt16(targetFanCurveAddr);

OpenHardwareMonitorLib/Hardware/Motherboard/Model.cs

@@ -130,7 +130,9 @@ public enum Model
     Z77_MS7751,
     Z68_MS7672,
     X570_Gaming_Plus,
+    B850M_MORTAR_WIFI,
     B850_GAMING_PLUS_WIFI,
+    B840P_PRO_WIFI,
     B850_TOMAHAWK_MAX_WIFI,
     B650M_PROJECT_ZERO,
     B850P_PRO_WIFI,
@@ -160,6 +162,7 @@ public enum Model
     AB350_Gaming_3,
     AX370_Gaming_5,
     AX370_Gaming_K7,
+    B360M_H,
     B360_AORUS_GAMING_3_WIFI_CF,
     B550_AORUS_MASTER,
     B550_AORUS_PRO,

OpenHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs

@@ -1808,6 +1808,26 @@ private static void GetIteConfigurationsB(ISuperIO superIO, Manufacturer manufac
 
                         break;
 
+                    case Model.B360M_H: // IT8686E
+                        v.Add(new Voltage("Vcore", 0));
+                        v.Add(new Voltage("+3.3V", 1, 29.4f, 45.3f));
+                        v.Add(new Voltage("+12V", 2, 10f, 2f));
+                        v.Add(new Voltage("+5V", 3, 15f, 10f));
+                        v.Add(new Voltage("VCCSA", 5));
+                        v.Add(new Voltage("DIMM A/B", 6));
+                        v.Add(new Voltage("+3V Standby", 7, 1, 1));
+                        v.Add(new Voltage("CMOS Battery", 8, 1, 1));
+                        t.Add(new Temperature("System", 0));
+                        t.Add(new Temperature("PCH", 1));
+                        t.Add(new Temperature("CPU", 2));
+                        t.Add(new Temperature("VRM MOS", 4));
+                        f.Add(new Fan("CPU Fan", 0));
+                        f.Add(new Fan("System Fan", 1));
+                        c.Add(new Control("CPU Fan", 0));
+                        c.Add(new Control("System Fan", 1));
+
+                        break;
+
                     case Model.B360_AORUS_GAMING_3_WIFI_CF: // IT8688E
                         v.Add(new Voltage("Vcore", 0));
                         v.Add(new Voltage("+3.3V", 1, 29.4f, 45.3f));