moosecrap/evga-icx
1
0
Fork 0
Code Issues Pull Requests Releases 5 Activity

Compare commits

base: moosecrap:7b80a78763ceaa488d6503221e1ec4fd35a54ccd
Branches Tags
moosecrap:master
moosecrap:v2.1.2
moosecrap:v2.1.1
moosecrap:v2.1
moosecrap:v2.0
moosecrap:v1.0
...
compare: moosecrap:c64518531deef6b6ef8f6c2e808301adf996a930
Branches Tags
moosecrap:master
moosecrap:v2.1.2
moosecrap:v2.1.1
moosecrap:v2.1
moosecrap:v2.0
moosecrap:v1.0

2 Commits
7b80a78763 ... c64518531d

Author SHA1 Message Date
moosecrap
c64518531d Nomenclature fix in board sensors 2025-03-20 12:50:51 -07:00
moosecrap
6041c13bb9 Switch to fixed-width integer types for iCX3 structs. 2025-03-20 12:49:35 -07:00
2 changed files with 29 additions and 28 deletions
Show Stats Expand all files Collapse all files

28
board-sensors.h
View File

@ -20,14 +20,14 @@ static struct hwmon_sensor hwmon_sensor_info[] =
{ {
{"zenpower", "temp1", "CPU ", "CPU", "°C", 1000.0, -40.0 }, /* Tdie */ {"zenpower", "temp1", "CPU ", "CPU", "°C", 1000.0, -40.0 }, /* Tdie */
{"asusec", "temp2", "Motherboard ", "CPU", "°C", 1000.0, -40.0 }, /* CPU */ {"asusec", "temp2", "Motherboard ", "CPU", "°C", 1000.0, -40.0 }, /* CPU */
{"zenpower", "temp3", "CPU ", "CCX", "°C", 1000.0, -40.0 }, /* Tccd1 */ {"zenpower", "temp3", "CPU ", "CCD", "°C", 1000.0, -40.0 }, /* Tccd1 */
{"zenpower", "temp4", "CPU ", "CCX", "°C", 1000.0, -40.0 }, /* Tccd2 */ {"zenpower", "temp4", "CPU ", "CCD", "°C", 1000.0, -40.0 }, /* Tccd2 */
{"zenpower", "temp5", "CPU ", "CCX", "°C", 1000.0, -40.0 }, /* Tccd3 */ {"zenpower", "temp5", "CPU ", "CCD", "°C", 1000.0, -40.0 }, /* Tccd3 */
{"zenpower", "temp6", "CPU ", "CCX", "°C", 1000.0, -40.0 }, /* Tccd4 */ {"zenpower", "temp6", "CPU ", "CCD", "°C", 1000.0, -40.0 }, /* Tccd4 */
{"zenpower", "temp7", "CPU ", "CCX", "°C", 1000.0, -40.0 }, /* Tccd5 */ {"zenpower", "temp7", "CPU ", "CCD", "°C", 1000.0, -40.0 }, /* Tccd5 */
{"zenpower", "temp8", "CPU ", "CCX", "°C", 1000.0, -40.0 }, /* Tccd6 */ {"zenpower", "temp8", "CPU ", "CCD", "°C", 1000.0, -40.0 }, /* Tccd6 */
{"zenpower", "temp9", "CPU ", "CCX", "°C", 1000.0, -40.0 }, /* Tccd7 */ {"zenpower", "temp9", "CPU ", "CCD", "°C", 1000.0, -40.0 }, /* Tccd7 */
{"zenpower", "temp10", "CPU ", "CCX", "°C", 1000.0, -40.0 }, /* Tccd8 */ {"zenpower", "temp10", "CPU ", "CCD", "°C", 1000.0, -40.0 }, /* Tccd8 */
{"zen-rapl", "", "CPU ", "POW", " W", 0.0, 0.0 }, /* Zen RAPL placeholder */ {"zen-rapl", "", "CPU ", "POW", " W", 0.0, 0.0 }, /* Zen RAPL placeholder */
{"asusec", "temp1", "Motherboard ", "CHIP", "°C", 1000.0, -40.0 }, /* Chipset */ {"asusec", "temp1", "Motherboard ", "CHIP", "°C", 1000.0, -40.0 }, /* Chipset */
{"asusec", "temp5", "Motherboard ", "VRM", "°C", 1000.0, -40.0 }, /* VRM */ {"asusec", "temp5", "Motherboard ", "VRM", "°C", 1000.0, -40.0 }, /* VRM */
@ -36,12 +36,12 @@ static struct hwmon_sensor hwmon_sensor_info[] =
{"asusec", "temp6", "Motherboard ", "H2O", "°C", 1000.0, -40.0 }, /* Water_In */ {"asusec", "temp6", "Motherboard ", "H2O", "°C", 1000.0, -40.0 }, /* Water_In */
{"asusec", "temp7", "Motherboard ", "H2O", "°C", 1000.0, -40.0 }, /* Water_Out */ {"asusec", "temp7", "Motherboard ", "H2O", "°C", 1000.0, -40.0 }, /* Water_Out */
{"nvme", "temp1", "NVMe ", "NVME", "°C", 1000.0, -40.0 }, /* NVME Composite */ {"nvme", "temp1", "NVMe ", "NVME", "°C", 1000.0, -40.0 }, /* NVME Composite */
{"nct6798", "fan2", "CPU fan", "CPU", "%", 15.0, 0.0 }, /* cpu_fan */ {"nct6798", "fan2", "CPU fan", "CPU", "%", 15.0, 0.0 }, /* cpu_fan, cpu mid */
{"asusec", "fan1", "", "CPU", "%", 15.0, 0.0 }, /* cpu_opt */ {"asusec", "fan1", "", "CPU", "%", 15.0, 0.0 }, /* cpu_opt, cpu front */
{"nct6798", "fan1", "Chassis 1", "CHA", "%", 12.0, 0.0 }, /* cha1? */ {"nct6798", "fan5", "H amp", "CHA", "%", 12.0, 0.0 }, /* h_amp, front fan */
{"nct6798", "fan3", "Chassis 2", "CHA", "%", 12.0, 0.0 }, /* cha2? */ {"nct6798", "fan3", "Chassis 2", "CHA", "%", 12.0, 0.0 }, /* cha2, top front */
{"nct6798", "fan4", "Chassis 3", "CHA", "%", 13.0, 0.0 }, /* cha3 */ {"nct6798", "fan1", "Chassis 1", "CHA", "%", 12.0, 0.0 }, /* cha1, top rear */
{"nct6798", "fan5", "H amp", "CHA", "%", 12.0, 0.0 }, /* h_amp? */ {"nct6798", "fan4", "Chassis 3", "CHA", "%", 13.0, 0.0 }, /* cha3, rear */
{"nct6798", "fan6", "AIO pump", "CHA", "%", 12.0, 0.0 }, /* aio_pump? */ {"nct6798", "fan6", "AIO pump", "CHA", "%", 12.0, 0.0 }, /* aio_pump? */
{"nct6798", "fan7", "W pump", "CHA", "%", 12.0, 0.0 }, /* w_pump+? */ {"nct6798", "fan7", "W pump", "CHA", "%", 12.0, 0.0 }, /* w_pump+? */
{"asusec", "fan2", "", "CHIP", "%", 35.0, 0.0 }, /* chipset */ {"asusec", "fan2", "", "CHIP", "%", 35.0, 0.0 }, /* chipset */

29
icx3.h
View File

@ -1,6 +1,7 @@
#ifndef ICX3_H #ifndef ICX3_H
#define ICX3_H #define ICX3_H
#include <stdint.h>
#include "evga-card.h" #include "evga-card.h"
#define ICX3_I2C_ADDR 0x2D #define ICX3_I2C_ADDR 0x2D
@ -22,26 +23,26 @@
#define ICX3_WRITE_DISABLED 0xFE #define ICX3_WRITE_DISABLED 0xFE
struct icx3_fan_control { struct icx3_fan_control {
unsigned char length; uint8_t length;
unsigned char fanmode; uint8_t fanmode;
unsigned short rpm_offset; uint16_t rpm_offset;
unsigned char duty; uint8_t duty;
unsigned char duty_status; uint8_t duty_status;
unsigned short rpm_status; uint16_t rpm_status;
}; };
struct icx3_temp_sensors { struct icx3_temp_sensors {
unsigned char length; uint8_t length;
unsigned char data[18]; uint8_t data[18];
}; };
struct icx3_info { struct icx3_info {
unsigned char length; uint8_t length;
unsigned char reserved; uint8_t reserved;
unsigned char slave_address; uint8_t slave_address;
unsigned char product_id; uint8_t product_id;
unsigned char major_version; uint8_t major_version;
unsigned char minor_version; uint8_t minor_version;
}; };
enum icx3_product_id { enum icx3_product_id {