From ab6981263159b8d1e100dfc8b931ceb3f2bf4503 Mon Sep 17 00:00:00 2001 From: Samuel FORESTIER Date: Wed, 21 Aug 2019 20:28:36 +0200 Subject: [PATCH] Fixes missing Fahrenheit conversion with raw output enabled --- prog/sensors/chips.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index 83264c9c..0eb07418 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -34,6 +34,11 @@ static void scale_value(double *value, const char **prefixstr); +static inline double deg_ctof(double cel) +{ + return cel * (9.0F / 5.0F) + 32.0F; +} + void print_chip_raw(const sensors_chip_name *name) { int a, b, err; @@ -60,8 +65,11 @@ void print_chip_raw(const sensors_chip_name *name) "value of subfeature %s: %s\n", sub->name, sensors_strerror(err)); - else + else { + if (fahrenheit) + val = deg_ctof(val); printf(" %s: %.3f\n", sub->name, val); + } } else printf("(%s)\n", label); } @@ -69,11 +77,6 @@ void print_chip_raw(const sensors_chip_name *name) } } -static inline double deg_ctof(double cel) -{ - return cel * (9.0F / 5.0F) + 32.0F; -} - void print_chip_json(const sensors_chip_name *name) { int a, b, cnt, subCnt, err;