mister-devel/InputTest_MiSTer
1
0
Fork 0
mirror of https://github.com/MiSTer-devel/InputTest_MiSTer.git synced 2026-04-19 03:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve keyboard and mouse handling

Browse Source
This commit is contained in:
jimmystones
2021-10-19 17:22:10 +01:00
parent 7fa3a3b24e
commit c133d9548b
7 changed files with 749 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
releases/InputTest_20211019.rbf
View File

Binary file not shown.

1260
rtl/rom.hex
View File

File diff suppressed because it is too large Load Diff

6
rtl/system.v
View File

@@ -223,9 +223,9 @@ wire timer_cs = cpu_addr[15:8] == 8'b01111000;
// if(ps2_key_cs) $display("ps2_key %b %x", ps2_key_data_out, cpu_addr[3:0]);
// $display("%x", cpu_addr);
//end
always @(posedge ps2_mouse[24]) begin
$display("%b", ps2_mouse);
end
// always @(posedge ps2_mouse[24]) begin
// $display("%b", ps2_mouse);
// end
// CPU data mux
assign cpu_din = pgrom_cs ? pgrom_data_out :

104
src/inputtester.c
View File

@@ -37,9 +37,14 @@ signed char sx_last[6];
unsigned long sx_pos[6];
unsigned char kbd_lastscan_cache;
unsigned char kbd_lastascii_cache;
char mse_button_last;
char mse_x_last;
char mse_y_last;
char mse_button1_last;
char mse_button2_last;
signed char mse_x_last;
signed char mse_y_last;
signed char mse_w_last;
unsigned short mse_x_acc;
unsigned short mse_y_acc;
unsigned short mse_w_acc;
// Console constants
#define con_cursorfreq 30
@@ -186,7 +191,7 @@ void page_inputtester_advanced()
write_string("ARY", 0xFF, 34, 5);
write_string("POS", 0xFF, 7, 13);
write_string("SPD POS", 0xFF, 18, 13);
write_string("SPD POS", 0xFF, 20, 13);
char label[5];
for (unsigned char j = 0; j < 6; j++)
@@ -200,14 +205,21 @@ void page_inputtester_advanced()
sprintf(label, "SPN%d", j + 1);
write_string(label, 0xFF - (j * 2), 14, 14 + j);
}
write_string("SCAN ASC", 0xFF, 6, 21);
write_string("KBD", 0xFF, 2, 22);
write_char('X', 0xFF, 21, 21);
write_char('Y', 0xFF, 25, 21);
write_string("BUTTONS", 0xFF, 27, 21);
write_string("MSE", 0xFF, 15, 22);
write_string("KEYBOARD", 0xFF, 2, 21);
write_string("SCAN", 0xFF, 2, 22);
write_string("ASC", 0xFF, 2, 23);
write_string("MOUSE", 0xFF, 14, 21);
write_string("SPD", 0xFF, 21, 21);
write_string("POS", 0xFF, 28, 21);
write_string("BTNS", 0xFF, 33, 21);
write_char('X', 0xFF, 18, 22);
write_char('Y', 0xFF, 18, 23);
write_char('W', 0xFF, 18, 24);
// write_char('Y', 0xFF, 25, 21);
// write_string("BUTTONS", 0xFF, 27, 21);
// write_string("MSE", 0xFF, 15, 22);
}
// Draw static elements for button test page
@@ -579,7 +591,7 @@ void inputtester_advanced()
if (sx_toggle != sx_toggle_last[inputindex])
{
sx_pos[inputindex] += sx;
write_stringf("%4d", 0xFF, 22, 14 + inputindex, sx_pos[inputindex]);
write_stringf("%4d", 0xFF, 24, 14 + inputindex, sx_pos[inputindex]);
}
else
{
@@ -590,7 +602,7 @@ void inputtester_advanced()
}
if (sx_last[inputindex] != sx)
{
write_stringfs("%4d", 0xFF, 17, 14 + inputindex, sx);
write_stringfs("%4d", 0xFF, 19, 14 + inputindex, sx);
}
sx_last[inputindex] = sx;
sx_toggle_last[inputindex] = sx_toggle;
@@ -656,8 +668,8 @@ void inputtester_advanced()
// Scancode output
if (kbd_lastscan != kbd_lastscan_cache || kbd_lastascii != kbd_lastascii_cache)
{
write_stringfs("%3x", 0xFF, 7, 22, kbd_lastscan);
write_char(kbd_lastascii, 0xFF, 13, 22);
write_stringfs("%4x", 0xFF, 6, 20, kbd_lastscan);
write_char(kbd_lastascii, 0xFF, 9, 23);
kbd_lastscan_cache = kbd_lastscan;
kbd_lastascii_cache = kbd_lastascii;
@@ -665,26 +677,76 @@ void inputtester_advanced()
if (mse_x_last != mse_x)
{
write_stringfs("%4d", 0xFF, 18, 22, mse_x);
mse_x_acc += mse_x;
write_stringfs("%4d", 0xFF, 20, 22, mse_x);
write_stringf_ushort("%6d", 0xFF, 25, 22, mse_x_acc);
mse_x_last = mse_x;
}
if (mse_y_last != mse_y)
{
write_stringfs("%4d", 0xFF, 22, 22, mse_y);
mse_y_acc += mse_y;
write_stringfs("%4d", 0xFF, 20, 23, mse_y);
write_stringf_ushort("%6d", 0xFF, 25, 23, mse_y_acc);
mse_y_last = mse_y;
}
if (mse_button_last != mse_button)
if (mse_w_last != mse_w)
{
char x = 26;
mse_w_acc += mse_w;
write_stringfs("%4d", 0xFF, 20, 24, mse_w);
write_stringf_ushort("%6d", 0xFF, 25, 24, mse_w_acc);
mse_w_last = mse_w;
}
if (mse_button1_last != mse_button1)
{
char x = 32;
char y = 22;
char m = 0b00000001;
for (char i = 0; i < 8; i++)
for (char i = 0; i < 4; i++)
{
x++;
write_char((mse_button & m) ? asc_1 : asc_0, 0xFF, x, 22);
write_char((mse_button1 & m) ? asc_1 : asc_0, 0xFF, x, y);
m <<= 1;
}
mse_button_last = mse_button;
mse_button1_last = mse_button1;
}
if (mse_button2_last != mse_button2)
{
char x = 32;
char y = 23;
char m = 0b00000001;
for (char i = 0; i < 4; i++)
{
x++;
write_char((mse_button2 & m) ? asc_1 : asc_0, 0xFF, x, y);
m <<= 1;
}
mse_button2_last = mse_button2;
}
// {
// char m = 0b00000001;
// char x = 2;
// char y = 27;
// for (char b = 0; b < 8; b++)
// {
// char index = (b * 8);
// char joy = ps2_mouse[index];
// m = 0b00000001;
// for (char i = 0; i < 8; i++)
// {
// x++;
// write_char((joy & m) ? asc_1 : asc_0, 0xFF, x, y);
// m <<= 1;
// }
// x++;
// if (b == 3)
// {
// x = 2;
// y++;
// }
// }
// }
// // Cursor blink timer
// con_cursortimer--;

4
src/os.c
View File

@@ -103,8 +103,8 @@ void main()
default:
// Start default state
start_inputtester_digital();
//start_inputtester_advanced();
//start_inputtester_digital();
start_inputtester_advanced();
//start_inputtester_analog();
//start_btntest();
break;

24
src/ps2.c
View File

@@ -196,17 +196,18 @@ char kbd_lastascii = 0;
char kbd_clock_index = 10;
char mse_lastclock = 0;
char mse_x;
char mse_y;
char mse_button;
signed char mse_x;
signed char mse_y;
signed char mse_w;
char mse_button1;
char mse_button2;
char mse_clock_index = 24;
char kbd_buffer[128];
char kbd_buffer_len = 0;
void get_ascii(char scan)
void get_ascii()
{
kbd_lastscan = scan;
char p = (kbd_lastscan * 2);
if (!(kbd_shift_left || kbd_shift_right))
{
@@ -220,7 +221,6 @@ void get_ascii(char scan)
}
}
void handle_ps2()
{
bool kbd_clock = CHECK_BIT(ps2_key[kbd_clock_index], 0);
@@ -233,6 +233,8 @@ void handle_ps2()
kbd_extend = CHECK_BIT(kbd_in[1], 0);
kbd_pressed = CHECK_BIT(kbd_in[1], 1);
kbd_scan = kbd_in[0];
kbd_lastscan = kbd_scan;
kbd_lastascii = 0;
if (kbd_pressed)
{
if (kbd_scan == KEY_LEFTSHIFT)
@@ -243,6 +245,10 @@ void handle_ps2()
{
kbd_shift_right = 1;
}
else
{
get_ascii();
}
}
else
{
@@ -256,7 +262,7 @@ void handle_ps2()
}
else
{
get_ascii(kbd_scan);
get_ascii();
}
}
}
@@ -265,9 +271,11 @@ void handle_ps2()
bool mse_clock = CHECK_BIT(ps2_mouse[mse_clock_index], 0);
if (mse_clock != mse_lastclock)
{
mse_button = ps2_mouse[0];
mse_button1 = ps2_mouse[0];
mse_button2 = ps2_mouse[40];
mse_x = ps2_mouse[8];
mse_y = ps2_mouse[16];
mse_w = ps2_mouse[32];
}
mse_lastclock = mse_clock;
}

3
verilator/sim_main.cpp
View File

@@ -389,7 +389,7 @@ int main(int argc, char** argv, char** env) {
mouse_clock = !mouse_clock;
top->ps2_mouse = mouse_temp;
//top->ps2_mouse_ext -= 1;
top->ps2_mouse_ext = mouse_x + (mouse_buttons << 8);
// Run simulation
if (run_enable) {
@@ -412,3 +412,4 @@ int main(int argc, char** argv, char** env) {
return 0;
}