Skip to content

Commit be69f79

Browse files
committed
Add detection for MSI MAG B850 Tomahawk Wifi
Handle two mainboards for NCT6687D with fan mapping for newer models.
1 parent cd673ba commit be69f79

4 files changed

Lines changed: 48 additions & 1 deletion

File tree

OpenHardwareMonitorLib/Hardware/Motherboard/Identification.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,8 @@ public static Model GetModel(string name)
701701
return Model.B850M_MORTAR;
702702
case var _ when name.Equals("MAG B850M MORTAR WIFI (MS-7E61)", StringComparison.OrdinalIgnoreCase):
703703
return Model.B850M_MORTAR_WIFI;
704+
case var _ when name.Equals("MAG B850 TOMAHAWK WIFI (MS-7E53)", StringComparison.OrdinalIgnoreCase):
705+
return Model.B850_TOMAHAWK_WIFI;
704706
case var _ when name.Equals("MAG B850 TOMAHAWK MAX WIFI (MS-7E62)", StringComparison.OrdinalIgnoreCase):
705707
return Model.B850_TOMAHAWK_MAX_WIFI;
706708
case var _ when name.Equals("MPG B850 EDGE TI WIFI (MS-7E62)", StringComparison.OrdinalIgnoreCase):

OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,6 @@ private bool DetectWinbondFintek(LpcPort port, Motherboard motherboard)
397397
case Model.B840P_PRO_WIFI:
398398
case Model.B840M_GAMING_PLUS_WIFI6E:
399399
case Model.B850_GAMING_PLUS_WIFI:
400-
case Model.B850_GAMING_PLUS_WIFI6E:
401400
case Model.B850_GAMING_PLUS_WIFI_PZ:
402401
case Model.B850M_GAMING_PLUS_WIFI:
403402
case Model.B850M_GAMING_PLUS_WIFI6E:

OpenHardwareMonitorLib/Hardware/Motherboard/Model.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public enum Model
155155
B850M_GAMING_PLUS_WIFI6E,
156156
B840P_PRO_WIFI,
157157
B840M_GAMING_PLUS_WIFI6E,
158+
B850_TOMAHAWK_WIFI,
158159
B850_TOMAHAWK_MAX_WIFI,
159160
B650M_PROJECT_ZERO,
160161
B850P_PRO_WIFI,

OpenHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,51 @@ private static void GetBoardSpecificConfiguration
578578

579579
break;
580580

581+
case Manufacturer.MSI when model == Model.B850_TOMAHAWK_WIFI: // NCT6687D
582+
case Manufacturer.MSI when model == Model.B850_GAMING_PLUS_WIFI6E: // NCT6687D
583+
v.Add(new Voltage("+12V", 0));
584+
v.Add(new Voltage("+5V", 1));
585+
v.Add(new Voltage("Vcore", 2));
586+
v.Add(new Voltage("Voltage #1", 3));
587+
v.Add(new Voltage("DIMM", 4));
588+
v.Add(new Voltage("CPU I/O", 5));
589+
v.Add(new Voltage("CPU System Agent", 6));
590+
v.Add(new Voltage("Voltage #2", 7));
591+
v.Add(new Voltage("AVCC3", 8));
592+
v.Add(new Voltage("CPU Termination", 9));
593+
v.Add(new Voltage("VRef", 10));
594+
v.Add(new Voltage("VSB", 11));
595+
v.Add(new Voltage("AVSB", 12));
596+
v.Add(new Voltage("CMOS Battery", 13));
597+
598+
t.Add(new Temperature("CPU", 0));
599+
t.Add(new Temperature("System", 1));
600+
t.Add(new Temperature("VRM MOS", 2));
601+
t.Add(new Temperature("PCH", 3));
602+
t.Add(new Temperature("CPU Socket", 4));
603+
t.Add(new Temperature("PCIe x1", 5));
604+
t.Add(new Temperature("M2 #1", 6));
605+
606+
f.Add(new Fan("CPU Fan", 0));
607+
f.Add(new Fan("Pump Fan", 1));
608+
f.Add(new Fan("System Fan #1", 15));
609+
f.Add(new Fan("System Fan #2", 14));
610+
f.Add(new Fan("System Fan #3", 13));
611+
f.Add(new Fan("System Fan #4", 12));
612+
f.Add(new Fan("System Fan #5", 11));
613+
f.Add(new Fan("System Fan #6", 10));
614+
615+
c.Add(new Control("CPU Fan", 0));
616+
c.Add(new Control("Pump Fan", 1));
617+
c.Add(new Control("System Fan #1", 2));
618+
c.Add(new Control("System Fan #2", 3));
619+
c.Add(new Control("System Fan #3", 4));
620+
c.Add(new Control("System Fan #4", 5));
621+
c.Add(new Control("System Fan #5", 6));
622+
c.Add(new Control("System Fan #6", 7));
623+
624+
break;
625+
581626
default:
582627
v.Add(new Voltage("+12V", 0));
583628
v.Add(new Voltage("+5V", 1));

0 commit comments

Comments
 (0)