diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2014-07-27 17:07:26 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2014-07-27 17:38:31 +0200 |
| commit | 7dde35d4f7cc3cc1569a31e752ea4043133b1a72 (patch) | |
| tree | 9c91ff60feb667492d76ecfe086849e6fba18b68 /protocol | |
| parent | 388fe60c67dbc4232a979d3de3b3b161a67871e2 (diff) | |
integrated serial mouse drivers as a feature into the firmware architecture
* can be enabled by defining Makefile macro SERIAL_MOUSE_MICROSOFT_ENABLE or
SERIAL_MOUSE_MOUSESYSTEMS_ENABLE.
* Serial implementation can be chosen via SERIAL_MOUSE_USE_SOFT and
SERIAL_MOUSE_USE_UART macros
* UART configuration still has to be done in config.h: I added working clauses
for both mouse protocols to ps2_usb's config.h
Diffstat (limited to 'protocol')
| -rw-r--r-- | protocol/lufa/lufa.c | 12 | ||||
| -rw-r--r-- | protocol/serial_mouse_mousesystems.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c index 16a602df13..58201e5c98 100644 --- a/protocol/lufa/lufa.c +++ b/protocol/lufa/lufa.c @@ -49,6 +49,10 @@ #endif #include "suspend.h" +#ifdef SERIAL_MOUSE_ENABLE +#include "serial_mouse.h" +#endif + #include "descriptor.h" #include "lufa.h" @@ -571,6 +575,10 @@ int main(void) sleep_led_init(); #endif +#ifdef SERIAL_MOUSE_ENABLE + serial_mouse_init(); +#endif + print("Keyboard start.\n"); while (1) { while (USB_DeviceState == DEVICE_STATE_Suspended) { @@ -582,6 +590,10 @@ int main(void) keyboard_task(); +#ifdef SERIAL_MOUSE_ENABLE + serial_mouse_task(); +#endif + #if !defined(INTERRUPT_CONTROL_ENDPOINT) USB_USBTask(); #endif diff --git a/protocol/serial_mouse_mousesystems.c b/protocol/serial_mouse_mousesystems.c index ec708c911f..68b2b5b359 100644 --- a/protocol/serial_mouse_mousesystems.c +++ b/protocol/serial_mouse_mousesystems.c @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "print.h" #include "debug.h" -#define SERIAL_MOUSE_CENTER_SCROLL +//#define SERIAL_MOUSE_CENTER_SCROLL static void print_usb_data(const report_mouse_t *report); |