Skip to content

Commit

Permalink
Add Gigabyte Z790: UD (AC), Gaming X (AX), AORUS Pro X (WIFI7) (Libre…
Browse files Browse the repository at this point in the history 
…HardwareMonitor#1468)

* Add Gigabyte Z790 UD (AC) and Gaming X (AX)

* Add Z790 Aorus Pro X

* Fix data entry placement and put more consistent Namings

* Add voltages to second SuperIO chip

* Don’t hide by default
  • Loading branch information
@Tellinq
Tellinq authored Sep 27, 2024
1 parent b665144 commit 41bf278
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 20 deletions.
11 changes: 11 additions & 0 deletions LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,17 @@ public static Model GetModel(string name)
return Model.Z690_AORUS_MASTER;
case var _ when name.Equals("Z690 GAMING X DDR4", StringComparison.OrdinalIgnoreCase):
return Model.Z690_GAMING_X_DDR4;
case var _ when name.Equals("Z790 AORUS PRO X", StringComparison.OrdinalIgnoreCase):
case var _ when name.Equals("Z790 AORUS PRO X WIFI7", StringComparison.OrdinalIgnoreCase):
return Model.Z790_AORUS_PRO_X;
case var _ when name.Equals("Z790 UD", StringComparison.OrdinalIgnoreCase):
return Model.Z790_UD;
case var _ when name.Equals("Z790 UD AC", StringComparison.OrdinalIgnoreCase):
return Model.Z790_UD_AC;
case var _ when name.Equals("Z790 GAMING X", StringComparison.OrdinalIgnoreCase):
return Model.Z790_GAMING_X;
case var _ when name.Equals("Z790 GAMING X AX", StringComparison.OrdinalIgnoreCase):
return Model.Z790_GAMING_X_AX;
case var _ when name.Equals("FH67", StringComparison.OrdinalIgnoreCase):
return Model.FH67;
case var _ when name.Equals("AX370-Gaming K7", StringComparison.OrdinalIgnoreCase):
Expand Down
5 changes: 5 additions & 0 deletions LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,11 @@ public enum Model
Z690_AORUS_ULTRA,
Z690_AORUS_MASTER,
Z690_GAMING_X_DDR4,
Z790_AORUS_PRO_X,
Z790_UD,
Z790_UD_AC,
Z790_GAMING_X,
Z790_GAMING_X_AX,
Z170N_WIFI,
B450_AORUS_M,
B450_AORUS_PRO,
Expand Down
83 changes: 63 additions & 20 deletions LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,7 @@ private static void GetIteConfigurationsB(ISuperIO superIO, Manufacturer manufac
v.Add(new Voltage("+5V", 3, 15f, 10f));
v.Add(new Voltage("Vcore SoC", 4));
v.Add(new Voltage("Vcore Misc", 5));
v.Add(new Voltage("VIN6", 6));
v.Add(new Voltage("Dual DDR5 5V", 6, 1.5f, 1));
v.Add(new Voltage("+3V Standby", 7, 10f, 10f));
v.Add(new Voltage("CMOS Battery", 8, 10f, 10f));
v.Add(new Voltage("AVCC3", 9, 59.9f, 9.8f));
Expand Down Expand Up @@ -1788,6 +1788,39 @@ private static void GetIteConfigurationsB(ISuperIO superIO, Manufacturer manufac

break;

case Model.Z790_UD: // ITE IT8689E
case Model.Z790_UD_AC: // ITE IT8689E
case Model.Z790_GAMING_X: // ITE IT8689E
case Model.Z790_GAMING_X_AX: // ITE IT8689E
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+3.3V", 1, 6.49f, 10));
v.Add(new Voltage("+12V", 2, 5f, 1));
v.Add(new Voltage("+5V", 3, 1.5f, 1));
v.Add(new Voltage("iGPU", 4));
v.Add(new Voltage("CPU Input Auxiliary", 5));
v.Add(new Voltage("Dual DDR5 5V", 6, 1.5f, 1));
v.Add(new Voltage("+3V Standby", 7, 1, 1));
v.Add(new Voltage("CMOS Battery", 8, 1, 1));
v.Add(new Voltage("AVCC3", 9, true));
t.Add(new Temperature("System #1", 0));
t.Add(new Temperature("Chipset", 1));
t.Add(new Temperature("CPU", 2));
t.Add(new Temperature("PCIe x16", 3));
t.Add(new Temperature("VRM MOS", 4));
t.Add(new Temperature("System #2", 5));
f.Add(new Fan("CPU Fan", 0));
f.Add(new Fan("System Fan #1", 1));
f.Add(new Fan("System Fan #2", 2));
f.Add(new Fan("System Fan #3 / Pump", 3));
f.Add(new Fan("CPU Optional Fan", 4));
c.Add(new Control("CPU Fan", 0));
c.Add(new Control("System Fan #1", 1));
c.Add(new Control("System Fan #2", 2));
c.Add(new Control("System Fan #3 / Pump", 3));
c.Add(new Control("CPU Optional Fan", 4));
break;

case Model.Z790_AORUS_PRO_X: // ITE IT8689E
case Model.Z690_AORUS_PRO:
case Model.Z690_AORUS_ULTRA: // ITE IT8689E
case Model.Z690_AORUS_MASTER: // ITE IT8689E
Expand All @@ -1797,7 +1830,7 @@ private static void GetIteConfigurationsB(ISuperIO superIO, Manufacturer manufac
v.Add(new Voltage("+5V", 3, 1.5f, 1));
v.Add(new Voltage("iGPU VAXG", 4));
v.Add(new Voltage("CPU Input Auxiliary", 5));
v.Add(new Voltage("Voltage #6", 6, true));
v.Add(new Voltage("Dual DDR5 5V", 6, 1.5f, 1));
v.Add(new Voltage("+3V Standby", 7, 1f, 1f));
v.Add(new Voltage("CMOS Battery", 8, 1f, 1f));
v.Add(new Voltage("AVCC3", 9, true));
Expand All @@ -1806,16 +1839,16 @@ private static void GetIteConfigurationsB(ISuperIO superIO, Manufacturer manufac
t.Add(new Temperature("CPU", 2));
t.Add(new Temperature("PCIe x16", 3));
t.Add(new Temperature("VRM MOS", 4));
t.Add(new Temperature("EC_TEMP1", 5));
t.Add(new Temperature("External #1", 5));
f.Add(new Fan("CPU Fan", 0));
f.Add(new Fan("System Fan #1", 1));
f.Add(new Fan("System Fan #2", 2));
f.Add(new Fan("System Fan #3", 3));
f.Add(new Fan("System Fan #3 / Pump", 3));
f.Add(new Fan("CPU Optional Fan", 4));
c.Add(new Control("CPU Fan", 0));
c.Add(new Control("System Fan #1", 1));
c.Add(new Control("System Fan #2", 2));
c.Add(new Control("System Fan #3", 3));
c.Add(new Control("System Fan #3 / Pump", 3));
c.Add(new Control("CPU Optional Fan", 4));
break;

Expand Down Expand Up @@ -2272,11 +2305,11 @@ private static void GetIteConfigurationsC(ISuperIO superIO, Manufacturer manufac
t.Add(new Temperature("PCIe x8", 0));
t.Add(new Temperature("External #2", 1));
t.Add(new Temperature("System #2", 2));
f.Add(new Fan("System Fan #5 Pump", 0));
f.Add(new Fan("System Fan #6 Pump", 1));
f.Add(new Fan("System Fan #5 / Pump", 0));
f.Add(new Fan("System Fan #6 / Pump", 1));
f.Add(new Fan("System Fan #4", 2));
c.Add(new Control("System Fan #5 Pump", 0));
c.Add(new Control("System Fan #6 Pump", 1));
c.Add(new Control("System Fan #5 / Pump", 0));
c.Add(new Control("System Fan #6 / Pump", 1));
c.Add(new Control("System Fan #4", 2));

break;
Expand Down Expand Up @@ -2312,27 +2345,37 @@ private static void GetIteConfigurationsC(ISuperIO superIO, Manufacturer manufac
v.Add(new Voltage("+3V Standby", 7, 1f, 1f));
v.Add(new Voltage("CMOS Battery", 8, 1f, 1f));
t.Add(new Temperature("PCIe x8", 0));
t.Add(new Temperature("EC_TEMP2", 1));
t.Add(new Temperature("External #2", 1));
t.Add(new Temperature("System #2", 2));
f.Add(new Fan("System Fan #5 Pump", 0));
f.Add(new Fan("System Fan #6 Pump", 1));
f.Add(new Fan("System Fan #5 / Pump", 0));
f.Add(new Fan("System Fan #6 / Pump", 1));
f.Add(new Fan("System Fan #4", 2));
c.Add(new Control("Fan #5", 0));
c.Add(new Control("Fan #6", 1));
c.Add(new Control("Fan #4", 2));
c.Add(new Control("System Fan #5 / Pump", 0));
c.Add(new Control("System Fan #6 / Pump", 1));
c.Add(new Control("System Fan #4", 2));

break;

case Model.Z790_AORUS_PRO_X: // ITE IT87952E
case Model.Z690_AORUS_PRO:
case Model.Z690_AORUS_MASTER: // ITE IT87952E
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM I/O", 1));
v.Add(new Voltage("Chipset +0.82V", 2));
v.Add(new Voltage("Voltage #4", 3, true));
v.Add(new Voltage("CPU System Agent", 4));
v.Add(new Voltage("Chipset +1.8V", 5));
v.Add(new Voltage("Voltage #7", 6, true));
v.Add(new Voltage("+3V Standby", 7, 10, 10));
v.Add(new Voltage("CMOS Battery", 8, 10, 10));
t.Add(new Temperature("PCIe x4", 0));
t.Add(new Temperature("EC_TEMP2", 1));
t.Add(new Temperature("External #2", 1));
t.Add(new Temperature("System #2", 2));
f.Add(new Fan("System Fan #5 Pump", 0));
f.Add(new Fan("System Fan #6 Pump", 1));
f.Add(new Fan("System Fan #5 / Pump", 0));
f.Add(new Fan("System Fan #6 / Pump", 1));
f.Add(new Fan("System Fan #4", 2));
c.Add(new Control("System Fan #5 Pump", 0));
c.Add(new Control("System Fan #6 Pump", 1));
c.Add(new Control("System Fan #5 / Pump", 0));
c.Add(new Control("System Fan #6 / Pump", 1));
c.Add(new Control("System Fan #4", 2));
break;

Expand Down

0 comments on commit 41bf278

Please sign in to comment.