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

Cleanup

Browse Source
This commit is contained in:
Jos van Mourik
2024-10-11 22:44:32 +02:00
parent a25892664a
commit bc5b6b71c4
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/device/mouse_microtouch_touchscreen.c
View File

@@ -106,8 +106,6 @@ mtouch_writenvr(void *priv, float scale_x, float scale_y, float off_x, float off
memcpy(&dev->nvr[4], &scale_y, 4); memcpy(&dev->nvr[4], &scale_y, 4);
memcpy(&dev->nvr[8], &off_x, 4); memcpy(&dev->nvr[8], &off_x, 4);
memcpy(&dev->nvr[12], &off_y, 4); memcpy(&dev->nvr[12], &off_y, 4);
pclog("NVR WRITE: %f, %f, %f, %f\n", scale_x, scale_y, off_x, off_y);
} }
static void static void
@@ -119,7 +117,7 @@ mtouch_readnvr(void *priv)
memcpy(&dev->off_x, &dev->nvr[8], 4); memcpy(&dev->off_x, &dev->nvr[8], 4);
memcpy(&dev->off_y, &dev->nvr[12], 4); memcpy(&dev->off_y, &dev->nvr[12], 4);
pclog("NVR READ: %f, %f, %f, %f\n", dev->scale_x, dev->scale_y, dev->off_x, dev->off_y); pclog("MT NVR 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);
} }
static void static void
@@ -182,8 +180,7 @@ mtouch_calibrate_timer(void *priv)
dev->off_y = y1_ref - dev->scale_y * y1; dev->off_y = y1_ref - dev->scale_y * y1;
dev->cal_ex = false; dev->cal_ex = false;
pclog("CAL: x1=%f, y1=%f, x2=%f, y2=%f\n", x1, y1, x2, y2); pclog("MT NEW 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);
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_writenvr(dev, dev->scale_x, dev->scale_y, dev->off_x, dev->off_y); mtouch_writenvr(dev, dev->scale_x, dev->scale_y, dev->off_x, dev->off_y);
mtouch_savenvr(dev); mtouch_savenvr(dev);
} }
@@ -515,10 +512,6 @@ mtouch_init(const device_t *info)
dev->id = device_get_config_int("identity"); dev->id = device_get_config_int("identity");
dev->pen_mode = 3; dev->pen_mode = 3;
dev->mode = MODE_STREAM; dev->mode = MODE_STREAM;
dev->scale_x = 1;
dev->scale_y = 1;
dev->off_x = 0;
dev->off_y = 0;
sprintf(dev->nvr_path, "mtouch_%s.nvr", mtouch_identity[dev->id]); sprintf(dev->nvr_path, "mtouch_%s.nvr", mtouch_identity[dev->id]);
mtouch_initnvr(dev); mtouch_initnvr(dev);