mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-17 19:30:26 +00:00
Merge pull request 'sensors: Add support for rated values' (#358) from cpackham-atlnz/rated-values into master
Reviewed-on: http://localhost:8888/hramrach/lm-sensors/pulls/358
This commit is contained in:
commit
fbdf135806
3 files changed
+18
No files matched your search
@@ -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,
|
||||
|
||||
@@ -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 }
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user