80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

A liftoff should keep the old touch location

Browse Source
This commit is contained in:
Jos van Mourik
2024-08-04 01:04:09 +02:00
parent 09dad6f6b7
commit 7692abb60c
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/device/mouse_microtouch_touchscreen.c
View File

@@ -55,19 +55,20 @@ const char* mtouch_identity[] = {
}; };
typedef struct mouse_microtouch_t { typedef struct mouse_microtouch_t {
double baud_rate; double baud_rate;
int b; unsigned int abs_x_int, abs_y_int;
char cmd[256]; int b;
int cmd_pos; char cmd[256];
uint8_t format; int cmd_pos;
bool mode_status; uint8_t format;
uint8_t id, cal_cntr, pen_mode; bool mode_status;
bool soh; uint8_t id, cal_cntr, pen_mode;
bool in_reset; bool soh;
serial_t *serial; bool in_reset;
Fifo8 resp; serial_t *serial;
pc_timer_t host_to_serial_timer; Fifo8 resp;
pc_timer_t reset_timer; pc_timer_t host_to_serial_timer;
pc_timer_t reset_timer;
} mouse_microtouch_t; } mouse_microtouch_t;
static mouse_microtouch_t *mtouch_inst = NULL; static mouse_microtouch_t *mtouch_inst = NULL;
@@ -296,7 +297,7 @@ mtouch_poll(void *priv)
snprintf(buffer, sizeof(buffer), "\x1c%03d,%03d\r", abs_x_int, abs_y_int); snprintf(buffer, sizeof(buffer), "\x1c%03d,%03d\r", abs_x_int, abs_y_int);
} }
} else if (dev->b) { /* Liftoff Status */ } else if (dev->b) { /* Liftoff Status */
snprintf(buffer, sizeof(buffer), "\x18%03d,%03d\r", abs_x_int, abs_y_int); 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)); fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer));
} }
@@ -320,7 +321,7 @@ mtouch_poll(void *priv)
snprintf(buffer, sizeof(buffer), "\x1c%03X,%03X\r", abs_x_int, abs_y_int); snprintf(buffer, sizeof(buffer), "\x1c%03X,%03X\r", abs_x_int, abs_y_int);
} }
} else if (dev->b) { /* Liftoff Status */ } else if (dev->b) { /* Liftoff Status */
snprintf(buffer, sizeof(buffer), "\x18%03X,%03X\r", abs_x_int, abs_y_int); snprintf(buffer, sizeof(buffer), "\x18%03X,%03X\r", dev->abs_x_int, dev->abs_y_int);
} }
fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer));
} }
@@ -338,14 +339,17 @@ mtouch_poll(void *priv)
fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111); fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111);
} else if (dev->b) { /* Liftoff */ } else if (dev->b) { /* Liftoff */
fifo8_push(&dev->resp, 0b10000000 | ((dev->pen_mode == 2) ? ((1 << 5)) : 0)); fifo8_push(&dev->resp, 0b10000000 | ((dev->pen_mode == 2) ? ((1 << 5)) : 0));
fifo8_push(&dev->resp, abs_x_int & 0b1111111); fifo8_push(&dev->resp, dev->abs_x_int & 0b1111111);
fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); fifo8_push(&dev->resp, (dev->abs_x_int >> 7) & 0b1111111);
fifo8_push(&dev->resp, abs_y_int & 0b1111111); fifo8_push(&dev->resp, dev->abs_y_int & 0b1111111);
fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111); fifo8_push(&dev->resp, (dev->abs_y_int >> 7) & 0b1111111);
} }
} }
dev->b = b; /* Save buttonpress */ /* Save old states*/
dev->abs_x_int = abs_x_int;
dev->abs_y_int = abs_y_int;
dev->b = b;
return 0; return 0;
} }