diff --git a/keyboards/converter/amtelco_kb163/config.h b/keyboards/converter/amtelco_kb163/config.h index 8a6aa0db3ea7..c1a029275582 100644 --- a/keyboards/converter/amtelco_kb163/config.h +++ b/keyboards/converter/amtelco_kb163/config.h @@ -13,15 +13,9 @@ */ #ifdef PS2_USE_USART /* XCK for clock line */ -#define PS2_CLOCK_PORT PORTD -#define PS2_CLOCK_PIN PIND -#define PS2_CLOCK_DDR DDRD -#define PS2_CLOCK_BIT 5 +#define PS2_CLOCK_PIN D5 /* RXD for data line */ -#define PS2_DATA_PORT PORTD -#define PS2_DATA_PIN PIND -#define PS2_DATA_DDR DDRD -#define PS2_DATA_BIT 2 +#define PS2_DATA_PIN D2 /* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */ /* set DDR of CLOCK as input to be slave */ @@ -61,15 +55,8 @@ */ #ifdef PS2_USE_INT /* uses INT1 for clock line(ATMega32U4) */ -#define PS2_CLOCK_PORT PORTD -#define PS2_CLOCK_PIN PIND -#define PS2_CLOCK_DDR DDRD -#define PS2_CLOCK_BIT 1 - -#define PS2_DATA_PORT PORTD -#define PS2_DATA_PIN PIND -#define PS2_DATA_DDR DDRD -#define PS2_DATA_BIT 0 +#define PS2_CLOCK_PIN D1 +#define PS2_DATA_PIN D0 #define PS2_INT_INIT() do { \ EICRA |= ((1< #include "quantum.h" + +#ifdef SERIAL_MOUSE_ENABLE + +#include "serial_mouse.h" + +void keyboard_post_init_kb(void) { + serial_mouse_init(); + keyboard_post_init_user(); +} + +void housekeeping_task_kb(void) { + serial_mouse_task(); +} + +#endif diff --git a/keyboards/converter/ps2_serial_mouse/readme.md b/keyboards/converter/ps2_serial_mouse/readme.md index 020763b8a79d..c7a6b10b21e5 100644 --- a/keyboards/converter/ps2_serial_mouse/readme.md +++ b/keyboards/converter/ps2_serial_mouse/readme.md @@ -13,4 +13,4 @@ The DIN-5 keyboard connector has Data on D0 and Clock on D1. The serial port needs an RS-232 level shifter like a MAX232 and is then connected to RXD1 (D2) and TXD1 (D3). -RTS and DTR also need to be set, since that is how the mouse gets power. RTS can be wired to Vs+ from the MAX232 and DTS to the second transmit line, controlled by GPIO C6. +RTS and DTR also need to be set, since that is how the mouse gets power. RTS can be wired to Vs+ from the MAX232 and DTR to the second transmit line, controlled by GPIO C6. diff --git a/keyboards/converter/ps2_serial_mouse/rules.mk b/keyboards/converter/ps2_serial_mouse/rules.mk index b94a192ba062..1a1368460838 100644 --- a/keyboards/converter/ps2_serial_mouse/rules.mk +++ b/keyboards/converter/ps2_serial_mouse/rules.mk @@ -14,3 +14,18 @@ HARDWARE_SERIAL = yes SRC = matrix.c led.c SRC += protocol/serial_uart.c + +SERIAL_MOUSE_MICROSOFT_ENABLE ?= no +SERIAL_MOUSE_MOUSESYSTEMS_ENABLE ?= yes + +ifeq ($(strip $(SERIAL_MOUSE_MICROSOFT_ENABLE)), yes) + SRC += serial_mouse_microsoft.c + OPT_DEFS += -DSERIAL_MOUSE_ENABLE -DSERIAL_MOUSE_MICROSOFT \ + -DMOUSE_ENABLE +endif + +ifeq ($(strip $(SERIAL_MOUSE_MOUSESYSTEMS_ENABLE)), yes) + SRC += serial_mouse_mousesystems.c + OPT_DEFS += -DSERIAL_MOUSE_ENABLE -DSERIAL_MOUSE_MOUSESYSTEMS \ + -DMOUSE_ENABLE +endif diff --git a/keyboards/converter/ps2_serial_mouse/serial_mouse.h b/keyboards/converter/ps2_serial_mouse/serial_mouse.h new file mode 100644 index 000000000000..01a0580d9623 --- /dev/null +++ b/keyboards/converter/ps2_serial_mouse/serial_mouse.h @@ -0,0 +1,29 @@ +/* +Copyright 2014 Robin Haberkorn + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#include + +#include "protocol/serial.h" + +static inline uint8_t serial_mouse_init(void) { + serial_init(); + return 0; +} + +void serial_mouse_task(void); diff --git a/keyboards/converter/ps2_serial_mouse/serial_mouse_microsoft.c b/keyboards/converter/ps2_serial_mouse/serial_mouse_microsoft.c new file mode 100644 index 000000000000..09d3d2ee498c --- /dev/null +++ b/keyboards/converter/ps2_serial_mouse/serial_mouse_microsoft.c @@ -0,0 +1,115 @@ +/* +Copyright 2014 Robin Haberkorn + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include +#include +#include + +#include "protocol/serial.h" +#include "serial_mouse.h" +#include "report.h" +#include "host.h" +#include "timer.h" +#include "print.h" +#include "debug.h" + +#ifdef MAX +# undef MAX +#endif +#define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) + +static void print_usb_data(const report_mouse_t *report); + +void serial_mouse_task(void) { + /* 3 byte ring buffer */ + static uint8_t buffer[3]; + static int buffer_cur = 0; + + static report_mouse_t report = {}; + + int16_t rcv; + + rcv = serial_recv2(); + if (rcv < 0) /* no new data */ + return; + + rcv &= 0x7F; + + if (debug_mouse) xprintf("serial_mouse: byte: %04X\n", rcv); + + /* + * If bit 6 is one, this signals the beginning + * of a 3 byte sequence/packet. + */ + if (rcv & (1 << 6)) buffer_cur = 0; + + buffer[buffer_cur] = (uint8_t)rcv; + + if (buffer_cur == 0 && buffer[buffer_cur] == 0x20) { + /* + * Logitech extension: This must be a follow-up on + * the last 3-byte packet signaling a middle button click + */ + report.buttons |= MOUSE_BTN3; + report.x = report.y = 0; + + print_usb_data(&report); + host_mouse_send(&report); + return; + } + + buffer_cur++; + + if (buffer_cur < 3) return; + buffer_cur = 0; + + /* + * parse 3 byte packet. + * NOTE: We only get a complete packet + * if the mouse moved or the button states + * change. + */ + report.buttons = 0; + if (buffer[0] & (1 << 5)) report.buttons |= MOUSE_BTN1; + if (buffer[0] & (1 << 4)) report.buttons |= MOUSE_BTN2; + + report.x = (buffer[0] << 6) | buffer[1]; + report.y = ((buffer[0] << 4) & 0xC0) | buffer[2]; + + /* USB HID uses values from -127 to 127 only */ + report.x = MAX(report.x, -127); + report.y = MAX(report.y, -127); + +#if 0 + if (!report.buttons && !report.x && !report.y) { + /* + * Microsoft extension: Middle mouse button pressed + * FIXME: I don't know how exactly this extension works. + */ + report.buttons |= MOUSE_BTN3; + } +#endif + + print_usb_data(&report); + host_mouse_send(&report); +} + +static void print_usb_data(const report_mouse_t *report) { + if (!debug_mouse) return; + + xprintf("serial_mouse usb: [%02X|%d %d %d %d]\n", report->buttons, report->x, report->y, report->v, report->h); +} diff --git a/keyboards/converter/ps2_serial_mouse/serial_mouse_mousesystems.c b/keyboards/converter/ps2_serial_mouse/serial_mouse_mousesystems.c new file mode 100644 index 000000000000..e7ff099334f4 --- /dev/null +++ b/keyboards/converter/ps2_serial_mouse/serial_mouse_mousesystems.c @@ -0,0 +1,119 @@ +/* +Copyright 2014 Robin Haberkorn + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include +#include +#include + +#include "protocol/serial.h" +#include "serial_mouse.h" +#include "report.h" +#include "host.h" +#include "timer.h" +#include "print.h" +#include "debug.h" + +#ifdef MAX +# undef MAX +#endif +#define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) + +//#define SERIAL_MOUSE_CENTER_SCROLL + +static void print_usb_data(const report_mouse_t *report); + +void serial_mouse_task(void) { + /* 5 byte ring buffer */ + static uint8_t buffer[5]; + static int buffer_cur = 0; + + int16_t rcv; + + report_mouse_t report = {0, 0, 0, 0, 0}; + + rcv = serial_recv2(); + if (rcv < 0) /* no new data */ + return; + + if (debug_mouse) xprintf("serial_mouse: byte: %04X\n", rcv); + + /* + * Synchronization: mouse(4) says that all + * bytes but the first one in the packet have + * bit 7 == 0, but this is untrue. + * Therefore we discard all bytes up to the + * first one with the characteristic bit pattern. + */ + if (buffer_cur == 0 && (rcv >> 3) != 0x10) return; + + buffer[buffer_cur++] = (uint8_t)rcv; + + if (buffer_cur < 5) return; + buffer_cur = 0; + +#ifdef SERIAL_MOUSE_CENTER_SCROLL + if ((buffer[0] & 0x7) == 0x5 && (buffer[1] || buffer[2])) { + /* USB HID uses only values from -127 to 127 */ + report.h = MAX((int8_t)buffer[1], -127); + report.v = MAX((int8_t)buffer[2], -127); + + print_usb_data(&report); + host_mouse_send(&report); + + if (buffer[3] || buffer[4]) { + report.h = MAX((int8_t)buffer[3], -127); + report.v = MAX((int8_t)buffer[4], -127); + + print_usb_data(&report); + host_mouse_send(&report); + } + + return; + } +#endif + + /* + * parse 5 byte packet. + * NOTE: We only get a complete packet + * if the mouse moved or the button states + * change. + */ + if (!(buffer[0] & (1 << 2))) report.buttons |= MOUSE_BTN1; + if (!(buffer[0] & (1 << 1))) report.buttons |= MOUSE_BTN3; + if (!(buffer[0] & (1 << 0))) report.buttons |= MOUSE_BTN2; + + /* USB HID uses only values from -127 to 127 */ + report.x = MAX((int8_t)buffer[1], -127); + report.y = MAX(-(int8_t)buffer[2], -127); + + print_usb_data(&report); + host_mouse_send(&report); + + if (buffer[3] || buffer[4]) { + report.x = MAX((int8_t)buffer[3], -127); + report.y = MAX(-(int8_t)buffer[4], -127); + + print_usb_data(&report); + host_mouse_send(&report); + } +} + +static void print_usb_data(const report_mouse_t *report) { + if (!debug_mouse) return; + + xprintf("serial_mouse usb: [%02X|%d %d %d %d]\n", report->buttons, report->x, report->y, report->v, report->h); +}