GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

The ° character is not reliably shown on all platforms so remove it.

nfactor-troky
Con Kolivas 13 years ago
parent
a0a5858d15
commit
f89c032d2b
2 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      adl.c
  2. 14
      main.c

6
adl.c
Unescape View File

@ -959,13 +959,13 @@ void change_autosettings(int gpu)
set_defaultengine(gpu); set_defaultengine(gpu);
} }
} else if (!strncasecmp(&input, "t", 1)) { } else if (!strncasecmp(&input, "t", 1)) {
val = curses_int("Enter target temperature for this GPU in °C (0-100)"); val = curses_int("Enter target temperature for this GPU in C (0-100)");
if (val < 0 || val > 100) if (val < 0 || val > 100)
wlogprint("Invalid temperature"); wlogprint("Invalid temperature");
else else
ga->targettemp = val; ga->targettemp = val;
} else if (!strncasecmp(&input, "o", 1)) { } else if (!strncasecmp(&input, "o", 1)) {
wlogprint("Enter oveheat temperature for this GPU in °C (%d-100)", ga->targettemp); wlogprint("Enter oveheat temperature for this GPU in C (%d-100)", ga->targettemp);
val = curses_int(""); val = curses_int("");
if (val <= ga->targettemp || val > 100) if (val <= ga->targettemp || val > 100)
wlogprint("Invalid temperature"); wlogprint("Invalid temperature");
@ -991,7 +991,7 @@ void change_gpusettings(int gpu)
updated: updated:
if (gpu_stats(gpu, &temp, &engineclock, &memclock, &vddc, &activity, &fanspeed, &fanpercent, &powertune)) if (gpu_stats(gpu, &temp, &engineclock, &memclock, &vddc, &activity, &fanspeed, &fanpercent, &powertune))
wlogprint("Temp: %.1f °C\nFan Speed: %d%% (%d RPM)\nEngine Clock: %d MHz\n" wlogprint("Temp: %.1f C\nFan Speed: %d%% (%d RPM)\nEngine Clock: %d MHz\n"
"Memory Clock: %d Mhz\nVddc: %.3f V\nActivity: %d%%\nPowertune: %d%%\n", "Memory Clock: %d Mhz\nVddc: %.3f V\nActivity: %d%%\nPowertune: %d%%\n",
temp, fanpercent, fanspeed, engineclock, memclock, vddc, activity, powertune); temp, fanpercent, fanspeed, engineclock, memclock, vddc, activity, powertune);
wlogprint("Fan autotune is %s\n", ga->autofan ? "enabled" : "disabled"); wlogprint("Fan autotune is %s\n", ga->autofan ? "enabled" : "disabled");

14
main.c
Unescape View File

@ -1677,7 +1677,7 @@ static void text_print_status(int thr_id)
if (cgpu->has_adl) { if (cgpu->has_adl) {
int gpu = cgpu->cpu_gpu; int gpu = cgpu->cpu_gpu;
printf("GPU %d: [%.1f °C] [%.1f/%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]\n", printf("GPU %d: [%.1f ] [%.1f/%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]\n",
cgpu->cpu_gpu, gpu_temp(gpu), cgpu->rolling, cgpu->cpu_gpu, gpu_temp(gpu), cgpu->rolling,
cgpu->total_mhashes / total_secs, cgpu->getworks, cgpu->total_mhashes / total_secs, cgpu->getworks,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,
@ -1736,7 +1736,7 @@ static void curses_print_devstatus(int thr_id)
mvwprintw(statuswin, gpucursor + gpu, 0, " GPU %d: ", gpu); mvwprintw(statuswin, gpucursor + gpu, 0, " GPU %d: ", gpu);
#ifdef HAVE_ADL #ifdef HAVE_ADL
if (cgpu->has_adl) if (cgpu->has_adl)
wprintw(statuswin, "[%.1f °C] ", gpu_temp(gpu)); wprintw(statuswin, "[%.1f C] ", gpu_temp(gpu));
#endif #endif
if (cgpu->status == LIFE_DEAD) if (cgpu->status == LIFE_DEAD)
wprintw(statuswin, "[DEAD "); wprintw(statuswin, "[DEAD ");
@ -1935,7 +1935,7 @@ static bool submit_upstream_work(const struct work *work)
if (cgpu->has_adl) { if (cgpu->has_adl) {
int gpu = cgpu->cpu_gpu; int gpu = cgpu->cpu_gpu;
applog(LOG_INFO, "GPU %d %.1f°C Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m", applog(LOG_INFO, "GPU %d %.1fC Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m",
gpu, gpu_temp(gpu), cgpu->getworks, cgpu->accepted, gpu, gpu_temp(gpu), cgpu->getworks, cgpu->accepted,
cgpu->rejected, cgpu->hw_errors, cgpu->efficiency, cgpu->utility); cgpu->rejected, cgpu->hw_errors, cgpu->efficiency, cgpu->utility);
} else } else
@ -2970,7 +2970,7 @@ retry:
float temp = 0, vddc = 0; float temp = 0, vddc = 0;
if (gpu_stats(gpu, &temp, &engineclock, &memclock, &vddc, &activity, &fanspeed, &fanpercent, &powertune)) if (gpu_stats(gpu, &temp, &engineclock, &memclock, &vddc, &activity, &fanspeed, &fanpercent, &powertune))
wlog("Temp: %.1f °C\nFan Speed: %d%% (%d RPM)\nEngine Clock: %d MHz\n" wlog("Temp: %.1f C\nFan Speed: %d%% (%d RPM)\nEngine Clock: %d MHz\n"
"Memory Clock: %d Mhz\nVddc: %.3f V\nActivity: %d%%\nPowertune: %d%%\n", "Memory Clock: %d Mhz\nVddc: %.3f V\nActivity: %d%%\nPowertune: %d%%\n",
temp, fanpercent, fanspeed, engineclock, memclock, vddc, activity, powertune); temp, fanpercent, fanspeed, engineclock, memclock, vddc, activity, powertune);
} }
@ -3207,7 +3207,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
sprintf( sprintf(
statusline, statusline,
"[GPU%d %.1f °C (%ds):%.1f (avg):%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", "[GPU%d %.1f C (%ds):%.1f (avg):%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]",
cgpu->cpu_gpu, cgpu->cpu_gpu,
gpu_temp(gpu), gpu_temp(gpu),
opt_log_interval, opt_log_interval,
@ -4588,7 +4588,7 @@ static void *watchdog_thread(void *userdata)
float temp = 0, vddc = 0; float temp = 0, vddc = 0;
if (gpu_stats(gpu, &temp, &engineclock, &memclock, &vddc, &activity, &fanspeed, &fanpercent, &powertune)) if (gpu_stats(gpu, &temp, &engineclock, &memclock, &vddc, &activity, &fanspeed, &fanpercent, &powertune))
applog(LOG_DEBUG, "%.1f°C F: %d%%(%dRPM) E: %dMHz M: %dMhz V: %.3fV A: %d%% P: %d%%", applog(LOG_DEBUG, "%.1fC F: %d%%(%dRPM) E: %dMHz M: %dMhz V: %.3fV A: %d%% P: %d%%",
temp, fanpercent, fanspeed, engineclock, memclock, vddc, activity, powertune); temp, fanpercent, fanspeed, engineclock, memclock, vddc, activity, powertune);
} }
#endif #endif
@ -4632,7 +4632,7 @@ static void log_print_status(int thr_id)
if (cgpu->has_adl) { if (cgpu->has_adl) {
int gpu = cgpu->cpu_gpu; int gpu = cgpu->cpu_gpu;
applog(LOG_WARNING, " GPU %d: [%.1f °C] [%.1f/%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]", applog(LOG_WARNING, " GPU %d: [%.1f C] [%.1f/%.1f Mh/s] [Q:%d A:%d R:%d HW:%d E:%.0f%% U:%.2f/m]",
gpu, gpu_temp(gpu), cgpu->rolling, gpu, gpu_temp(gpu), cgpu->rolling,
cgpu->total_mhashes / total_secs, cgpu->getworks, cgpu->total_mhashes / total_secs, cgpu->getworks,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors, cgpu->accepted, cgpu->rejected, cgpu->hw_errors,

Write Preview
Loading…
Cancel
Save