Skip to content

Commit 9e9d852

Browse files
committed
Merge remote-tracking branch 'lib/master'
# Conflicts: # .gitignore # LibreHardwareMonitor/UI/MainForm.Designer.cs # LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj # OpenHardwareMonitor/OpenHardwareMonitor.csproj # OpenHardwareMonitor/UI/MainForm.cs # OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs
2 parents 8877806 + 8036ea2 commit 9e9d852

8 files changed

Lines changed: 41 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
[Oo]bj/
55
.idea/
66
.vs/
7+
.vscode/
78
packages/
89
FodyWeavers.xsd

OpenHardwareMonitor/UI/MainForm.Designer.cs

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

OpenHardwareMonitor/UI/MainForm.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -997,6 +997,16 @@ private void ResetMinMaxMenuItem_Click(object sender, EventArgs e)
997997
}));
998998
}
999999

1000+
private void ExpandAllNodes_Click(object sender, EventArgs e)
1001+
{
1002+
treeView.ExpandAll();
1003+
}
1004+
1005+
private void CollapsepAllNodes_Click(object sender, EventArgs e)
1006+
{
1007+
treeView.CollapseAll();
1008+
}
1009+
10001010
private void MainForm_MoveOrResize(object sender, EventArgs e)
10011011
{
10021012
if (WindowState != FormWindowState.Minimized)

OpenHardwareMonitorLib/Hardware/Motherboard/Identification.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,8 @@ public static Model GetModel(string name)
681681
return Model.Z890P_PRO_WIFI;
682682
case var _ when name.Equals("PRO Z890-A WIFI (MS-7E32)", StringComparison.OrdinalIgnoreCase):
683683
return Model.Z890A_PRO_WIFI;
684+
case var _ when name.Equals("PRO Z890-S WIFI (MS-7E54)", StringComparison.OrdinalIgnoreCase):
685+
return Model.Z890S_PRO_WIFI;
684686
case var _ when name.Equals("Z890 GAMING PLUS WIFI (MS-7E34)", StringComparison.OrdinalIgnoreCase):
685687
return Model.Z890_GAMING_PLUS_WIFI;
686688
case var _ when name.Equals("PRO Z890-S WIFI PZ (MS-7E58)", StringComparison.OrdinalIgnoreCase):

OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public IT87XX(Chip chip, ushort address, ushort gpioAddress, byte version, Mothe
6969
{
7070
Chip.IT8665E or Chip.IT8625E => new byte[] { 0x15, 0x16, 0x17, 0x1e, 0x1f, 0x92 },
7171
Chip.IT8792E => new byte[] { 0x15, 0x16, 0x17 },
72-
Chip.IT8696E => new byte[] { 0, 0, 0, 0, 0 },
72+
Chip.IT8696E when motherboard.Model == Model.X870_AORUS_ELITE_WIFI7 => new byte[] { 0, 0, 0, 0, 0, 0 },
7373
_ => new byte[] { 0x15, 0x16, 0x17, 0x7f, 0xa7, 0xaf }
7474
};
7575

@@ -156,8 +156,8 @@ Chip.IT8631E or
156156
case Chip.IT8696E:
157157
Voltages = new float?[10];
158158
Temperatures = new float?[6];
159-
Fans = new float?[5];
160-
Controls = new float?[5];
159+
Fans = new float?[6];
160+
Controls = new float?[6];
161161
break;
162162

163163
case Chip.IT87952E:

OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ private bool DetectWinbondFintek(LpcPort port, Motherboard motherboard)
405405
case Model.Z890_EDGE_TI_WIFI:
406406
case Model.Z890P_PRO_WIFI:
407407
case Model.Z890A_PRO_WIFI:
408+
case Model.Z890S_PRO_WIFI:
408409
chip = Chip.NCT6687DR; // MSI AM5/LGA1851 Compatibility
409410
break;
410411
default:

OpenHardwareMonitorLib/Hardware/Motherboard/Model.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ public enum Model
154154
Z890_EDGE_TI_WIFI,
155155
Z890P_PRO_WIFI,
156156
Z890A_PRO_WIFI,
157+
Z890S_PRO_WIFI,
157158
Z890_GAMING_PLUS_WIFI,
158159
Z890S_PRO_WIFI_PROJECT_ZERO,
159160

OpenHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,7 @@ private static void GetBoardSpecificConfiguration
622622
case Model.Z890_EDGE_TI_WIFI:
623623
case Model.Z890P_PRO_WIFI:
624624
case Model.Z890A_PRO_WIFI:
625+
case Model.Z890S_PRO_WIFI:
625626
case Model.Z890_GAMING_PLUS_WIFI:
626627
case Model.Z890S_PRO_WIFI_PROJECT_ZERO:
627628
v.Add(new Voltage("+12V", 0));

0 commit comments

Comments
 (0)