Correct small mistakes in ui functions.

This commit is contained in:
Godzil 2013-02-04 17:20:30 +01:00
parent 559fd817ef
commit 18aba79467

View File

@ -72,21 +72,21 @@ void ui_print_progress(int pos, int max)
static uint8_t last_car = 0; static uint8_t last_car = 0;
if (output_ui_fd == 0) { if (output_ui_fd == 0) {
float percent = (pos / max) * 100; double percent = ((double)pos / (double)max) * 100.0;
char bar[60]; char bar[60];
int nbbar = (pos * MAX_BAR) / 100; uint32_t nbbar = (pos * MAX_BAR) / max;
int i; uint32_t i;
memset(bar, 0, 60); memset(bar, 0, 60);
for(i = 0 ; i < MAX_BAR ; i++) { for(i = 0 ; i < MAX_BAR ; i++) {
if (i < nbbar) if (i < nbbar)
bar[i] = '='; bar[i] = '=';
else bar[i] = ' '; else bar[i] = ' ';
} }
sprintf(buffer, "|%s %c %2.1f%%", bar, rotator[last_car], percent); sprintf(buffer, "|%s %c %2.1f%%\r", bar, rotator[last_car], percent);
last_car = (last_car + 1) % 4; last_car = (last_car + 1) % 4;
} }
else { else {
sprintf(buffer, "%d %d %d %s", current_pass, pos, max, cur_device); sprintf(buffer, "%d %d %d %s\n", current_pass, pos, max, cur_device);
} }
ui_print_text(buffer); ui_print_text(buffer);
} }