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

Merge pull request 'prog/sensors: Only do conversion to Fahrenheit on temperatures' (#359) from cpackham-atlnz/fahrenheit into master

Browse Source 
Reviewed-on: http://localhost:8888/hramrach/lm-sensors/pulls/359
This commit is contained in:
hramrach committed 2023-12-24 12:07:22 +01:00
2 parents e7ecb0b92f 488d20b783
commit d13de9c532
1 file changed
+8 -2
Download Patch File Download Diff File Expand all files Collapse all files
prog/sensors/chips.c
+8 -2
View File
@@ -46,6 +46,7 @@ void print_chip_raw(const sensors_chip_name *name)
const sensors_subfeature *sub;
char *label;
double val;
int is_temp;
a = 0;
while ((feature = sensors_get_features(name, &a))) {
@@ -59,6 +60,8 @@ void print_chip_raw(const sensors_chip_name *name)
b = 0;
while ((sub = sensors_get_all_subfeatures(name, feature, &b))) {
if (sub->flags & SENSORS_MODE_R) {
is_temp = feature->type == SENSORS_FEATURE_TEMP;
if ((err = sensors_get_value(name, sub->number,
&val)))
fprintf(stderr, "ERROR: Can't get "
@@ -66,7 +69,7 @@ void print_chip_raw(const sensors_chip_name *name)
sub->name,
sensors_strerror(err));
else {
if (fahrenheit)
if (is_temp && fahrenheit)
val = deg_ctof(val);
printf(" %s: %.3f\n", sub->name, val);
}
@@ -84,6 +87,7 @@ void print_chip_json(const sensors_chip_name *name)
const sensors_subfeature *sub;
char *label;
double val;
int is_temp;
a = 0;
cnt = 0;
@@ -101,6 +105,8 @@ void print_chip_json(const sensors_chip_name *name)
subCnt = 0;
while ((sub = sensors_get_all_subfeatures(name, feature, &b))) {
if (sub->flags & SENSORS_MODE_R) {
is_temp = feature->type == SENSORS_FEATURE_TEMP;
if ((err = sensors_get_value(name, sub->number,
&val))) {
fprintf(stderr, "ERROR: Can't get "
@@ -110,7 +116,7 @@ void print_chip_json(const sensors_chip_name *name)
} else {
if (subCnt > 0)
printf(",\n");
if (fahrenheit)
if (is_temp && fahrenheit)
val = deg_ctof(val);
printf(" \"%s\": %.3f", sub->name, val);
subCnt++;