wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-28 12:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'sensors: Add support for rated values' (#358) from cpackham-atlnz/rated-values into master

Browse Source 
Reviewed-on: http://localhost:8888/hramrach/lm-sensors/pulls/358
This commit is contained in:
hramrach committed 2023-12-24 12:24:56 +01:00
2 parents fb35c5b4fa 88f6c5ec9b
commit fbdf135806
3 files changed
+18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/sensors.h
+6
View File
@@ -165,6 +165,8 @@ typedef enum sensors_subfeature_type {
SENSORS_SUBFEATURE_IN_AVERAGE,
SENSORS_SUBFEATURE_IN_LOWEST,
SENSORS_SUBFEATURE_IN_HIGHEST,
SENSORS_SUBFEATURE_IN_RATED_MIN,
SENSORS_SUBFEATURE_IN_RATED_MAX,
SENSORS_SUBFEATURE_IN_ALARM = (SENSORS_FEATURE_IN << 8) | 0x80,
SENSORS_SUBFEATURE_IN_MIN_ALARM,
SENSORS_SUBFEATURE_IN_MAX_ALARM,
@@ -219,6 +221,8 @@ typedef enum sensors_subfeature_type {
SENSORS_SUBFEATURE_POWER_CRIT,
SENSORS_SUBFEATURE_POWER_MIN,
SENSORS_SUBFEATURE_POWER_LCRIT,
SENSORS_SUBFEATURE_POWER_RATED_MIN,
SENSORS_SUBFEATURE_POWER_RATED_MAX,
SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL = (SENSORS_FEATURE_POWER << 8) | 0x80,
SENSORS_SUBFEATURE_POWER_ALARM,
SENSORS_SUBFEATURE_POWER_CAP_ALARM,
@@ -237,6 +241,8 @@ typedef enum sensors_subfeature_type {
SENSORS_SUBFEATURE_CURR_AVERAGE,
SENSORS_SUBFEATURE_CURR_LOWEST,
SENSORS_SUBFEATURE_CURR_HIGHEST,
SENSORS_SUBFEATURE_CURR_RATED_MIN,
SENSORS_SUBFEATURE_CURR_RATED_MAX,
SENSORS_SUBFEATURE_CURR_ALARM = (SENSORS_FEATURE_CURR << 8) | 0x80,
SENSORS_SUBFEATURE_CURR_MIN_ALARM,
SENSORS_SUBFEATURE_CURR_MAX_ALARM,
lib/sysfs.c
+6
View File
@@ -259,6 +259,8 @@ static const struct subfeature_type_match in_matches[] = {
{ "lcrit_alarm", SENSORS_SUBFEATURE_IN_LCRIT_ALARM },
{ "crit_alarm", SENSORS_SUBFEATURE_IN_CRIT_ALARM },
{ "beep", SENSORS_SUBFEATURE_IN_BEEP },
{ "rated_min", SENSORS_SUBFEATURE_IN_RATED_MIN },
{ "rated_max", SENSORS_SUBFEATURE_IN_RATED_MAX },
{ NULL, 0 }
};
@@ -296,6 +298,8 @@ static const struct subfeature_type_match power_matches[] = {
{ "crit_alarm", SENSORS_SUBFEATURE_POWER_CRIT_ALARM },
{ "lcrit_alarm", SENSORS_SUBFEATURE_POWER_LCRIT_ALARM },
{ "average_interval", SENSORS_SUBFEATURE_POWER_AVERAGE_INTERVAL },
{ "rated_min", SENSORS_SUBFEATURE_POWER_RATED_MIN },
{ "rated_max", SENSORS_SUBFEATURE_POWER_RATED_MAX },
{ NULL, 0 }
};
@@ -319,6 +323,8 @@ static const struct subfeature_type_match curr_matches[] = {
{ "lcrit_alarm", SENSORS_SUBFEATURE_CURR_LCRIT_ALARM },
{ "crit_alarm", SENSORS_SUBFEATURE_CURR_CRIT_ALARM },
{ "beep", SENSORS_SUBFEATURE_CURR_BEEP },
{ "rated_min", SENSORS_SUBFEATURE_CURR_RATED_MIN },
{ "rated_max", SENSORS_SUBFEATURE_CURR_RATED_MAX },
{ NULL, 0 }
};
prog/sensors/chips.c
+6
View File
@@ -434,6 +434,8 @@ static const struct sensor_subfeature_list voltage_sensors[] = {
{ SENSORS_SUBFEATURE_IN_AVERAGE, NULL, 0, "avg" },
{ SENSORS_SUBFEATURE_IN_LOWEST, NULL, 0, "lowest" },
{ SENSORS_SUBFEATURE_IN_HIGHEST, NULL, 0, "highest" },
{ SENSORS_SUBFEATURE_IN_RATED_MIN, NULL, 0, "rated min" },
{ SENSORS_SUBFEATURE_IN_RATED_MAX, NULL, 0, "rated max" },
{ -1, NULL, 0, NULL }
};
@@ -590,6 +592,8 @@ static const struct sensor_subfeature_list power_common_sensors[] = {
{ SENSORS_SUBFEATURE_POWER_LCRIT, NULL, 0, "lcrit" },
{ SENSORS_SUBFEATURE_POWER_CRIT, NULL, 0, "crit" },
{ SENSORS_SUBFEATURE_POWER_CAP, NULL, 0, "cap" },
{ SENSORS_SUBFEATURE_POWER_RATED_MIN, NULL, 0, "rated min" },
{ SENSORS_SUBFEATURE_POWER_RATED_MAX, NULL, 0, "rated max" },
{ -1, NULL, 0, NULL }
};
@@ -847,6 +851,8 @@ static const struct sensor_subfeature_list current_sensors[] = {
{ SENSORS_SUBFEATURE_CURR_AVERAGE, NULL, 0, "avg" },
{ SENSORS_SUBFEATURE_CURR_LOWEST, NULL, 0, "lowest" },
{ SENSORS_SUBFEATURE_CURR_HIGHEST, NULL, 0, "highest" },
{ SENSORS_SUBFEATURE_CURR_RATED_MIN, NULL, 0, "rated min" },
{ SENSORS_SUBFEATURE_CURR_RATED_MAX, NULL, 0, "rated max" },
{ -1, NULL, 0, NULL }
};