Commit 863488e3d0db738472c50facde2467015d4ab7b6
2011-09-11T12:32:36
Display fan percentage on devices that only support reporting percent and not RPM.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/main.c b/main.c
index 311954b..0f6cfd7 100644
--- a/main.c
+++ b/main.c
@@ -1818,12 +1818,15 @@ static void get_statline(char *buf, struct cgpu_info *cgpu)
int gpu = cgpu->cpu_gpu;
float gt = gpu_temp(gpu);
int gf = gpu_fanspeed(gpu);
+ int gp = gpu_fanpercent(gpu);
if (gt != -1)
tailsprintf(buf, "%.1fC ", gt);
if (gf != -1)
tailsprintf(buf, "%dRPM ", gf);
- if (gt || gf)
+ else if (gp != -1)
+ tailsprintf(buf, "%d%% ", gp);
+ if (gt > -1 || gf > -1 || gp > -1)
tailsprintf(buf, "| ");
}
#endif
@@ -1892,12 +1895,15 @@ static void curses_print_devstatus(int thr_id)
if (cgpu->has_adl) {
float gt = gpu_temp(gpu);
int gf = gpu_fanspeed(gpu);
+ int gp = gpu_fanpercent(gpu);
if (gt != -1)
wprintw(statuswin, "%.1fC ", gt);
if (gf != -1)
wprintw(statuswin, "%4dRPM ", gf);
- if (gt || gf)
+ else if (gp != -1)
+ wprintw(statuswin, "%2d%% ", gp);
+ if (gt > -1 || gf > -1 || gp > -1)
wprintw(statuswin, "| ");
}
#endif
@@ -3131,11 +3137,13 @@ retry:
strcpy(logline, ""); // In case it has no data
if (temp != -1)
sprintf(logline, "%.1f C ", temp);
- if (fanspeed != -1) {
+ if (fanspeed != -1 || fanpercent != -1) {
tailsprintf(logline, "F: ");
if (fanpercent != -1)
tailsprintf(logline, "%d%% ", fanpercent);
- tailsprintf(logline, "(%d RPM) ", fanspeed);
+ if (fanspeed != -1)
+ tailsprintf(logline, "(%d RPM) ", fanspeed);
+ tailsprintf(logline, " ");
}
if (engineclock != -1)
tailsprintf(logline, "E: %d MHz ", engineclock);