From 3b1c1cbd123184e2dfc6d38bee0410b4c3ca2fb3 Mon Sep 17 00:00:00 2001
From: Alcolawl <5004749+Alcolawl@users.noreply.github.com>
Date: Thu, 17 Jul 2025 07:30:56 -0400
Subject: [PATCH] Add support for three additional MSI motherboards (#1791)

* Add Support for MSI B840P PRO WIFI

* Rectify loop mathematical operator syntax

* Add support for two additional motherboards

Z890 Gaming Plus Wifi and Pro Z890-S Wifi Project Zero
---
 .../Hardware/Motherboard/Identification.cs                    | 4 ++++
 LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs     | 2 ++
 LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs         | 2 ++
 .../Hardware/Motherboard/SuperIOHardware.cs                   | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs
index d671178..63eb4d4 100755
--- a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs
+++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs
@@ -681,6 +681,10 @@ internal class Identification
                 return Model.Z890P_PRO_WIFI;
             case var _ when name.Equals("PRO Z890-A WIFI (MS-7E32)", StringComparison.OrdinalIgnoreCase):
                 return Model.Z890A_PRO_WIFI;
+            case var _ when name.Equals("Z890 GAMING PLUS WIFI (MS-7E34)", StringComparison.OrdinalIgnoreCase):
+                return Model.Z890_GAMING_PLUS_WIFI;
+            case var _ when name.Equals("PRO Z890-S WIFI PZ (MS-7E58)", StringComparison.OrdinalIgnoreCase):
+                return Model.Z890S_PRO_WIFI_PROJECT_ZERO;
             case var _ when name.Equals("B850M Steel Legend WiFi", StringComparison.OrdinalIgnoreCase):
                 return Model.B850M_STEEL_LEGEND_WIFI;
             case var _ when name.Equals("Base Board Product Name", StringComparison.OrdinalIgnoreCase):
diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs
index 95f6d89..b887a5f 100644
--- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs
+++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs
@@ -411,6 +411,8 @@ internal class LpcIO
                             case Model.Z890_EDGE_TI_WIFI:
                             case Model.Z890P_PRO_WIFI:
                             case Model.Z890A_PRO_WIFI:
+                            case Model.Z890_GAMING_PLUS_WIFI:
+                            case Model.Z890S_PRO_WIFI_PROJECT_ZERO:
                                 chip = Chip.NCT6687DR; // MSI AM5/LGA1851 Compatibility
                                 break;
                             default:
diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs
index e0bc6ac..d47223c 100755
--- a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs
+++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs
@@ -161,6 +161,8 @@ public enum Model
     Z890_EDGE_TI_WIFI,
     Z890P_PRO_WIFI,
     Z890A_PRO_WIFI,
+    Z890_GAMING_PLUS_WIFI,
+    Z890S_PRO_WIFI_PROJECT_ZERO,
 
     // EVGA
     X58_SLI_Classified,
diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs
index 4421f3c..4accd45 100755
--- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs
+++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs
@@ -628,6 +628,8 @@ internal sealed class SuperIOHardware : Hardware
                     case Model.Z890_EDGE_TI_WIFI:
                     case Model.Z890P_PRO_WIFI:
                     case Model.Z890A_PRO_WIFI:
+                    case Model.Z890_GAMING_PLUS_WIFI:
+                    case Model.Z890S_PRO_WIFI_PROJECT_ZERO:
                         v.Add(new Voltage("+12V", 0));
                         v.Add(new Voltage("+5V", 1));
                         v.Add(new Voltage("Vcore", 2));