GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-02 10:04:33 +00:00
Code Issues Releases Wiki Activity

Display fan percentage on devices that only support reporting percent and not RPM.

Browse Source
This commit is contained in:
Con Kolivas 2011-09-11 12:32:36 +10:00
parent d42211f09a
commit 863488e3d0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.c
View File

@ -1818,12 +1818,15 @@ static void get_statline(char *buf, struct cgpu_info *cgpu)
int gpu = cgpu->cpu_gpu; int gpu = cgpu->cpu_gpu;
float gt = gpu_temp(gpu); float gt = gpu_temp(gpu);
int gf = gpu_fanspeed(gpu); int gf = gpu_fanspeed(gpu);
int gp = gpu_fanpercent(gpu);
if (gt != -1) if (gt != -1)
tailsprintf(buf, "%.1fC ", gt); tailsprintf(buf, "%.1fC ", gt);
if (gf != -1) if (gf != -1)
tailsprintf(buf, "%dRPM ", gf); tailsprintf(buf, "%dRPM ", gf);
if (gt || gf) else if (gp != -1)
tailsprintf(buf, "%d%% ", gp);
if (gt > -1 || gf > -1 || gp > -1)
tailsprintf(buf, "| "); tailsprintf(buf, "| ");
} }
#endif #endif
@ -1892,12 +1895,15 @@ static void curses_print_devstatus(int thr_id)
if (cgpu->has_adl) { if (cgpu->has_adl) {
float gt = gpu_temp(gpu); float gt = gpu_temp(gpu);
int gf = gpu_fanspeed(gpu); int gf = gpu_fanspeed(gpu);
int gp = gpu_fanpercent(gpu);
if (gt != -1) if (gt != -1)
wprintw(statuswin, "%.1fC ", gt); wprintw(statuswin, "%.1fC ", gt);
if (gf != -1) if (gf != -1)
wprintw(statuswin, "%4dRPM ", gf); wprintw(statuswin, "%4dRPM ", gf);
if (gt || gf) else if (gp != -1)
wprintw(statuswin, "%2d%% ", gp);
if (gt > -1 || gf > -1 || gp > -1)
wprintw(statuswin, "| "); wprintw(statuswin, "| ");
} }
#endif #endif
@ -3131,11 +3137,13 @@ retry:
strcpy(logline, ""); // In case it has no data strcpy(logline, ""); // In case it has no data
if (temp != -1) if (temp != -1)
sprintf(logline, "%.1f C ", temp); sprintf(logline, "%.1f C ", temp);
if (fanspeed != -1) { if (fanspeed != -1 || fanpercent != -1) {
tailsprintf(logline, "F: "); tailsprintf(logline, "F: ");
if (fanpercent != -1) if (fanpercent != -1)
tailsprintf(logline, "%d%% ", fanpercent); tailsprintf(logline, "%d%% ", fanpercent);
tailsprintf(logline, "(%d RPM) ", fanspeed); if (fanspeed != -1)
tailsprintf(logline, "(%d RPM) ", fanspeed);
tailsprintf(logline, " ");
} }
if (engineclock != -1) if (engineclock != -1)
tailsprintf(logline, "E: %d MHz ", engineclock); tailsprintf(logline, "E: %d MHz ", engineclock);