Rework the right block of lines 8/9
This commit is contained in:
parent
8f0437c579
commit
fac6e2a973
|
@ -91,7 +91,7 @@ void display_init(void)
|
||||||
prints(4, 0, "L3 Cache: N/A | Testing: ");
|
prints(4, 0, "L3 Cache: N/A | Testing: ");
|
||||||
prints(5, 0, "Memory : N/A | Pattern: ");
|
prints(5, 0, "Memory : N/A | Pattern: ");
|
||||||
prints(6, 0, "-------------------------------------------------------------------------------");
|
prints(6, 0, "-------------------------------------------------------------------------------");
|
||||||
prints(7, 0, "CPU cores: available, enabled | Time: Temperature: N/A ");
|
prints(7, 0, "CPU cores: available, enabled | Time: Status: Init. ");
|
||||||
prints(8, 0, "Run mode : PAR Using: | Pass: Errors: ");
|
prints(8, 0, "Run mode : PAR Using: | Pass: Errors: ");
|
||||||
prints(9, 0, "-------------------------------------------------------------------------------");
|
prints(9, 0, "-------------------------------------------------------------------------------");
|
||||||
|
|
||||||
|
@ -106,17 +106,17 @@ void display_init(void)
|
||||||
print_char(i, 28, 0xb3);
|
print_char(i, 28, 0xb3);
|
||||||
}
|
}
|
||||||
for (int i = 7; i < 10; i++) {
|
for (int i = 7; i < 10; i++) {
|
||||||
print_char(i, 39, 0xb3);
|
print_char(i, 41, 0xb3);
|
||||||
}
|
}
|
||||||
print_char(6, 28, 0xc1);
|
print_char(6, 28, 0xc1);
|
||||||
print_char(6, 39, 0xc2);
|
print_char(6, 41, 0xc2);
|
||||||
print_char(9, 39, 0xc1);
|
print_char(9, 41, 0xc1);
|
||||||
}
|
}
|
||||||
|
|
||||||
set_foreground_colour(BLUE);
|
set_foreground_colour(BLUE);
|
||||||
set_background_colour(WHITE);
|
set_background_colour(WHITE);
|
||||||
clear_screen_region(ROW_FOOTER, 0, ROW_FOOTER, SCREEN_WIDTH - 1);
|
clear_screen_region(ROW_FOOTER, 0, ROW_FOOTER, SCREEN_WIDTH - 1);
|
||||||
prints(ROW_FOOTER, 0, " <ESC> exit <F1> configuration <Space> scroll lock");
|
prints(ROW_FOOTER, 0, " <ESC> Exit <F1> Configuration <Space> Scroll Lock");
|
||||||
prints(ROW_FOOTER, 64, "6.00.");
|
prints(ROW_FOOTER, 64, "6.00.");
|
||||||
prints(ROW_FOOTER, 69, GIT_HASH);
|
prints(ROW_FOOTER, 69, GIT_HASH);
|
||||||
#if TESTWORD_WIDTH > 32
|
#if TESTWORD_WIDTH > 32
|
||||||
|
@ -179,9 +179,9 @@ void display_start_run(void)
|
||||||
clear_message_area();
|
clear_message_area();
|
||||||
}
|
}
|
||||||
|
|
||||||
clear_screen_region(7, 47, 7, 57); // run time
|
clear_screen_region(7, 49, 7, 57); // run time
|
||||||
clear_screen_region(8, 47, 8, 57); // pass number
|
clear_screen_region(8, 49, 8, 57); // pass number
|
||||||
clear_screen_region(8, 66, 8, SCREEN_WIDTH - 1); // error count
|
clear_screen_region(8, 68, 8, SCREEN_WIDTH - 1); // error count
|
||||||
display_pass_count(0);
|
display_pass_count(0);
|
||||||
display_error_count(0);
|
display_error_count(0);
|
||||||
if (clks_per_msec > 0) {
|
if (clks_per_msec > 0) {
|
||||||
|
@ -190,6 +190,7 @@ void display_start_run(void)
|
||||||
next_spin_time = run_start_time + SPINNER_PERIOD * clks_per_msec;
|
next_spin_time = run_start_time + SPINNER_PERIOD * clks_per_msec;
|
||||||
}
|
}
|
||||||
display_spinner('-');
|
display_spinner('-');
|
||||||
|
display_status("Testing");
|
||||||
|
|
||||||
if (enable_tty){
|
if (enable_tty){
|
||||||
tty_full_redraw();
|
tty_full_redraw();
|
||||||
|
|
|
@ -65,6 +65,9 @@
|
||||||
#define display_ram_speed(size) \
|
#define display_ram_speed(size) \
|
||||||
printf(5, 18, "%S6kB/s", (uintptr_t)(size))
|
printf(5, 18, "%S6kB/s", (uintptr_t)(size))
|
||||||
|
|
||||||
|
#define display_status(status) \
|
||||||
|
prints(7, 67, status)
|
||||||
|
|
||||||
#define display_dmi_mb(sys_ma, sys_sku) \
|
#define display_dmi_mb(sys_ma, sys_sku) \
|
||||||
dmicol = prints(23, dmicol, sys_man); \
|
dmicol = prints(23, dmicol, sys_man); \
|
||||||
prints(23, dmicol + 1, sys_sku);
|
prints(23, dmicol + 1, sys_sku);
|
||||||
|
@ -86,7 +89,7 @@
|
||||||
prints(8, 25, "all cores")
|
prints(8, 25, "all cores")
|
||||||
|
|
||||||
#define display_spinner(spin_state) \
|
#define display_spinner(spin_state) \
|
||||||
printc(8, 36, spin_state)
|
printc(7, 76, spin_state)
|
||||||
|
|
||||||
#define display_pass_percentage(pct) \
|
#define display_pass_percentage(pct) \
|
||||||
printi(1, 34, pct, 3, false, false)
|
printi(1, 34, pct, 3, false, false)
|
||||||
|
@ -143,16 +146,16 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#define display_run_time(hours, mins, secs) \
|
#define display_run_time(hours, mins, secs) \
|
||||||
printf(7, 47, "%i:%02i:%02i", hours, mins, secs)
|
printf(7, 50, "%i:%02i:%02i", hours, mins, secs)
|
||||||
|
|
||||||
#define display_temperature(temp, maxtemp) \
|
#define display_temperature(temp, maxtemp) \
|
||||||
printf(1, 20, "%2i/%2i%cC", temp, maxtemp, 0xf8)
|
printf(1, 20, "%2i/%2i%cC", temp, maxtemp, 0xf8)
|
||||||
|
|
||||||
#define display_pass_count(count) \
|
#define display_pass_count(count) \
|
||||||
printi(8, 47, count, 0, false, true)
|
printi(8, 50, count, 0, false, true)
|
||||||
|
|
||||||
#define display_error_count(count) \
|
#define display_error_count(count) \
|
||||||
printi(8, 66, count, 0, false, true)
|
printi(8, 67, count, 0, false, true);
|
||||||
|
|
||||||
#define clear_message_area() \
|
#define clear_message_area() \
|
||||||
{ \
|
{ \
|
||||||
|
|
|
@ -367,6 +367,7 @@ void error_update(void)
|
||||||
test_list[test_num].errors);
|
test_list[test_num].errors);
|
||||||
}
|
}
|
||||||
display_error_count(error_count);
|
display_error_count(error_count);
|
||||||
|
display_status("Failed!");
|
||||||
|
|
||||||
if (enable_tty) {
|
if (enable_tty) {
|
||||||
tty_error_redraw();
|
tty_error_redraw();
|
||||||
|
|
|
@ -622,6 +622,7 @@ void main(void)
|
||||||
if (!dummy_run) {
|
if (!dummy_run) {
|
||||||
display_pass_count(pass_num);
|
display_pass_count(pass_num);
|
||||||
if (error_count == 0) {
|
if (error_count == 0) {
|
||||||
|
display_status("Pass ");
|
||||||
display_notice("** Pass completed, no errors **");
|
display_notice("** Pass completed, no errors **");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue