From 0f2965dbe7b67115f506504ffe52aff9bcffe7dd Mon Sep 17 00:00:00 2001 From: Frodo Looijaard Date: Thu, 22 Apr 1999 21:15:09 +0000 Subject: [PATCH] GL518SM: sensors program now prints the voltages if readall=1 git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@418 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/sensors/chips.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index a6af8021..1b664774 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -241,10 +241,15 @@ void print_gl518(const sensors_chip_name *name) actual readings! We hardcode this, as this is the easiest way. */ if (is_r00) { if (!sensors_get_label(*name,SENSORS_GL518R00_VDD,&label) && + !sensors_get_feature(*name,SENSORS_GL518R00_VDD,&cur) && !sensors_get_feature(*name,SENSORS_GL518R00_VDD_MIN,&min) && !sensors_get_feature(*name,SENSORS_GL518R00_VDD_MAX,&max)) { print_label(label,10); - printf("(n/a) (min = %+6.2f V, max = %+6.2f V) %s %s\n", + if (cur == 0.0) + printf("(n/a) "); + else + printf("%+6.2f V ",cur); + printf( "(min = %+6.2f V, max = %+6.2f V) %s %s\n", min,max,alarms&GL518_ALARM_VDD?"ALARM":" ", beeps&GL518_ALARM_VDD?"(beep)":""); } else @@ -252,20 +257,30 @@ void print_gl518(const sensors_chip_name *name) free_the_label(&label); if (!sensors_get_label(*name,SENSORS_GL518R00_VIN1,&label) && + !sensors_get_feature(*name,SENSORS_GL518R00_VIN1,&cur) && !sensors_get_feature(*name,SENSORS_GL518R00_VIN1_MIN,&min) && !sensors_get_feature(*name,SENSORS_GL518R00_VIN1_MAX,&max)) { print_label(label,10); - printf("(n/a) (min = %+6.2f V, max = %+6.2f V) %s %s\n", + if (cur == 0.0) + printf("(n/a) "); + else + printf("%+6.2f V ",cur); + printf("(min = %+6.2f V, max = %+6.2f V) %s %s\n", min,max,alarms&GL518_ALARM_VIN1?"ALARM":" ", beeps&GL518_ALARM_VIN1?"(beep)":""); } else printf("ERROR: Can't get VIN1 data!\n"); free_the_label(&label); if (!sensors_get_label(*name,SENSORS_GL518R00_VIN2,&label) && + !sensors_get_feature(*name,SENSORS_GL518R00_VIN2,&cur) && !sensors_get_feature(*name,SENSORS_GL518R00_VIN2_MIN,&min) && !sensors_get_feature(*name,SENSORS_GL518R00_VIN2_MAX,&max)) { print_label(label,10); - printf("(n/a) (min = %+6.2f V, max = %+6.2f V) %s %s\n", + if (cur == 0.0) + printf("(n/a) "); + else + printf("%+6.2f V ",cur); + printf("(min = %+6.2f V, max = %+6.2f V) %s %s\n", min,max,alarms&GL518_ALARM_VIN2?"ALARM":" ", beeps&GL518_ALARM_VIN2?"(beep)":""); } else