claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refer to microtouch struct as dev in all functions

Browse Source
This commit is contained in:
Jos van Mourik
2024-10-08 20:42:47 +02:00
parent b493b41ab2
commit 09bbbacede
1 changed files with 105 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
src/device/mouse_microtouch_touchscreen.c
View File

@@ -81,178 +81,179 @@ static mouse_microtouch_t *mtouch_inst = NULL;
void void
microtouch_reset_complete(void *priv) microtouch_reset_complete(void *priv)
{ {
mouse_microtouch_t *mtouch = (mouse_microtouch_t *) priv; mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
mtouch->reset = true; dev->reset = true;
mtouch->in_reset = false; dev->in_reset = false;
fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x30\x0D", 3); /* <SOH>0<CR> */ fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x30\x0D", 3); /* <SOH>0<CR> */
} }
void void
microtouch_calibrate_timer(void *priv) microtouch_calibrate_timer(void *priv)
{ {
mouse_microtouch_t *mtouch = (mouse_microtouch_t *) priv; mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
if ((mtouch->cal_cntr == 2 && (mtouch->abs_x > 0.25 || mtouch->abs_y < 0.75)) || \ if ((dev->cal_cntr == 2 && (dev->abs_x > 0.25 || dev->abs_y < 0.75)) || \
(mtouch->cal_cntr == 1 && (mtouch->abs_x < 0.75 || mtouch->abs_y > 0.25))) { (dev->cal_cntr == 1 && (dev->abs_x < 0.75 || dev->abs_y > 0.25))) {
return; return;
} }
mtouch->cal_cntr--; dev->cal_cntr--;
fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x31\x0D", 3); /* <SOH>1<CR> */ fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x31\x0D", 3); /* <SOH>1<CR> */
if (mtouch->cal_ex) { if (dev->cal_ex) {
if (!mtouch->cal_cntr) { if (!dev->cal_cntr) {
double x1_ref = 0.125; double x1_ref = 0.125;
double y1_ref = 0.875; double y1_ref = 0.875;
double x2_ref = 0.875; double x2_ref = 0.875;
double y2_ref = 0.125; double y2_ref = 0.125;
double x1 = mtouch->abs_x_old; double x1 = dev->abs_x_old;
double y1 = mtouch->abs_y_old; double y1 = dev->abs_y_old;
double x2 = mtouch->abs_x; double x2 = dev->abs_x;
double y2 = mtouch->abs_y; double y2 = dev->abs_y;
mtouch->scale_x = (x2_ref - x1_ref) / (x2 - x1); dev->scale_x = (x2_ref - x1_ref) / (x2 - x1);
mtouch->off_x = x1_ref - mtouch->scale_x * x1; dev->off_x = x1_ref - dev->scale_x * x1;
mtouch->scale_y = (y2_ref - y1_ref) / (y2 - y1); dev->scale_y = (y2_ref - y1_ref) / (y2 - y1);
mtouch->off_y = y1_ref - mtouch->scale_y * y1; dev->off_y = y1_ref - dev->scale_y * y1;
mtouch->cal_ex = false; dev->cal_ex = false;
pclog("CAL: x1=%f, y1=%f, x2=%f, y2=%f\n", x1, y1, x2, y2); pclog("CAL: x1=%f, y1=%f, x2=%f, y2=%f\n", x1, y1, x2, y2);
pclog("CAL: scale_x=%f, scale_y=%f, off_x=%f, off_y=%f\n", mtouch->scale_x, mtouch->scale_y, mtouch->off_x, mtouch->off_y); pclog("CAL: scale_x=%f, scale_y=%f, off_x=%f, off_y=%f\n", dev->scale_x, dev->scale_y, dev->off_x, dev->off_y);
} }
mtouch->abs_x_old = mtouch->abs_x; dev->abs_x_old = dev->abs_x;
mtouch->abs_y_old = mtouch->abs_y; dev->abs_y_old = dev->abs_y;
} }
} }
void void
microtouch_process_commands(mouse_microtouch_t *mtouch) microtouch_process_commands(mouse_microtouch_t *dev)
{ {
mtouch->cmd[strcspn(mtouch->cmd, "\r")] = '\0'; dev->cmd[strcspn(dev->cmd, "\r")] = '\0';
pclog("MT Command: %s\n", mtouch->cmd); pclog("MT Command: %s\n", dev->cmd);
if (mtouch->cmd[0] == 'C' && mtouch->cmd[1] == 'N') { /* Calibrate New */ if (dev->cmd[0] == 'C' && dev->cmd[1] == 'N') { /* Calibrate New */
mtouch->cal_cntr = 2; dev->cal_cntr = 2;
} }
else if (mtouch->cmd[0] == 'C' && mtouch->cmd[1] == 'X') { /* Calibrate Extended */ else if (dev->cmd[0] == 'C' && dev->cmd[1] == 'X') { /* Calibrate Extended */
mtouch->scale_x = 1; dev->scale_x = 1;
mtouch->scale_y = 1; dev->scale_y = 1;
mtouch->off_x = 0; dev->off_x = 0;
mtouch->off_y = 0; dev->off_y = 0;
mtouch->cal_ex = true; dev->cal_ex = true;
mtouch->cal_cntr = 2; dev->cal_cntr = 2;
} }
else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'D') { /* Format Decimal */ else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'D') { /* Format Decimal */
mtouch->format = FORMAT_DEC; dev->format = FORMAT_DEC;
mtouch->mode_status = false; dev->mode_status = false;
} }
else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O') { /* Finger Only */ else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'O') { /* Finger Only */
mtouch->pen_mode = 1; dev->pen_mode = 1;
} }
else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'H') { /* Format Hexadecimal */ else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'H') { /* Format Hexadecimal */
mtouch->format = FORMAT_HEX; dev->format = FORMAT_HEX;
mtouch->mode_status = false; dev->mode_status = false;
} }
else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'R') { /* Format Raw */ else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'R') { /* Format Raw */
mtouch->format = FORMAT_RAW; dev->format = FORMAT_RAW;
mtouch->mode = MODE_INACTIVE; dev->mode = MODE_INACTIVE;
mtouch->cal_cntr = 0; dev->cal_cntr = 0;
} }
else if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'T') { /* Format Tablet */ else if (dev->cmd[0] == 'F' && dev->cmd[1] == 'T') { /* Format Tablet */
mtouch->format = FORMAT_TABLET; dev->format = FORMAT_TABLET;
} }
else if (mtouch->cmd[0] == 'G' && mtouch->cmd[1] == 'P' && mtouch->cmd[2] == '1') { /* Get Parameter Block 1 */ else if (dev->cmd[0] == 'G' && dev->cmd[1] == 'P' && dev->cmd[2] == '1') { /* Get Parameter Block 1 */
fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x41\x0D", 3); /* <SOH>A<CR> */ fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x41\x0D", 3); /* <SOH>A<CR> */
fifo8_push_all(&mtouch->resp, (uint8_t *) "0000000000000000000000000\r", 26); fifo8_push_all(&dev->resp, (uint8_t *) "0000000000000000000000000\r", 26);
} }
else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'D' && mtouch->cmd[2] == 'U') { /* Mode Down/Up */ else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'D' && dev->cmd[2] == 'U') { /* Mode Down/Up */
mtouch->mode = MODE_DOWNUP; dev->mode = MODE_DOWNUP;
} }
else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'I') { /* Mode Inactive */ else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'I') { /* Mode Inactive */
mtouch->mode = MODE_INACTIVE; dev->mode = MODE_INACTIVE;
} }
else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'P') { /* Mode Point */ else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'P') { /* Mode Point */
mtouch->mode = MODE_POINT; dev->mode = MODE_POINT;
} }
else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'T') { /* Mode Status */ else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'T') { /* Mode Status */
mtouch->mode_status = true; dev->mode_status = true;
} }
else if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'S') { /* Mode Stream */ else if (dev->cmd[0] == 'M' && dev->cmd[1] == 'S') { /* Mode Stream */
mtouch->mode = MODE_STREAM; dev->mode = MODE_STREAM;
} }
else if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'I') { /* Output Identity */ else if (dev->cmd[0] == 'O' && dev->cmd[1] == 'I') { /* Output Identity */
fifo8_push(&mtouch->resp, 0x01); fifo8_push(&dev->resp, 0x01);
fifo8_push_all(&mtouch->resp, (uint8_t *) mtouch_identity[mtouch->id], 6); fifo8_push_all(&dev->resp, (uint8_t *) mtouch_identity[dev->id], 6);
fifo8_push(&mtouch->resp, 0x0D); fifo8_push(&dev->resp, 0x0D);
return; return;
} }
else if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'S') { /* Output Status */ else if (dev->cmd[0] == 'O' && dev->cmd[1] == 'S') { /* Output Status */
if (mtouch->reset) { if (dev->reset) {
fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x40\x60\x0D", 4); fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x40\x60\x0D", 4);
} else { } else {
fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x40\x40\x0D", 4); fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x40\x40\x0D", 4);
} }
return; return;
} }
else if (mtouch->cmd[0] == 'P') { else if (dev->cmd[0] == 'P') {
if (strlen(mtouch->cmd) == 2) { /* Pen */ if (strlen(dev->cmd) == 2) { /* Pen */
if (mtouch->cmd[1] == 'F') mtouch->pen_mode = 3; /* Pen or Finger */ if (dev->cmd[1] == 'F') dev->pen_mode = 3; /* Pen or Finger */
else if (mtouch->cmd[1] == 'O') mtouch->pen_mode = 2; /* Pen Only */ else if (dev->cmd[1] == 'O') dev->pen_mode = 2; /* Pen Only */
} }
else if (strlen(mtouch->cmd) == 5) { /* Serial Options */ else if (strlen(dev->cmd) == 5) { /* Serial Options */
if (mtouch->cmd[4] == 1) mtouch->baud_rate = 19200; if (dev->cmd[4] == 1) dev->baud_rate = 19200;
else if (mtouch->cmd[4] == 2) mtouch->baud_rate = 9600; else if (dev->cmd[4] == 2) dev->baud_rate = 9600;
else if (mtouch->cmd[4] == 3) mtouch->baud_rate = 4600; else if (dev->cmd[4] == 3) dev->baud_rate = 4600;
else if (mtouch->cmd[4] == 4) mtouch->baud_rate = 2400; else if (dev->cmd[4] == 4) dev->baud_rate = 2400;
else if (mtouch->cmd[4] == 5) mtouch->baud_rate = 1200; else if (dev->cmd[4] == 5) dev->baud_rate = 1200;
timer_stop(&mtouch->host_to_serial_timer); timer_stop(&dev->host_to_serial_timer);
timer_on_auto(&mtouch->host_to_serial_timer, (1000000. / mtouch->baud_rate) * 10); timer_on_auto(&dev->host_to_serial_timer, (1000000. / dev->baud_rate) * 10);
} }
} }
else if (mtouch->cmd[0] == 'R') { /* Reset */ else if (dev->cmd[0] == 'R') { /* Reset */
mtouch->in_reset = true; dev->in_reset = true;
mtouch->cal_cntr = 0; dev->cal_cntr = 0;
mtouch->pen_mode = 3; dev->pen_mode = 3;
if (mtouch->cmd[0] == 'D') { /* Restore Defaults */ if (dev->cmd[0] == 'D') { /* Restore Defaults */
mtouch->mode = MODE_STREAM; dev->mode = MODE_STREAM;
mtouch->mode_status = false; dev->mode_status = false;
if (mtouch->id < 2) { if (dev->id < 2) {
mtouch->format = FORMAT_DEC; dev->format = FORMAT_DEC;
} else { } else {
mtouch->format = FORMAT_TABLET; dev->format = FORMAT_TABLET;
} }
} }
timer_on_auto(&mtouch->reset_timer, 500. * 1000.); timer_on_auto(&dev->reset_timer, 500. * 1000.);
return; return;
} }
else if (mtouch->cmd[0] == 'S' && mtouch->cmd[1] == 'P' && mtouch->cmd[2] == '1') { /* Set Parameter Block 1 */ else if (dev->cmd[0] == 'S' && dev->cmd[1] == 'P' && dev->cmd[2] == '1') { /* Set Parameter Block 1 */
fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x41\x0D", 3); /* <SOH>A<CR> */ fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x41\x0D", 3); /* <SOH>A<CR> */
return; return;
} }
else if (mtouch->cmd[0] == 'U' && mtouch->cmd[1] == 'T') { /* Unit Type */ else if (dev->cmd[0] == 'U' && dev->cmd[1] == 'T') { /* Unit Type */
fifo8_push(&mtouch->resp, 0x01); fifo8_push(&dev->resp, 0x01);
if (mtouch->id == 2) { if (dev->id == 2) {
fifo8_push_all(&mtouch->resp, (uint8_t *) "TP****00", 8); fifo8_push_all(&dev->resp, (uint8_t *) "TP****00", 8);
} else { } else {
fifo8_push_all(&mtouch->resp, (uint8_t *) "QM****00", 8); fifo8_push_all(&dev->resp, (uint8_t *) "QM****00", 8);
} }
fifo8_push(&mtouch->resp, 0x0D); fifo8_push(&dev->resp, 0x0D);
return; return;
} }
fifo8_push_all(&mtouch->resp, (uint8_t *) "\x01\x30\x0D", 3); /* <SOH>0<CR> */ fifo8_push_all(&dev->resp, (uint8_t *) "\x01\x30\x0D", 3); /* <SOH>0<CR> */
} }
void void
mtouch_write(serial_t *serial, void *priv, uint8_t data) mtouch_write(serial_t *serial, void *priv, uint8_t data)
{ {
mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
if (data == '\x1') { if (data == '\x1') {
dev->soh = 1; dev->soh = 1;
} }
@@ -276,9 +277,9 @@ mtouch_write(serial_t *serial, void *priv, uint8_t data)
static int static int
mtouch_prepare_transmit(void *priv) mtouch_prepare_transmit(void *priv)
{ {
char buffer[16];
mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
char buffer[16];
double abs_x = dev->abs_x; double abs_x = dev->abs_x;
double abs_y = dev->abs_y; double abs_y = dev->abs_y;
int but = dev->but; int but = dev->but;
@@ -358,6 +359,7 @@ void
mtouch_write_to_host(void *priv) mtouch_write_to_host(void *priv)
{ {
mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
if (dev->serial == NULL) if (dev->serial == NULL)
goto no_write_to_machine; goto no_write_to_machine;
if ((dev->serial->type >= SERIAL_16550) && dev->serial->fifo_enabled) { if ((dev->serial->type >= SERIAL_16550) && dev->serial->fifo_enabled) {