Add support for three additional MSI Motherboards (#2132)
* Support for 10 new MSI motherboards with NCT6687D-R SIO controller * Support for newly established fan and control register structure WILL ABSOLUTELY BREAK FAN CONTROL CONFIGS FOR NCT6687DR USERS. This introduces Support for 16 System Fans and Controls, including EZ-Connect, Pump Fan 2, and System Fan 7. Also improved the logic for nct6687dr control. * Add support for X870E Tomahawk WIFI, fix B850 Gaming Plus WIFI PZ identification Additionally sync with upstream * Add support for B850M Gaming Plus WIFI and Z890 Unify-X Also removes duplicate model identification case for B850M GAMING PLUS WIFI6E
This commit is contained in:
@@ -671,6 +671,8 @@ internal class Identification
|
|||||||
return Model.ROG_CROSSHAIR_X870E_HERO;
|
return Model.ROG_CROSSHAIR_X870E_HERO;
|
||||||
case var _ when name.Equals("MPG Z890 CARBON WIFI (MS-7E17)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("MPG Z890 CARBON WIFI (MS-7E17)", StringComparison.OrdinalIgnoreCase):
|
||||||
return Model.Z890_CARBON_WIFI;
|
return Model.Z890_CARBON_WIFI;
|
||||||
|
case var _ when name.Equals("MAG X870E TOMAHAWK WIFI (MS-7E59)", StringComparison.OrdinalIgnoreCase):
|
||||||
|
return Model.X870E_TOMAHAWK_WIFI;
|
||||||
case var _ when name.Equals("MPG X870E CARBON WIFI (MS-7E49)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("MPG X870E CARBON WIFI (MS-7E49)", StringComparison.OrdinalIgnoreCase):
|
||||||
return Model.X870E_CARBON_WIFI;
|
return Model.X870E_CARBON_WIFI;
|
||||||
case var _ when name.Equals("MPG Z890 EDGE TI WIFI (MS-7E19)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("MPG Z890 EDGE TI WIFI (MS-7E19)", StringComparison.OrdinalIgnoreCase):
|
||||||
@@ -691,8 +693,10 @@ internal class Identification
|
|||||||
return Model.B850MP_PRO_WIFI;
|
return Model.B850MP_PRO_WIFI;
|
||||||
case var _ when name.Equals("B850 GAMING PLUS WIFI (MS-7E56)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("B850 GAMING PLUS WIFI (MS-7E56)", StringComparison.OrdinalIgnoreCase):
|
||||||
return Model.B850_GAMING_PLUS_WIFI;
|
return Model.B850_GAMING_PLUS_WIFI;
|
||||||
case var _ when name.Equals("B850 GAMING PLUS WIFI6E (MS-7E80)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("B850 GAMING PLUS WIFI PZ (MS-7E75)", StringComparison.OrdinalIgnoreCase):
|
||||||
return Model.B850_GAMING_PLUS_WIFI6E;
|
return Model.B850_GAMING_PLUS_WIFI_PZ;
|
||||||
|
case var _ when name.Equals("B850M GAMING PLUS WIFI (MS-7E66)", StringComparison.OrdinalIgnoreCase):
|
||||||
|
return Model.B850M_GAMING_PLUS_WIFI;
|
||||||
case var _ when name.Equals("B850M GAMING PLUS WIFI6E (MS-7E81)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("B850M GAMING PLUS WIFI6E (MS-7E81)", StringComparison.OrdinalIgnoreCase):
|
||||||
return Model.B850M_GAMING_PLUS_WIFI6E;
|
return Model.B850M_GAMING_PLUS_WIFI6E;
|
||||||
case var _ when name.Equals("MAG B850M MORTAR (MS-7E61)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("MAG B850M MORTAR (MS-7E61)", StringComparison.OrdinalIgnoreCase):
|
||||||
@@ -731,6 +735,8 @@ internal class Identification
|
|||||||
return Model.Z790_GODLIKE_MAX;
|
return Model.Z790_GODLIKE_MAX;
|
||||||
case var _ when name.Equals("MEG Z890 ACE (MS-7E22)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("MEG Z890 ACE (MS-7E22)", StringComparison.OrdinalIgnoreCase):
|
||||||
return Model.Z890_ACE;
|
return Model.Z890_ACE;
|
||||||
|
case var _ when name.Equals("MEG Z890 UNIFY-X (MS-7E20)", StringComparison.OrdinalIgnoreCase):
|
||||||
|
return Model.Z890_UNIFY_X;
|
||||||
case var _ when name.Equals("MAG Z890 TOMAHAWK WIFI (MS-7E32)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("MAG Z890 TOMAHAWK WIFI (MS-7E32)", StringComparison.OrdinalIgnoreCase):
|
||||||
return Model.Z890_TOMAHAWK_WIFI;
|
return Model.Z890_TOMAHAWK_WIFI;
|
||||||
case var _ when name.Equals("MPG Z890 CARBON WIFI (MS-7E17)", StringComparison.OrdinalIgnoreCase):
|
case var _ when name.Equals("MPG Z890 CARBON WIFI (MS-7E17)", StringComparison.OrdinalIgnoreCase):
|
||||||
|
|||||||
@@ -416,6 +416,8 @@ internal class LpcIO
|
|||||||
case Model.B840M_GAMING_PLUS_WIFI6E:
|
case Model.B840M_GAMING_PLUS_WIFI6E:
|
||||||
case Model.B850_GAMING_PLUS_WIFI:
|
case Model.B850_GAMING_PLUS_WIFI:
|
||||||
case Model.B850_GAMING_PLUS_WIFI6E:
|
case Model.B850_GAMING_PLUS_WIFI6E:
|
||||||
|
case Model.B850_GAMING_PLUS_WIFI_PZ:
|
||||||
|
case Model.B850M_GAMING_PLUS_WIFI:
|
||||||
case Model.B850M_GAMING_PLUS_WIFI6E:
|
case Model.B850M_GAMING_PLUS_WIFI6E:
|
||||||
case Model.B850P_PRO_WIFI:
|
case Model.B850P_PRO_WIFI:
|
||||||
case Model.B850MA_PRO_WIFI:
|
case Model.B850MA_PRO_WIFI:
|
||||||
@@ -441,6 +443,7 @@ internal class LpcIO
|
|||||||
case Model.Z890_CARBON_WIFI:
|
case Model.Z890_CARBON_WIFI:
|
||||||
case Model.Z890_GAMING_PLUS_WIFI:
|
case Model.Z890_GAMING_PLUS_WIFI:
|
||||||
case Model.Z890_TOMAHAWK_WIFI:
|
case Model.Z890_TOMAHAWK_WIFI:
|
||||||
|
case Model.Z890_UNIFY_X:
|
||||||
case Model.Z890_EDGE_TI_WIFI:
|
case Model.Z890_EDGE_TI_WIFI:
|
||||||
case Model.Z890I_EDGE_TI_WIFI:
|
case Model.Z890I_EDGE_TI_WIFI:
|
||||||
case Model.Z890P_PRO_WIFI:
|
case Model.Z890P_PRO_WIFI:
|
||||||
|
|||||||
@@ -161,6 +161,8 @@ public enum Model
|
|||||||
B850M_MORTAR_WIFI,
|
B850M_MORTAR_WIFI,
|
||||||
B850_GAMING_PLUS_WIFI,
|
B850_GAMING_PLUS_WIFI,
|
||||||
B850_GAMING_PLUS_WIFI6E,
|
B850_GAMING_PLUS_WIFI6E,
|
||||||
|
B850_GAMING_PLUS_WIFI_PZ,
|
||||||
|
B850M_GAMING_PLUS_WIFI,
|
||||||
B850M_GAMING_PLUS_WIFI6E,
|
B850M_GAMING_PLUS_WIFI6E,
|
||||||
B840P_PRO_WIFI,
|
B840P_PRO_WIFI,
|
||||||
B840M_GAMING_PLUS_WIFI6E,
|
B840M_GAMING_PLUS_WIFI6E,
|
||||||
@@ -187,6 +189,7 @@ public enum Model
|
|||||||
Z890_TOMAHAWK_WIFI,
|
Z890_TOMAHAWK_WIFI,
|
||||||
Z890_CARBON_WIFI,
|
Z890_CARBON_WIFI,
|
||||||
Z890_EDGE_TI_WIFI,
|
Z890_EDGE_TI_WIFI,
|
||||||
|
Z890_UNIFY_X,
|
||||||
Z890I_EDGE_TI_WIFI,
|
Z890I_EDGE_TI_WIFI,
|
||||||
Z890P_PRO_WIFI,
|
Z890P_PRO_WIFI,
|
||||||
Z890A_PRO_WIFI,
|
Z890A_PRO_WIFI,
|
||||||
|
|||||||
@@ -704,6 +704,7 @@ internal sealed class SuperIOHardware : Hardware
|
|||||||
case Model.Z890_CARBON_WIFI:
|
case Model.Z890_CARBON_WIFI:
|
||||||
case Model.Z890_TOMAHAWK_WIFI:
|
case Model.Z890_TOMAHAWK_WIFI:
|
||||||
case Model.Z890_ACE:
|
case Model.Z890_ACE:
|
||||||
|
case Model.Z890_UNIFY_X:
|
||||||
v.Add(new Voltage("+12V", 0));
|
v.Add(new Voltage("+12V", 0));
|
||||||
v.Add(new Voltage("+5V", 1));
|
v.Add(new Voltage("+5V", 1));
|
||||||
v.Add(new Voltage("Vcore", 2));
|
v.Add(new Voltage("Vcore", 2));
|
||||||
|
|||||||
Reference in New Issue
Block a user