Commit f89c032d2b524bec9fb2483930c3752df0945bd0
2011-09-06T12:04:23
The ° character is not reliably shown on all platforms so remove it.
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 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
diff --git a/adl.c b/adl.c
index 3ed8e49..42044c3 100644
--- a/adl.c
+++ b/adl.c
@@ -959,13 +959,13 @@ void change_autosettings(int gpu)
set_defaultengine(gpu);
}
} 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)
wlogprint("Invalid temperature");
else
ga->targettemp = val;
} 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("");
if (val <= ga->targettemp || val > 100)
wlogprint("Invalid temperature");
@@ -991,7 +991,7 @@ void change_gpusettings(int gpu)
updated:
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",
temp, fanpercent, fanspeed, engineclock, memclock, vddc, activity, powertune);
wlogprint("Fan autotune is %s\n", ga->autofan ? "enabled" : "disabled");
diff --git a/main.c b/main.c
index c5323df..4303689 100644
--- a/main.c
+++ b/main.c
@@ -1677,7 +1677,7 @@ static void text_print_status(int thr_id)
if (cgpu->has_adl) {
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->total_mhashes / total_secs, cgpu->getworks,
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);
#ifdef HAVE_ADL
if (cgpu->has_adl)
- wprintw(statuswin, "[%.1f °C] ", gpu_temp(gpu));
+ wprintw(statuswin, "[%.1f C] ", gpu_temp(gpu));
#endif
if (cgpu->status == LIFE_DEAD)
wprintw(statuswin, "[DEAD ");
@@ -1935,7 +1935,7 @@ static bool submit_upstream_work(const struct work *work)
if (cgpu->has_adl) {
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,
cgpu->rejected, cgpu->hw_errors, cgpu->efficiency, cgpu->utility);
} else
@@ -2970,7 +2970,7 @@ retry:
float temp = 0, vddc = 0;
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",
temp, fanpercent, fanspeed, engineclock, memclock, vddc, activity, powertune);
}
@@ -3207,7 +3207,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
sprintf(
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,
gpu_temp(gpu),
opt_log_interval,
@@ -4588,7 +4588,7 @@ static void *watchdog_thread(void *userdata)
float temp = 0, vddc = 0;
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);
}
#endif
@@ -4632,7 +4632,7 @@ static void log_print_status(int thr_id)
if (cgpu->has_adl) {
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,
cgpu->total_mhashes / total_secs, cgpu->getworks,
cgpu->accepted, cgpu->rejected, cgpu->hw_errors,