diff options
author | tmk <hasu@tmk-kbd.com> | 2015-04-28 11:45:25 +0900 |
---|---|---|
committer | tmk <hasu@tmk-kbd.com> | 2015-04-28 11:45:25 +0900 |
commit | 663909772e36d965562b994679858e8b46ed3567 (patch) | |
tree | fb416f095da28041879d2e85cf5d127bdd3957af | |
parent | d9fee5571d7de08e76dff5ce75816faf522240f6 (diff) | |
parent | 7780fd1c01182ab67d899b78d85a0d3b0d89196f (diff) | |
download | firmware-663909772e36d965562b994679858e8b46ed3567.tar.gz firmware-663909772e36d965562b994679858e8b46ed3567.tar.bz2 firmware-663909772e36d965562b994679858e8b46ed3567.zip |
Merge branch 'mek-apelsin-lola'
-rw-r--r-- | converter/adb_usb/Makefile | 4 | ||||
-rw-r--r-- | converter/adb_usb/Makefile.pjrc | 4 | ||||
-rw-r--r-- | converter/adb_usb/matrix.c | 61 |
3 files changed, 69 insertions, 0 deletions
diff --git a/converter/adb_usb/Makefile b/converter/adb_usb/Makefile index a16873dc0..2369ee70a 100644 --- a/converter/adb_usb/Makefile +++ b/converter/adb_usb/Makefile @@ -122,6 +122,10 @@ CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #NKRO_ENABLE = yes # USB Nkey Rollover +ADB_MOUSE_ENABLE = yes + +# ADB Mice need acceleration for todays much bigger screens. +OPT_DEFS += -DADB_MOUSE_MAXACC=8 # Optimize size but this may cause error "relocation truncated to fit" diff --git a/converter/adb_usb/Makefile.pjrc b/converter/adb_usb/Makefile.pjrc index b54ea142c..c320c09d2 100644 --- a/converter/adb_usb/Makefile.pjrc +++ b/converter/adb_usb/Makefile.pjrc @@ -57,6 +57,10 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #NKRO_ENABLE = yes # USB Nkey Rollover(+500) +ADB_MOUSE_ENABLE = yes + +# ADB Mice need acceleration for todays much bigger screens. +OPT_DEFS += -DADB_MOUSE_MAXACC=8 # Search Path diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c index 405391865..6220ee6e1 100644 --- a/converter/adb_usb/matrix.c +++ b/converter/adb_usb/matrix.c @@ -27,6 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "debug.h" #include "adb.h" #include "matrix.h" +#include "report.h" +#include "host.h" #if (MATRIX_COLS > 16) @@ -38,6 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. static bool is_modified = false; +static report_mouse_t mouse_report = {}; // matrix state buffer(1:on, 0:off) #if (MATRIX_COLS <= 8) @@ -86,6 +89,64 @@ void matrix_init(void) return; } +#ifdef ADB_MOUSE_ENABLE + +#ifdef MAX +#undef MAX +#endif +#define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) + +void adb_mouse_task(void) +{ + uint16_t codes; + int16_t x, y; + static int8_t mouseacc; + _delay_ms(12); // delay for preventing overload of poor ADB keyboard controller + codes = adb_host_mouse_recv(); + // If nothing received reset mouse acceleration, and quit. + if (!codes) { + mouseacc = 1; + return; + }; + // Bit sixteen is button. + if (~codes & (1 << 15)) + mouse_report.buttons |= MOUSE_BTN1; + if (codes & (1 << 15)) + mouse_report.buttons &= ~MOUSE_BTN1; + // lower seven bits are movement, as signed int_7. + // low byte is X-axis, high byte is Y. + y = (codes>>8 & 0x3F); + x = (codes>>0 & 0x3F); + // bit seven and fifteen is negative + // usb does not use int_8, but int_7 (measuring distance) with sign-bit. + if (codes & (1 << 6)) + x = (x-0x40); + if (codes & (1 << 14)) + y = (y-0x40); + // Accelerate mouse. (They weren't meant to be used on screens larger than 320x200). + x *= mouseacc; + y *= mouseacc; + // Cap our two bytes per axis to one byte. + // Easier with a MIN-function, but since -MAX(-a,-b) = MIN(a,b)... + // I.E. MIN(MAX(x,-127),127) = -MAX(-MAX(x, -127), -127) = MIN(-MIN(-x,127),127) + mouse_report.x = -MAX(-MAX(x, -127), -127); + mouse_report.y = -MAX(-MAX(y, -127), -127); + if (debug_mouse) { + print("adb_host_mouse_recv: "); print_bin16(codes); print("\n"); + print("adb_mouse raw: ["); + phex(mouseacc); print(" "); + phex(mouse_report.buttons); print("|"); + print_decs(mouse_report.x); print(" "); + print_decs(mouse_report.y); print("]\n"); + } + // Send result by usb. + host_mouse_send(&mouse_report); + // increase acceleration of mouse + mouseacc += ( mouseacc < ADB_MOUSE_MAXACC ? 1 : 0 ); + return; +} +#endif + uint8_t matrix_scan(void) { /* extra_key is volatile and more convoluted than necessary because gcc refused |