GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-30 08:24:26 +00:00
Code Issues Releases Wiki Activity

Try to align device outputs in curses output.

Browse Source
This commit is contained in:
Con Kolivas 2011-12-27 14:53:14 +11:00
parent 2257b5023a
commit 9f41f2f341
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.c
View File

@ -2081,13 +2081,16 @@ static void curses_print_devstatus(int thr_id)
int gp = gpu_fanpercent(gpu); int gp = gpu_fanpercent(gpu);
if (gt != -1) if (gt != -1)
wprintw(statuswin, "%.1fC ", gt); wprintw(statuswin, "%5.1fC ", gt);
else
wprintw(statuswin, " ");
if (gf != -1) if (gf != -1)
wprintw(statuswin, "%4dRPM ", gf); wprintw(statuswin, "%4dRPM ", gf);
else if (gp != -1) else if (gp != -1)
wprintw(statuswin, "%2d%% ", gp); wprintw(statuswin, "%3d%% ", gp);
if (gt > -1 || gf > -1 || gp > -1) else
wprintw(statuswin, "| "); wprintw(statuswin, " ");
wprintw(statuswin, "| ");
} }
#endif #endif
if (cgpu->status == LIFE_DEAD) if (cgpu->status == LIFE_DEAD)
@ -2095,10 +2098,10 @@ static void curses_print_devstatus(int thr_id)
else if (cgpu->status == LIFE_SICK) else if (cgpu->status == LIFE_SICK)
wprintw(statuswin, "SICK "); wprintw(statuswin, "SICK ");
else if (!gpu_devices[gpu]) else if (!gpu_devices[gpu])
wprintw(statuswin, "DISABLED "); wprintw(statuswin, "OFF ");
else else
wprintw(statuswin, "%.1f", cgpu->rolling); wprintw(statuswin, "%5.1f", cgpu->rolling);
wprintw(statuswin, "/%.1fMh/s | A:%d R:%d HW:%d U:%.2f/m I:%d", wprintw(statuswin, "/%5.1fMh/s | A:%d R:%d HW:%d U:%.2f/m I:%d",
cgpu->total_mhashes / total_secs, cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
cgpu->utility, gpus[gpu].intensity); cgpu->utility, gpus[gpu].intensity);
@ -2109,7 +2112,7 @@ static void curses_print_devstatus(int thr_id)
cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60; cgpu->utility = cgpu->accepted / ( total_secs ? total_secs : 1 ) * 60;
mvwprintw(statuswin, cpucursor + cpu, 0, " CPU %d: %.2f/%.2fMh/s | A:%d R:%d U:%.2f/m", mvwprintw(statuswin, cpucursor + cpu, 0, " CPU %d: %5.2f/%5.2fMh/s | A:%d R:%d U:%.2f/m",
cpu, cgpu->rolling, cgpu->total_mhashes / total_secs, cpu, cgpu->rolling, cgpu->total_mhashes / total_secs,
cgpu->accepted, cgpu->rejected, cgpu->accepted, cgpu->rejected,
cgpu->utility); cgpu->utility);