From db159ecb11be563ed41789202ab6afc22c8af818 Mon Sep 17 00:00:00 2001 From: Jos van Mourik Date: Sun, 4 Aug 2024 14:27:47 +0200 Subject: [PATCH 1/6] Add output status command --- src/device/mouse_microtouch_touchscreen.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 9767d5c04..b824d47b5 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -64,7 +64,7 @@ typedef struct mouse_microtouch_t { bool mode_status; uint8_t id, cal_cntr, pen_mode; bool soh; - bool in_reset; + bool in_reset, reset; serial_t *serial; Fifo8 resp; pc_timer_t host_to_serial_timer; @@ -78,6 +78,7 @@ microtouch_reset_complete(void *priv) { mouse_microtouch_t *mtouch = (mouse_microtouch_t *) priv; + mtouch->reset = true; mtouch->in_reset = false; fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x30\x0D", 3); /* 0 */ } @@ -135,11 +136,19 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) fifo8_push(&mtouch->resp, 0x0D); return; } + if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'S') { /* Output Status */ + if (mtouch->reset) { + fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x40\x60\x0D", 4); + } else { + fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x40\x40\x0D", 4); + } + return; + } if (mtouch->cmd[0] == 'P') { if (mtouch->cmd[1] == 'F') mtouch->pen_mode = 3; /* Pen or Finger */ else if (mtouch->cmd[1] == 'O') mtouch->pen_mode = 2; /* Pen Only */ } - if (mtouch->cmd[0] == 'R') { /* Reset */ + if (mtouch->cmd[0] == 'R') { /* Reset/Defaults */ mtouch->in_reset = true; mtouch->cal_cntr = 0; mtouch->pen_mode = 3; From 01c463df74cb97e221314e8c216f00b3a60aba88 Mon Sep 17 00:00:00 2001 From: Jos van Mourik Date: Sun, 4 Aug 2024 16:12:10 +0200 Subject: [PATCH 2/6] Add command handling for more output modes. Fix Reset behavior. --- src/device/mouse_microtouch_touchscreen.c | 50 +++++++++++++++++------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index b824d47b5..d91b10440 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -6,7 +6,7 @@ * * This file is part of the 86Box distribution. * - * 3M MicroTouch SMT3 emulation. + * 3M MicroTouch Serial emulation. * * * @@ -47,6 +47,13 @@ enum mtouch_formats { FORMAT_TABLET = 4 }; +enum mtouch_modes { + MODE_DOWNUP = 1, + MODE_INACTIVE = 2, + MODE_POINT = 3, + MODE_STREAM = 4, +}; + const char* mtouch_identity[] = { "A30100", /* SMT2 Serial / SMT3(R)V */ "A40100", /* SMT2 PCBus */ @@ -60,7 +67,7 @@ typedef struct mouse_microtouch_t { int b; char cmd[256]; int cmd_pos; - uint8_t format; + uint8_t format, mode; bool mode_status; uint8_t id, cal_cntr, pen_mode; bool soh; @@ -106,6 +113,7 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'D') { /* Format Decimal */ mouse_set_sample_rate(106); mtouch->format = FORMAT_DEC; + mtouch->mode_status = false; } if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O') { /* Finger Only */ mtouch->pen_mode = 1; @@ -113,10 +121,12 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'H') { /* Format Hexadecimal */ mouse_set_sample_rate(106); mtouch->format = FORMAT_HEX; + mtouch->mode_status = false; } if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'R') { /* Format Raw */ mouse_set_sample_rate(106); mtouch->format = FORMAT_RAW; + mtouch->mode = MODE_INACTIVE; mtouch->cal_cntr = 0; } if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'T') { /* Format Tablet */ @@ -127,9 +137,21 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x41\x0D", 3); /* A */ fifo8_push_all(&mtouch->resp, (uint8_t *) "0000000000000000000000000\r", 26); } + if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'D' && mtouch->cmd[2] == 'U') { /* Mode Down/Up */ + mtouch->mode = MODE_DOWNUP; + } + if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'I') { /* Mode Inactive */ + mtouch->mode = MODE_INACTIVE; + } + if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'P') { /* Mode Point */ + mtouch->mode = MODE_POINT; + } if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'T') { /* Mode Status */ mtouch->mode_status = true; } + if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'S') { /* Mode Stream */ + mtouch->mode = MODE_STREAM; + } if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'I') { /* Output Identity */ fifo8_push(&mtouch->resp, 0x01); fifo8_push_all(&mtouch->resp, (uint8_t *) mtouch_identity[mtouch->id], 6); @@ -148,18 +170,22 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) if (mtouch->cmd[1] == 'F') mtouch->pen_mode = 3; /* Pen or Finger */ else if (mtouch->cmd[1] == 'O') mtouch->pen_mode = 2; /* Pen Only */ } - if (mtouch->cmd[0] == 'R') { /* Reset/Defaults */ + if (mtouch->cmd[0] == 'R') { /* Reset */ mtouch->in_reset = true; mtouch->cal_cntr = 0; mtouch->pen_mode = 3; - mtouch->mode_status = false; - if (mtouch->id < 2) { - mouse_set_sample_rate(106); - mtouch->format = FORMAT_DEC; - } else { - mouse_set_sample_rate(192); - mtouch->format = FORMAT_TABLET; + if (mtouch->cmd[0] == 'D') { /* Restore Defaults */ + mtouch->mode = MODE_STREAM; + mtouch->mode_status = false; + + if (mtouch->id < 2) { + mouse_set_sample_rate(106); + mtouch->format = FORMAT_DEC; + } else { + mouse_set_sample_rate(192); + mtouch->format = FORMAT_TABLET; + } } timer_on_auto(&mtouch->reset_timer, 500. * 1000.); @@ -236,7 +262,7 @@ mtouch_poll(void *priv) { mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; - if (fifo8_num_free(&dev->resp) <= 256 - 10 || dev->format == FORMAT_RAW) { + if (fifo8_num_free(&dev->resp) <= 256 - 10 || dev->mode == MODE_INACTIVE) { return 0; } @@ -385,7 +411,7 @@ mtouch_init(const device_t *info) timer_on_auto(&dev->host_to_serial_timer, (1000000. / dev->baud_rate) * 10); dev->id = device_get_config_int("identity"); dev->pen_mode = 3; - dev->mode_status = false; + dev->mode = MODE_STREAM; if (dev->id < 2) { /* legacy controllers */ dev->format = FORMAT_DEC; From 866d6599a1f0c4102a3a321858e3e106dc745329 Mon Sep 17 00:00:00 2001 From: Jos van Mourik Date: Sun, 15 Sep 2024 01:18:37 +0200 Subject: [PATCH 3/6] Implement Mode Point and Mode Down/Up. Merge HEX/DEC functions in order to do so efficiently. Optimize. --- src/device/mouse_microtouch_touchscreen.c | 93 +++++++++-------------- 1 file changed, 35 insertions(+), 58 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index d91b10440..1c2393d16 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -22,7 +22,6 @@ - Decouple serial packet generation from mouse poll rate. - Dynamic baud rate selection from software following this. - Add additional SMT2/3 formats as we currently only support Tablet, Hex and Dec. - - Add additional SMT2/3 modes as we currently hardcode Mode Stream. */ #include #include @@ -62,8 +61,7 @@ const char* mtouch_identity[] = { }; typedef struct mouse_microtouch_t { - double baud_rate; - unsigned int abs_x_int, abs_y_int; + double baud_rate, abs_x, abs_y; int b; char cmd[256]; int cmd_pos; @@ -266,10 +264,10 @@ mtouch_poll(void *priv) return 0; } - unsigned int abs_x_int = 0, abs_y_int = 0; double abs_x; double abs_y; int b = mouse_get_buttons_ex(); + char buffer[10]; mouse_get_abs_coords(&abs_x, &abs_y); @@ -314,76 +312,55 @@ mtouch_poll(void *priv) return 0; } - if (dev->format == FORMAT_DEC) { - abs_x_int = abs_x * 999; - abs_y_int = 999 - (abs_y * 999); - char buffer[10]; - - if (!dev->mode_status) { - if (b) { // Touch - snprintf(buffer, sizeof(buffer), "\x1%03d,%03d\r", abs_x_int, abs_y_int); + if (dev->format == FORMAT_DEC || dev->format == FORMAT_HEX) { + if (b) { + if (!dev->b) { /* Touchdown (MS, MP, MDU)*/ + fifo8_push(&dev->resp, (dev->mode_status) ? 0x19 : 0x01); + if (dev->format == FORMAT_DEC){ + snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y))); + } else if (dev->format == FORMAT_HEX) { + snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * abs_x), (uint16_t)(1023 * (1 - abs_y))); + } + fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); + } else if (dev->mode == MODE_STREAM){ /* Touch Continuation (MS)*/ + fifo8_push(&dev->resp, (dev->mode_status) ? 0x1c : 0x01); + if (dev->format == FORMAT_DEC){ + snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y))); + } else if (dev->format == FORMAT_HEX) { + snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * abs_x), (uint16_t)(1023 * (1 - abs_y))); + } fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); } - } else { - if (b) { - if (!dev->b) { /* Touchdown Status */ - snprintf(buffer, sizeof(buffer), "\x19%03d,%03d\r", abs_x_int, abs_y_int); - } else { /* Touch Continuation Status */ - snprintf(buffer, sizeof(buffer), "\x1c%03d,%03d\r", abs_x_int, abs_y_int); - } - } else if (dev->b) { /* Liftoff Status */ - snprintf(buffer, sizeof(buffer), "\x18%03d,%03d\r", dev->abs_x_int, dev->abs_y_int); - } - fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); - } - } - - else if (dev->format == FORMAT_HEX) { - abs_x_int = abs_x * 1023; - abs_y_int = 1023 - (abs_y * 1023); - char buffer[10]; - - if (!dev->mode_status) { - if (b) { // Touch - snprintf(buffer, sizeof(buffer), "\x1%03X,%03X\r", abs_x_int, abs_y_int); - fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); - } - } else { - if (b) { - if (!dev->b) { /* Touchdown Status */ - snprintf(buffer, sizeof(buffer), "\x19%03X,%03X\r", abs_x_int, abs_y_int); - } else { /* Touch Continuation Status */ - snprintf(buffer, sizeof(buffer), "\x1c%03X,%03X\r", abs_x_int, abs_y_int); - } - } else if (dev->b) { /* Liftoff Status */ - snprintf(buffer, sizeof(buffer), "\x18%03X,%03X\r", dev->abs_x_int, dev->abs_y_int); + } else if (dev->b && dev->mode != MODE_POINT) { /* Touch Liftoff (MS, MDU)*/ + fifo8_push(&dev->resp, (dev->mode_status) ? 0x18 : 0x01); + if (dev->format == FORMAT_DEC) { + snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * dev->abs_x), (uint16_t)(999 * (1 - dev->abs_y))); + } else if (dev->format == FORMAT_HEX) { + snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * dev->abs_x), (uint16_t)(1023 * (1 - dev->abs_y))); } fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); } } else if (dev->format == FORMAT_TABLET) { - abs_x_int = abs_x * 16383; - abs_y_int = 16383 - abs_y * 16383; - if (b) { /* Touchdown/Continuation */ fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode == 2) ? ((1 << 5) | ((b & 3))) : 0)); - fifo8_push(&dev->resp, abs_x_int & 0b1111111); - fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); - fifo8_push(&dev->resp, abs_y_int & 0b1111111); - fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111); + fifo8_push(&dev->resp, (uint16_t)(16383 * abs_x) & 0b1111111); + fifo8_push(&dev->resp, ((uint16_t)(16383 * abs_x) >> 7) & 0b1111111); + fifo8_push(&dev->resp, (uint16_t)(16383 * (1 - abs_y)) & 0b1111111); + fifo8_push(&dev->resp, ((uint16_t)(16383 * (1 - abs_y)) >> 7) & 0b1111111); } else if (dev->b) { /* Liftoff */ fifo8_push(&dev->resp, 0b10000000 | ((dev->pen_mode == 2) ? ((1 << 5)) : 0)); - fifo8_push(&dev->resp, dev->abs_x_int & 0b1111111); - fifo8_push(&dev->resp, (dev->abs_x_int >> 7) & 0b1111111); - fifo8_push(&dev->resp, dev->abs_y_int & 0b1111111); - fifo8_push(&dev->resp, (dev->abs_y_int >> 7) & 0b1111111); + fifo8_push(&dev->resp, (uint16_t)(16383 * dev->abs_x) & 0b1111111); + fifo8_push(&dev->resp, ((uint16_t)(16383 * dev->abs_x) >> 7) & 0b1111111); + fifo8_push(&dev->resp, (uint16_t)(16383 * (1 - dev->abs_y))& 0b1111111); + fifo8_push(&dev->resp, ((uint16_t)(16383 * (1 - dev->abs_y)) >> 7) & 0b1111111); } } /* Save old states*/ - dev->abs_x_int = abs_x_int; - dev->abs_y_int = abs_y_int; + dev->abs_x = abs_x; + dev->abs_y = abs_y; dev->b = b; return 0; } From 22240a592521dae86c8ca5c3f03e747bdbac3e5c Mon Sep 17 00:00:00 2001 From: Jos van Mourik Date: Sun, 15 Sep 2024 01:56:45 +0200 Subject: [PATCH 4/6] Code style cleanups, optimize if statement order --- src/device/mouse_microtouch_touchscreen.c | 49 +++++++++-------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 1c2393d16..8ca2a0469 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -259,26 +259,25 @@ static int mtouch_poll(void *priv) { mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; - - if (fifo8_num_free(&dev->resp) <= 256 - 10 || dev->mode == MODE_INACTIVE) { - return 0; - } - double abs_x; double abs_y; int b = mouse_get_buttons_ex(); char buffer[10]; + if (fifo8_num_free(&dev->resp) <= 256 - 10 || dev->mode == MODE_INACTIVE) { + return 0; + } + + if (dev->cal_cntr || (!b && !dev->b)) { /* Calibration or no buttonpress */ + if (!b && dev->b) { + microtouch_calibrate_timer(dev); + } + dev->b = b; /* Save buttonpress */ + return 0; + } + mouse_get_abs_coords(&abs_x, &abs_y); - if (abs_x >= 1.0) - abs_x = 1.0; - if (abs_y >= 1.0) - abs_y = 1.0; - if (abs_x <= 0.0) - abs_x = 0.0; - if (abs_y <= 0.0) - abs_y = 0.0; if (enable_overscan) { int index = mouse_tablet_in_proximity - 1; if (mouse_tablet_in_proximity == -1) { @@ -298,19 +297,12 @@ mtouch_poll(void *priv) abs_y -= (monitors[index].mon_overscan_y / 2.); abs_x = abs_x / (double) monitors[index].mon_xsize; abs_y = abs_y / (double) monitors[index].mon_ysize; - if (abs_x >= 1.0) - abs_x = 1.0; - if (abs_y >= 1.0) - abs_y = 1.0; } - if (dev->cal_cntr || (!b && !dev->b)) { /* Calibration or no buttonpress */ - if (!b && dev->b) { - microtouch_calibrate_timer(dev); - } - dev->b = b; /* Save buttonpress */ - return 0; - } + if (abs_x >= 1.0) abs_x = 1.0; + if (abs_y >= 1.0) abs_y = 1.0; + if (abs_x <= 0.0) abs_x = 0.0; + if (abs_y <= 0.0) abs_y = 0.0; if (dev->format == FORMAT_DEC || dev->format == FORMAT_HEX) { if (b) { @@ -342,7 +334,7 @@ mtouch_poll(void *priv) } } - else if (dev->format == FORMAT_TABLET) { + if (dev->format == FORMAT_TABLET) { if (b) { /* Touchdown/Continuation */ fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode == 2) ? ((1 << 5) | ((b & 3))) : 0)); fifo8_push(&dev->resp, (uint16_t)(16383 * abs_x) & 0b1111111); @@ -393,8 +385,7 @@ mtouch_init(const device_t *info) if (dev->id < 2) { /* legacy controllers */ dev->format = FORMAT_DEC; mouse_set_sample_rate(106); - } - else { + } else { dev->format = FORMAT_TABLET; mouse_set_sample_rate(192); } @@ -402,7 +393,6 @@ mtouch_init(const device_t *info) mouse_input_mode = device_get_config_int("crosshair") + 1; mouse_set_buttons(2); mouse_set_poll_ex(mtouch_poll_global); - mtouch_inst = dev; return dev; @@ -415,8 +405,9 @@ mtouch_close(void *priv) fifo8_destroy(&dev->resp); /* Detach serial port from the mouse. */ - if (dev && dev->serial && dev->serial->sd) + if (dev && dev->serial && dev->serial->sd) { memset(dev->serial->sd, 0, sizeof(serial_device_t)); + } free(dev); mtouch_inst = NULL; From 2b4b9aae644055c8d5bc5cadfa58301b625da59d Mon Sep 17 00:00:00 2001 From: Jos van Mourik Date: Sun, 15 Sep 2024 03:13:54 +0200 Subject: [PATCH 5/6] Cleanup --- src/device/mouse_microtouch_touchscreen.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 8ca2a0469..82c936f9c 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -22,6 +22,7 @@ - Decouple serial packet generation from mouse poll rate. - Dynamic baud rate selection from software following this. - Add additional SMT2/3 formats as we currently only support Tablet, Hex and Dec. + - Mode Polled. */ #include #include @@ -83,7 +84,7 @@ microtouch_reset_complete(void *priv) { mouse_microtouch_t *mtouch = (mouse_microtouch_t *) priv; - mtouch->reset = true; + mtouch->reset = true; mtouch->in_reset = false; fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x30\x0D", 3); /* 0 */ } @@ -266,7 +267,7 @@ mtouch_poll(void *priv) if (fifo8_num_free(&dev->resp) <= 256 - 10 || dev->mode == MODE_INACTIVE) { return 0; - } + } if (dev->cal_cntr || (!b && !dev->b)) { /* Calibration or no buttonpress */ if (!b && dev->b) { @@ -274,7 +275,7 @@ mtouch_poll(void *priv) } dev->b = b; /* Save buttonpress */ return 0; - } + } mouse_get_abs_coords(&abs_x, &abs_y); @@ -306,7 +307,7 @@ mtouch_poll(void *priv) if (dev->format == FORMAT_DEC || dev->format == FORMAT_HEX) { if (b) { - if (!dev->b) { /* Touchdown (MS, MP, MDU)*/ + if (!dev->b) { /* Touchdown (MS, MP, MDU) */ fifo8_push(&dev->resp, (dev->mode_status) ? 0x19 : 0x01); if (dev->format == FORMAT_DEC){ snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y))); @@ -314,7 +315,7 @@ mtouch_poll(void *priv) snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * abs_x), (uint16_t)(1023 * (1 - abs_y))); } fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); - } else if (dev->mode == MODE_STREAM){ /* Touch Continuation (MS)*/ + } else if (dev->mode == MODE_STREAM){ /* Touch Continuation (MS) */ fifo8_push(&dev->resp, (dev->mode_status) ? 0x1c : 0x01); if (dev->format == FORMAT_DEC){ snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y))); @@ -323,7 +324,7 @@ mtouch_poll(void *priv) } fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); } - } else if (dev->b && dev->mode != MODE_POINT) { /* Touch Liftoff (MS, MDU)*/ + } else if (dev->b && dev->mode != MODE_POINT) { /* Touch Liftoff (MS, MDU) */ fifo8_push(&dev->resp, (dev->mode_status) ? 0x18 : 0x01); if (dev->format == FORMAT_DEC) { snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * dev->abs_x), (uint16_t)(999 * (1 - dev->abs_y))); @@ -353,7 +354,7 @@ mtouch_poll(void *priv) /* Save old states*/ dev->abs_x = abs_x; dev->abs_y = abs_y; - dev->b = b; + dev->b = b; return 0; } From b2dcc4f1b2d3d632e095f1682ad623795a0e8621 Mon Sep 17 00:00:00 2001 From: Jos van Mourik Date: Sun, 15 Sep 2024 17:47:06 +0200 Subject: [PATCH 6/6] Decouple mouse polling from serial speed, add software baud selection, remove baud menu option --- src/device/mouse_microtouch_touchscreen.c | 312 +++++++++++----------- 1 file changed, 159 insertions(+), 153 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 82c936f9c..ca50a0b6b 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -19,8 +19,6 @@ /* TODO: - Properly implement GP/SP commands (formats are not documented at all, like anywhere; no dumps yet). - - Decouple serial packet generation from mouse poll rate. - - Dynamic baud rate selection from software following this. - Add additional SMT2/3 formats as we currently only support Tablet, Hex and Dec. - Mode Polled. */ @@ -62,8 +60,8 @@ const char* mtouch_identity[] = { }; typedef struct mouse_microtouch_t { - double baud_rate, abs_x, abs_y; - int b; + double baud_rate, abs_x, abs_x_old, abs_y, abs_y_old; + int but, but_old; char cmd[256]; int cmd_pos; uint8_t format, mode; @@ -109,55 +107,51 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) if (mtouch->cmd[0] == 'C' && (mtouch->cmd[1] == 'N' || mtouch->cmd[1] == 'X')) { /* Calibrate New/Extended */ mtouch->cal_cntr = 2; } - if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'D') { /* Format Decimal */ - mouse_set_sample_rate(106); + else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'D') { /* Format Decimal */ mtouch->format = FORMAT_DEC; mtouch->mode_status = false; } - if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O') { /* Finger Only */ + else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O') { /* Finger Only */ mtouch->pen_mode = 1; } - if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'H') { /* Format Hexadecimal */ - mouse_set_sample_rate(106); + else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'H') { /* Format Hexadecimal */ mtouch->format = FORMAT_HEX; mtouch->mode_status = false; } - if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'R') { /* Format Raw */ - mouse_set_sample_rate(106); + else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'R') { /* Format Raw */ mtouch->format = FORMAT_RAW; mtouch->mode = MODE_INACTIVE; mtouch->cal_cntr = 0; } - if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'T') { /* Format Tablet */ - mouse_set_sample_rate(192); + else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'T') { /* Format Tablet */ mtouch->format = FORMAT_TABLET; } - if (mtouch->cmd[0] == 'G' && mtouch->cmd[1] == 'P' && mtouch->cmd[2] == '1') { /* Get Parameter Block 1 */ + else if (mtouch->cmd[0] == 'G' && mtouch->cmd[1] == 'P' && mtouch->cmd[2] == '1') { /* Get Parameter Block 1 */ fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x41\x0D", 3); /* A */ fifo8_push_all(&mtouch->resp, (uint8_t *) "0000000000000000000000000\r", 26); } - if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'D' && mtouch->cmd[2] == 'U') { /* Mode Down/Up */ + else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'D' && mtouch->cmd[2] == 'U') { /* Mode Down/Up */ mtouch->mode = MODE_DOWNUP; } - if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'I') { /* Mode Inactive */ + else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'I') { /* Mode Inactive */ mtouch->mode = MODE_INACTIVE; } - if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'P') { /* Mode Point */ + else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'P') { /* Mode Point */ mtouch->mode = MODE_POINT; } - if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'T') { /* Mode Status */ + else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'T') { /* Mode Status */ mtouch->mode_status = true; } - if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'S') { /* Mode Stream */ + else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'S') { /* Mode Stream */ mtouch->mode = MODE_STREAM; } - if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'I') { /* Output Identity */ + else if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'I') { /* Output Identity */ fifo8_push(&mtouch->resp, 0x01); fifo8_push_all(&mtouch->resp, (uint8_t *) mtouch_identity[mtouch->id], 6); fifo8_push(&mtouch->resp, 0x0D); return; } - if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'S') { /* Output Status */ + else if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'S') { /* Output Status */ if (mtouch->reset) { fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x40\x60\x0D", 4); } else { @@ -165,11 +159,23 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) } return; } - if (mtouch->cmd[0] == 'P') { - if (mtouch->cmd[1] == 'F') mtouch->pen_mode = 3; /* Pen or Finger */ - else if (mtouch->cmd[1] == 'O') mtouch->pen_mode = 2; /* Pen Only */ + else if (mtouch->cmd[0] == 'P') { + if (strlen(mtouch->cmd) == 2) { /* Pen */ + if (mtouch->cmd[1] == 'F') mtouch->pen_mode = 3; /* Pen or Finger */ + else if (mtouch->cmd[1] == 'O') mtouch->pen_mode = 2; /* Pen Only */ + } + else if (strlen(mtouch->cmd) == 5) { /* Serial Options */ + if (mtouch->cmd[4] == 1) mtouch->baud_rate = 19200; + else if (mtouch->cmd[4] == 2) mtouch->baud_rate = 9600; + else if (mtouch->cmd[4] == 3) mtouch->baud_rate = 4600; + else if (mtouch->cmd[4] == 4) mtouch->baud_rate = 2400; + else if (mtouch->cmd[4] == 5) mtouch->baud_rate = 1200; + + timer_stop(&mtouch->host_to_serial_timer); + timer_on_auto(&mtouch->host_to_serial_timer, (1000000. / mtouch->baud_rate) * 10); + } } - if (mtouch->cmd[0] == 'R') { /* Reset */ + else if (mtouch->cmd[0] == 'R') { /* Reset */ mtouch->in_reset = true; mtouch->cal_cntr = 0; mtouch->pen_mode = 3; @@ -179,10 +185,8 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) mtouch->mode_status = false; if (mtouch->id < 2) { - mouse_set_sample_rate(106); mtouch->format = FORMAT_DEC; } else { - mouse_set_sample_rate(192); mtouch->format = FORMAT_TABLET; } } @@ -190,11 +194,11 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) timer_on_auto(&mtouch->reset_timer, 500. * 1000.); return; } - if (mtouch->cmd[0] == 'S' && mtouch->cmd[1] == 'P' && mtouch->cmd[2] == '1') { /* Set Parameter Block 1 */ + else if (mtouch->cmd[0] == 'S' && mtouch->cmd[1] == 'P' && mtouch->cmd[2] == '1') { /* Set Parameter Block 1 */ fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x41\x0D", 3); /* A */ return; } - if (mtouch->cmd[0] == 'U' && mtouch->cmd[1] == 'T') { /* Unit Type */ + else if (mtouch->cmd[0] == 'U' && mtouch->cmd[1] == 'T') { /* Unit Type */ fifo8_push(&mtouch->resp, 0x01); if (mtouch->id == 2) { @@ -209,6 +213,111 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x30\x0D", 3); /* 0 */ } +void +mtouch_write(serial_t *serial, void *priv, uint8_t data) +{ + mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; + if (data == '\x1') { + dev->soh = 1; + } + else if (dev->soh) { + if (data != '\r') { + dev->cmd[dev->cmd_pos++] = data; + } else { + dev->soh = 0; + + if (!dev->cmd_pos) { + return; + } + + dev->cmd[dev->cmd_pos++] = data; + dev->cmd_pos = 0; + microtouch_process_commands(dev); + } + } +} + +static int +mtouch_prepare_transmit(void *priv) +{ + char buffer[10]; + mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; + + double abs_x = dev->abs_x; + double abs_y = dev->abs_y; + int but = dev->but; + + if (dev->mode == MODE_INACTIVE) { + return 0; + } + + if (dev->cal_cntr || (!dev->but && !dev->but_old)) { /* Calibration or no buttonpress */ + if (!dev->but && dev->but_old) { + microtouch_calibrate_timer(dev); + } + dev->but_old = but; /* Save buttonpress */ + return 0; + } + + if (dev->format == FORMAT_TABLET) { + if (but) { /* Touchdown/Continuation */ + fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode == 2) ? ((1 << 5) | ((but & 3))) : 0)); + fifo8_push(&dev->resp, (uint16_t)(16383 * abs_x) & 0b1111111); + fifo8_push(&dev->resp, ((uint16_t)(16383 * abs_x) >> 7) & 0b1111111); + fifo8_push(&dev->resp, (uint16_t)(16383 * (1 - abs_y)) & 0b1111111); + fifo8_push(&dev->resp, ((uint16_t)(16383 * (1 - abs_y)) >> 7) & 0b1111111); + } + else if (dev->but_old) { /* Liftoff */ + fifo8_push(&dev->resp, 0b10000000 | ((dev->pen_mode == 2) ? ((1 << 5)) : 0)); + fifo8_push(&dev->resp, (uint16_t)(16383 * dev->abs_x_old) & 0b1111111); + fifo8_push(&dev->resp, ((uint16_t)(16383 * dev->abs_x_old) >> 7) & 0b1111111); + fifo8_push(&dev->resp, (uint16_t)(16383 * (1 - dev->abs_y_old))& 0b1111111); + fifo8_push(&dev->resp, ((uint16_t)(16383 * (1 - dev->abs_y_old)) >> 7) & 0b1111111); + } + } + + else if (dev->format == FORMAT_DEC || dev->format == FORMAT_HEX) { + if (but) { + if (!dev->but_old) { /* Touchdown (MS, MP, MDU) */ + fifo8_push(&dev->resp, (dev->mode_status) ? 0x19 : 0x01); + if (dev->format == FORMAT_DEC){ + snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y))); + } + else if (dev->format == FORMAT_HEX) { + snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * abs_x), (uint16_t)(1023 * (1 - abs_y))); + } + fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); + } + else if (dev->mode == MODE_STREAM){ /* Touch Continuation (MS) */ + fifo8_push(&dev->resp, (dev->mode_status) ? 0x1c : 0x01); + if (dev->format == FORMAT_DEC){ + snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y))); + } + else if (dev->format == FORMAT_HEX) { + snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * abs_x), (uint16_t)(1023 * (1 - abs_y))); + } + fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); + } + } + else if (dev->but_old && dev->mode != MODE_POINT) { /* Touch Liftoff (MS, MDU) */ + fifo8_push(&dev->resp, (dev->mode_status) ? 0x18 : 0x01); + if (dev->format == FORMAT_DEC) { + snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * dev->abs_x_old), (uint16_t)(999 * (1 - dev->abs_y_old))); + } + else if (dev->format == FORMAT_HEX) { + snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * dev->abs_x_old), (uint16_t)(1023 * (1 - dev->abs_y_old))); + } + fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); + } + } + + /* Save old states*/ + dev->abs_x_old = abs_x; + dev->abs_y_old = abs_y; + dev->but_old = but; + return 0; +} + void mtouch_write_to_host(void *priv) { @@ -228,56 +337,21 @@ mtouch_write_to_host(void *priv) if (fifo8_num_used(&dev->resp)) { serial_write_fifo(dev->serial, fifo8_pop(&dev->resp)); } + else { + mtouch_prepare_transmit(dev); + } no_write_to_machine: timer_on_auto(&dev->host_to_serial_timer, (1000000.0 / (double) dev->baud_rate) * (double) (1 + 8 + 1)); } -void -mtouch_write(serial_t *serial, void *priv, uint8_t data) -{ - mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; - if (data == '\x1') { - dev->soh = 1; - } else if (dev->soh) { - if (data != '\r') { - dev->cmd[dev->cmd_pos++] = data; - } else { - dev->soh = 0; - - if (!dev->cmd_pos) { - return; - } - - dev->cmd[dev->cmd_pos++] = data; - dev->cmd_pos = 0; - microtouch_process_commands(dev); - } - } -} - static int mtouch_poll(void *priv) { mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; - double abs_x; - double abs_y; - int b = mouse_get_buttons_ex(); - char buffer[10]; - if (fifo8_num_free(&dev->resp) <= 256 - 10 || dev->mode == MODE_INACTIVE) { - return 0; - } - - if (dev->cal_cntr || (!b && !dev->b)) { /* Calibration or no buttonpress */ - if (!b && dev->b) { - microtouch_calibrate_timer(dev); - } - dev->b = b; /* Save buttonpress */ - return 0; - } - - mouse_get_abs_coords(&abs_x, &abs_y); + dev->but = mouse_get_buttons_ex(); + mouse_get_abs_coords(&dev->abs_x, &dev->abs_y); if (enable_overscan) { int index = mouse_tablet_in_proximity - 1; @@ -285,76 +359,26 @@ mtouch_poll(void *priv) mouse_tablet_in_proximity = 0; } - abs_x *= monitors[index].mon_unscaled_size_x - 1; - abs_y *= monitors[index].mon_efscrnsz_y - 1; + dev->abs_x *= monitors[index].mon_unscaled_size_x - 1; + dev->abs_y *= monitors[index].mon_efscrnsz_y - 1; - if (abs_x <= (monitors[index].mon_overscan_x / 2.)) { - abs_x = (monitors[index].mon_overscan_x / 2.); + if (dev->abs_x <= (monitors[index].mon_overscan_x / 2.)) { + dev->abs_x = (monitors[index].mon_overscan_x / 2.); } - if (abs_y <= (monitors[index].mon_overscan_y / 2.)) { - abs_y = (monitors[index].mon_overscan_y / 2.); + if (dev->abs_y <= (monitors[index].mon_overscan_y / 2.)) { + dev->abs_y = (monitors[index].mon_overscan_y / 2.); } - abs_x -= (monitors[index].mon_overscan_x / 2.); - abs_y -= (monitors[index].mon_overscan_y / 2.); - abs_x = abs_x / (double) monitors[index].mon_xsize; - abs_y = abs_y / (double) monitors[index].mon_ysize; + dev->abs_x -= (monitors[index].mon_overscan_x / 2.); + dev->abs_y -= (monitors[index].mon_overscan_y / 2.); + dev->abs_x = dev->abs_x / (double) monitors[index].mon_xsize; + dev->abs_y = dev->abs_y / (double) monitors[index].mon_ysize; } - if (abs_x >= 1.0) abs_x = 1.0; - if (abs_y >= 1.0) abs_y = 1.0; - if (abs_x <= 0.0) abs_x = 0.0; - if (abs_y <= 0.0) abs_y = 0.0; + if (dev->abs_x >= 1.0) dev->abs_x = 1.0; + if (dev->abs_y >= 1.0) dev->abs_y = 1.0; + if (dev->abs_x <= 0.0) dev->abs_x = 0.0; + if (dev->abs_y <= 0.0) dev->abs_y = 0.0; - if (dev->format == FORMAT_DEC || dev->format == FORMAT_HEX) { - if (b) { - if (!dev->b) { /* Touchdown (MS, MP, MDU) */ - fifo8_push(&dev->resp, (dev->mode_status) ? 0x19 : 0x01); - if (dev->format == FORMAT_DEC){ - snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y))); - } else if (dev->format == FORMAT_HEX) { - snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * abs_x), (uint16_t)(1023 * (1 - abs_y))); - } - fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); - } else if (dev->mode == MODE_STREAM){ /* Touch Continuation (MS) */ - fifo8_push(&dev->resp, (dev->mode_status) ? 0x1c : 0x01); - if (dev->format == FORMAT_DEC){ - snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * abs_x), (uint16_t)(999 * (1 - abs_y))); - } else if (dev->format == FORMAT_HEX) { - snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * abs_x), (uint16_t)(1023 * (1 - abs_y))); - } - fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); - } - } else if (dev->b && dev->mode != MODE_POINT) { /* Touch Liftoff (MS, MDU) */ - fifo8_push(&dev->resp, (dev->mode_status) ? 0x18 : 0x01); - if (dev->format == FORMAT_DEC) { - snprintf(buffer, sizeof(buffer), "%03d,%03d\r", (uint16_t)(999 * dev->abs_x), (uint16_t)(999 * (1 - dev->abs_y))); - } else if (dev->format == FORMAT_HEX) { - snprintf(buffer, sizeof(buffer), "%03X,%03X\r", (uint16_t)(1023 * dev->abs_x), (uint16_t)(1023 * (1 - dev->abs_y))); - } - fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); - } - } - - if (dev->format == FORMAT_TABLET) { - if (b) { /* Touchdown/Continuation */ - fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode == 2) ? ((1 << 5) | ((b & 3))) : 0)); - fifo8_push(&dev->resp, (uint16_t)(16383 * abs_x) & 0b1111111); - fifo8_push(&dev->resp, ((uint16_t)(16383 * abs_x) >> 7) & 0b1111111); - fifo8_push(&dev->resp, (uint16_t)(16383 * (1 - abs_y)) & 0b1111111); - fifo8_push(&dev->resp, ((uint16_t)(16383 * (1 - abs_y)) >> 7) & 0b1111111); - } else if (dev->b) { /* Liftoff */ - fifo8_push(&dev->resp, 0b10000000 | ((dev->pen_mode == 2) ? ((1 << 5)) : 0)); - fifo8_push(&dev->resp, (uint16_t)(16383 * dev->abs_x) & 0b1111111); - fifo8_push(&dev->resp, ((uint16_t)(16383 * dev->abs_x) >> 7) & 0b1111111); - fifo8_push(&dev->resp, (uint16_t)(16383 * (1 - dev->abs_y))& 0b1111111); - fifo8_push(&dev->resp, ((uint16_t)(16383 * (1 - dev->abs_y)) >> 7) & 0b1111111); - } - } - - /* Save old states*/ - dev->abs_x = abs_x; - dev->abs_y = abs_y; - dev->b = b; return 0; } @@ -370,7 +394,7 @@ mtouch_init(const device_t *info) mouse_microtouch_t *dev = calloc(1, sizeof(mouse_microtouch_t)); dev->serial = serial_attach(device_get_config_int("port"), NULL, mtouch_write, dev); - dev->baud_rate = device_get_config_int("baudrate"); + dev->baud_rate = 9600; serial_set_cts(dev->serial, 1); serial_set_dsr(dev->serial, 1); serial_set_dcd(dev->serial, 1); @@ -385,10 +409,8 @@ mtouch_init(const device_t *info) if (dev->id < 2) { /* legacy controllers */ dev->format = FORMAT_DEC; - mouse_set_sample_rate(106); } else { dev->format = FORMAT_TABLET; - mouse_set_sample_rate(192); } mouse_input_mode = device_get_config_int("crosshair") + 1; @@ -432,22 +454,6 @@ static const device_config_t mtouch_config[] = { { .description = "" } } }, - { - .name = "baudrate", - .description = "Baud Rate", - .type = CONFIG_SELECTION, - .default_string = "", - .default_int = 9600, - .file_filter = NULL, - .spinner = { 0 }, - .selection = { - { .description = "19200", .value = 19200 }, - { .description = "9600", .value = 9600 }, - { .description = "4800", .value = 4800 }, - { .description = "2400", .value = 2400 }, - { .description = "1200", .value = 1200 } - } - }, { .name = "identity", .description = "Controller", @@ -486,4 +492,4 @@ const device_t mouse_mtouch_device = { .speed_changed = NULL, .force_redraw = NULL, .config = mtouch_config -}; +}; \ No newline at end of file