mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-12-13 03:38:41 +08:00
Remove PJRC USB stack
This commit is contained in:
fauxpark
skullydazed
@@ -6,7 +6,6 @@ tmk_core/protocol/lufa
|
|||||||
tmk_core/protocol/midi
|
tmk_core/protocol/midi
|
||||||
tmk_core/protocol/midi/bytequeue
|
tmk_core/protocol/midi/bytequeue
|
||||||
tmk_core/protocol/midi/Config
|
tmk_core/protocol/midi/Config
|
||||||
tmk_core/protocol/pjrc
|
|
||||||
tmk_core/protocol/usb_hid
|
tmk_core/protocol/usb_hid
|
||||||
tmk_core/protocol/vusb
|
tmk_core/protocol/vusb
|
||||||
tmk_core/tool
|
tmk_core/tool
|
||||||
|
|||||||
@@ -43,13 +43,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
# include "mousekey.h"
|
# include "mousekey.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PROTOCOL_PJRC
|
|
||||||
# include "usb_keyboard.h"
|
|
||||||
# ifdef EXTRAKEY_ENABLE
|
|
||||||
# include "usb_extra.h"
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PROTOCOL_VUSB
|
#ifdef PROTOCOL_VUSB
|
||||||
# include "usbdrv.h"
|
# include "usbdrv.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -165,9 +158,6 @@ static void print_version(void) {
|
|||||||
/* build options */
|
/* build options */
|
||||||
print("OPTIONS:"
|
print("OPTIONS:"
|
||||||
|
|
||||||
#ifdef PROTOCOL_PJRC
|
|
||||||
" PJRC"
|
|
||||||
#endif
|
|
||||||
#ifdef PROTOCOL_LUFA
|
#ifdef PROTOCOL_LUFA
|
||||||
" LUFA"
|
" LUFA"
|
||||||
#endif
|
#endif
|
||||||
@@ -217,20 +207,6 @@ static void print_status(void) {
|
|||||||
print_val_hex8(keymap_config.nkro);
|
print_val_hex8(keymap_config.nkro);
|
||||||
#endif
|
#endif
|
||||||
print_val_hex32(timer_read32());
|
print_val_hex32(timer_read32());
|
||||||
|
|
||||||
#ifdef PROTOCOL_PJRC
|
|
||||||
print_val_hex8(UDCON);
|
|
||||||
print_val_hex8(UDIEN);
|
|
||||||
print_val_hex8(UDINT);
|
|
||||||
print_val_hex8(usb_keyboard_leds);
|
|
||||||
print_val_hex8(usb_keyboard_idle_count);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PROTOCOL_PJRC
|
|
||||||
# if USB_COUNT_SOF
|
|
||||||
print_val_hex8(usbSofCount);
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,27 +1,11 @@
|
|||||||
BLUEFRUIT_DIR = protocol/bluefruit
|
BLUEFRUIT_DIR = protocol/bluefruit
|
||||||
PJRC_DIR = protocol/pjrc
|
|
||||||
|
|
||||||
SRC += $(BLUEFRUIT_DIR)/main.c \
|
SRC += $(BLUEFRUIT_DIR)/main.c \
|
||||||
$(BLUEFRUIT_DIR)/bluefruit.c \
|
$(BLUEFRUIT_DIR)/bluefruit.c \
|
||||||
serial_uart.c \
|
serial_uart.c
|
||||||
$(PJRC_DIR)/pjrc.c \
|
|
||||||
$(PJRC_DIR)/usb_keyboard.c \
|
|
||||||
$(PJRC_DIR)/usb_debug.c \
|
|
||||||
$(PJRC_DIR)/usb.c
|
|
||||||
|
|
||||||
# Option modules
|
|
||||||
ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
|
|
||||||
SRC += $(PJRC_DIR)/usb_mouse.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef EXTRAKEY_ENABLE
|
|
||||||
SRC += $(PJRC_DIR)/usb_extra.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Search Path
|
# Search Path
|
||||||
VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)
|
VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)
|
||||||
#VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)/usb_debug_only
|
#VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)/usb_debug_only
|
||||||
VPATH += $(TMK_DIR)/$(PJRC_DIR)
|
|
||||||
|
|
||||||
OPT_DEFS += -DPROTOCOL_BLUEFRUIT
|
OPT_DEFS += -DPROTOCOL_BLUEFRUIT
|
||||||
OPT_DEFS += -DPROTOCOL_PJRC
|
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#include <util/delay.h>
|
#include <util/delay.h>
|
||||||
#include "../serial.h"
|
#include "../serial.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
#include "usb.h"
|
|
||||||
#include "host.h"
|
#include "host.h"
|
||||||
#include "timer.h"
|
#include "timer.h"
|
||||||
#include "print.h"
|
#include "print.h"
|
||||||
@@ -32,14 +31,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#include "sendchar.h"
|
#include "sendchar.h"
|
||||||
#include "suspend.h"
|
#include "suspend.h"
|
||||||
#include "bluefruit.h"
|
#include "bluefruit.h"
|
||||||
#include "pjrc.h"
|
|
||||||
|
|
||||||
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
|
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
|
||||||
|
|
||||||
#define HOST_DRIVER_NOT_SET 0
|
|
||||||
#define BLUEFRUIT_HOST_DRIVER 1
|
|
||||||
#define PJRC_HOST_DRIVER 2
|
|
||||||
|
|
||||||
int main(void) {
|
int main(void) {
|
||||||
CPU_PRESCALE(0);
|
CPU_PRESCALE(0);
|
||||||
|
|
||||||
@@ -51,27 +45,11 @@ int main(void) {
|
|||||||
|
|
||||||
print_set_sendchar(sendchar);
|
print_set_sendchar(sendchar);
|
||||||
|
|
||||||
// usb_init();
|
|
||||||
// _delay_ms(2000);
|
|
||||||
// while (!usb_configured()) /* wait */
|
|
||||||
|
|
||||||
keyboard_setup();
|
keyboard_setup();
|
||||||
|
|
||||||
dprintf("Initializing keyboard...\n");
|
dprintf("Initializing keyboard...\n");
|
||||||
keyboard_init();
|
keyboard_init();
|
||||||
|
|
||||||
// This implementation is pretty simplistic... if the USB connection
|
|
||||||
// is not configured, choose the Bluefruit, otherwise use USB
|
|
||||||
// Definitely would prefer to have this driven by an input pin and make
|
|
||||||
// it switch dynamically - BCG
|
|
||||||
// if (!usb_configured()) {
|
|
||||||
|
|
||||||
// // Send power to Bluefruit... Adafruit says it takes 27 mA, I think
|
|
||||||
// // the pins should provide 40 mA, but just in case I switch the
|
|
||||||
// // Bluefruit using a transistor - BCG
|
|
||||||
// DDRB = _BV(PB6);
|
|
||||||
// PORTB |= _BV(PB6);
|
|
||||||
|
|
||||||
dprintf("Setting host driver to bluefruit...\n");
|
dprintf("Setting host driver to bluefruit...\n");
|
||||||
host_set_driver(bluefruit_driver());
|
host_set_driver(bluefruit_driver());
|
||||||
|
|
||||||
@@ -106,29 +84,4 @@ int main(void) {
|
|||||||
while (1) {
|
while (1) {
|
||||||
keyboard_task();
|
keyboard_task();
|
||||||
}
|
}
|
||||||
|
|
||||||
// } else {
|
|
||||||
|
|
||||||
// // I'm not smart enough to get this done with LUFA - BCG
|
|
||||||
// dprintf("Setting host driver to PJRC...\n");
|
|
||||||
// host_set_driver(pjrc_driver());
|
|
||||||
// #ifdef SLEEP_LED_ENABLE
|
|
||||||
// sleep_led_init();
|
|
||||||
// #endif
|
|
||||||
// // wait an extra second for the PC's operating system
|
|
||||||
// // to load drivers and do whatever it does to actually
|
|
||||||
// // be ready for input
|
|
||||||
// _delay_ms(1000);
|
|
||||||
// PORTB = ~_BV(PB0);
|
|
||||||
// dprintf("Starting main loop");
|
|
||||||
// while (1) {
|
|
||||||
// while (suspend) {
|
|
||||||
// suspend_power_down();
|
|
||||||
// if (remote_wakeup && suspend_wakeup_condition()) {
|
|
||||||
// usb_remote_wakeup();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// keyboard_task();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
PJRC_DIR = protocol/pjrc
|
|
||||||
|
|
||||||
SRC += $(PJRC_DIR)/main.c \
|
|
||||||
$(PJRC_DIR)/pjrc.c \
|
|
||||||
$(PJRC_DIR)/usb_keyboard.c \
|
|
||||||
$(PJRC_DIR)/usb_debug.c \
|
|
||||||
$(PJRC_DIR)/usb.c
|
|
||||||
|
|
||||||
# Option modules
|
|
||||||
ifdef MOUSEKEY_ENABLE
|
|
||||||
SRC += $(PJRC_DIR)/usb_mouse.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef ADB_MOUSE_ENABLE
|
|
||||||
SRC += $(PJRC_DIR)/usb_mouse.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef PS2_MOUSE_ENABLE
|
|
||||||
SRC += $(PJRC_DIR)/usb_mouse.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef EXTRAKEY_ENABLE
|
|
||||||
SRC += $(PJRC_DIR)/usb_extra.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
ifdef POINTING_DEVICE_ENABLE
|
|
||||||
SRC += $(PJRC_DIR)/usb_mouse.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Search Path
|
|
||||||
VPATH += $(TMK_DIR)/$(PJRC_DIR)
|
|
||||||
|
|
||||||
# This indicates using LUFA stack
|
|
||||||
OPT_DEFS += -DPROTOCOL_PJRC
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
Endpoint configuration
|
|
||||||
----------------------
|
|
||||||
0 Control endpoint
|
|
||||||
1 keyboard
|
|
||||||
2 mouse
|
|
||||||
3 debug
|
|
||||||
4 extra key(consumer/system)
|
|
||||||
5 nkro keyboard(supported only on ATmega32U4/16U4 and AT90USB64/128)
|
|
||||||
|
|
||||||
|
|
||||||
ATmega32U4/16U4, AT90USB64/128
|
|
||||||
• Endpoint 0:programmable size FIFO up to 64 bytes, default control endpoint
|
|
||||||
• Endpoints 1 programmable size FIFO up to 256 bytes in ping-pong mode.
|
|
||||||
• Endpoints 2 to 6: programmable size FIFO up to 64 bytes in ping-pong mode.
|
|
||||||
|
|
||||||
AT90USB82/162, ATmega8U2/16U2/32U2
|
|
||||||
• Endpoint 0:programmable size FIFO up to 64 bytes, default control endpoint
|
|
||||||
• Endpoints 1 and 2: programmable size FIFO up to 64 bytes.
|
|
||||||
• Endpoints 3 and 4: programmable size FIFO up to 64 bytes with ping-pong mode.
|
|
||||||
|
|
||||||
ping-pong mode means double buffer feature.
|
|
||||||
|
|
||||||
|
|
||||||
NOTE: ATmega8U2/16U2/32U2 is not supported with PJRC stack at this time.
|
|
||||||
TODO: Macro definition for ATmega8U2/16U2/32U2 in usb.h
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
/* Keyboard example with debug channel, for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_keyboard.html
|
|
||||||
* Copyright (c) 2008 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <avr/io.h>
|
|
||||||
#include <avr/interrupt.h>
|
|
||||||
#include <avr/wdt.h>
|
|
||||||
#include <util/delay.h>
|
|
||||||
#include "keyboard.h"
|
|
||||||
#include "usb.h"
|
|
||||||
#include "matrix.h"
|
|
||||||
#include "print.h"
|
|
||||||
#include "debug.h"
|
|
||||||
#include "sendchar.h"
|
|
||||||
#include "util.h"
|
|
||||||
#include "suspend.h"
|
|
||||||
#include "host.h"
|
|
||||||
#include "pjrc.h"
|
|
||||||
|
|
||||||
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
|
|
||||||
|
|
||||||
int main(void) {
|
|
||||||
// set for 16 MHz clock
|
|
||||||
CPU_PRESCALE(0);
|
|
||||||
|
|
||||||
keyboard_setup();
|
|
||||||
|
|
||||||
// Initialize the USB, and then wait for the host to set configuration.
|
|
||||||
// If the Teensy is powered without a PC connected to the USB port,
|
|
||||||
// this will wait forever.
|
|
||||||
usb_init();
|
|
||||||
while (!usb_configured()) /* wait */
|
|
||||||
;
|
|
||||||
|
|
||||||
print_set_sendchar(sendchar);
|
|
||||||
|
|
||||||
keyboard_init();
|
|
||||||
host_set_driver(pjrc_driver());
|
|
||||||
#ifdef SLEEP_LED_ENABLE
|
|
||||||
sleep_led_init();
|
|
||||||
#endif
|
|
||||||
while (1) {
|
|
||||||
while (suspend) {
|
|
||||||
suspend_power_down();
|
|
||||||
if (remote_wakeup && suspend_wakeup_condition()) {
|
|
||||||
usb_remote_wakeup();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
keyboard_task();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2011 Jun Wako <wakojun@gmail.com>
|
|
||||||
|
|
||||||
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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include "usb_keyboard.h"
|
|
||||||
#include "usb_mouse.h"
|
|
||||||
#include "usb_extra.h"
|
|
||||||
#include "host_driver.h"
|
|
||||||
#include "pjrc.h"
|
|
||||||
|
|
||||||
/*------------------------------------------------------------------*
|
|
||||||
* Host driver
|
|
||||||
*------------------------------------------------------------------*/
|
|
||||||
static uint8_t keyboard_leds(void);
|
|
||||||
static void send_keyboard(report_keyboard_t *report);
|
|
||||||
static void send_mouse(report_mouse_t *report);
|
|
||||||
static void send_system(uint16_t data);
|
|
||||||
static void send_consumer(uint16_t data);
|
|
||||||
|
|
||||||
static host_driver_t driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
|
|
||||||
|
|
||||||
host_driver_t *pjrc_driver(void) { return &driver; }
|
|
||||||
|
|
||||||
static uint8_t keyboard_leds(void) { return usb_keyboard_leds; }
|
|
||||||
|
|
||||||
static void send_keyboard(report_keyboard_t *report) { usb_keyboard_send_report(report); }
|
|
||||||
|
|
||||||
static void send_mouse(report_mouse_t *report) {
|
|
||||||
#ifdef MOUSE_ENABLE
|
|
||||||
usb_mouse_send(report->x, report->y, report->v, report->h, report->buttons);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static void send_system(uint16_t data) {
|
|
||||||
#ifdef EXTRAKEY_ENABLE
|
|
||||||
usb_extra_system_send(data);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static void send_consumer(uint16_t data) {
|
|
||||||
#ifdef EXTRAKEY_ENABLE
|
|
||||||
usb_extra_consumer_send(data);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2011 Jun Wako <wakojun@gmail.com>
|
|
||||||
|
|
||||||
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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PJRC_H
|
|
||||||
#define PJRC_H
|
|
||||||
|
|
||||||
#include "host_driver.h"
|
|
||||||
|
|
||||||
host_driver_t *pjrc_driver(void);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,131 +0,0 @@
|
|||||||
/* USB Keyboard Plus Debug Channel Example for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_keyboard.html
|
|
||||||
* Copyright (c) 2009 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef USB_H
|
|
||||||
#define USB_H 1
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <avr/io.h>
|
|
||||||
|
|
||||||
extern bool remote_wakeup;
|
|
||||||
extern bool suspend;
|
|
||||||
|
|
||||||
void usb_init(void); // initialize everything
|
|
||||||
uint8_t usb_configured(void); // is the USB port configured
|
|
||||||
void usb_remote_wakeup(void);
|
|
||||||
|
|
||||||
#define EP_TYPE_CONTROL 0x00
|
|
||||||
#define EP_TYPE_BULK_IN 0x81
|
|
||||||
#define EP_TYPE_BULK_OUT 0x80
|
|
||||||
#define EP_TYPE_INTERRUPT_IN 0xC1
|
|
||||||
#define EP_TYPE_INTERRUPT_OUT 0xC0
|
|
||||||
#define EP_TYPE_ISOCHRONOUS_IN 0x41
|
|
||||||
#define EP_TYPE_ISOCHRONOUS_OUT 0x40
|
|
||||||
|
|
||||||
#define EP_SINGLE_BUFFER 0x02
|
|
||||||
#define EP_DOUBLE_BUFFER 0x06
|
|
||||||
|
|
||||||
#define EP_SIZE(s) ((s) == 64 ? 0x30 : ((s) == 32 ? 0x20 : ((s) == 16 ? 0x10 : 0x00)))
|
|
||||||
|
|
||||||
#if defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__)
|
|
||||||
# define MAX_ENDPOINT 4
|
|
||||||
# define UERST_MASK 0x1E
|
|
||||||
#else
|
|
||||||
# define MAX_ENDPOINT 6
|
|
||||||
# define UERST_MASK 0x7E
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define LSB(n) (n & 255)
|
|
||||||
#define MSB(n) ((n >> 8) & 255)
|
|
||||||
|
|
||||||
#if defined(__AVR_AT90USB162__)
|
|
||||||
# define HW_CONFIG()
|
|
||||||
# define PLL_CONFIG() (PLLCSR = ((1 << PLLE) | (1 << PLLP0)))
|
|
||||||
# define USB_CONFIG() (USBCON = (1 << USBE))
|
|
||||||
# define USB_FREEZE() (USBCON = ((1 << USBE) | (1 << FRZCLK)))
|
|
||||||
#elif defined(__AVR_ATmega32U4__)
|
|
||||||
# define HW_CONFIG() (UHWCON = 0x01)
|
|
||||||
# define PLL_CONFIG() (PLLCSR = 0x12)
|
|
||||||
# define USB_CONFIG() (USBCON = ((1 << USBE) | (1 << OTGPADE)))
|
|
||||||
# define USB_FREEZE() (USBCON = ((1 << USBE) | (1 << FRZCLK)))
|
|
||||||
#elif defined(__AVR_AT90USB646__)
|
|
||||||
# define HW_CONFIG() (UHWCON = 0x81)
|
|
||||||
# define PLL_CONFIG() (PLLCSR = 0x1A)
|
|
||||||
# define USB_CONFIG() (USBCON = ((1 << USBE) | (1 << OTGPADE)))
|
|
||||||
# define USB_FREEZE() (USBCON = ((1 << USBE) | (1 << FRZCLK)))
|
|
||||||
#elif defined(__AVR_AT90USB1286__)
|
|
||||||
# define HW_CONFIG() (UHWCON = 0x81)
|
|
||||||
# define PLL_CONFIG() (PLLCSR = 0x16)
|
|
||||||
# define USB_CONFIG() (USBCON = ((1 << USBE) | (1 << OTGPADE)))
|
|
||||||
# define USB_FREEZE() (USBCON = ((1 << USBE) | (1 << FRZCLK)))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// standard control endpoint request types
|
|
||||||
#define GET_STATUS 0
|
|
||||||
#define CLEAR_FEATURE 1
|
|
||||||
#define SET_FEATURE 3
|
|
||||||
#define SET_ADDRESS 5
|
|
||||||
#define GET_DESCRIPTOR 6
|
|
||||||
#define GET_CONFIGURATION 8
|
|
||||||
#define SET_CONFIGURATION 9
|
|
||||||
#define GET_INTERFACE 10
|
|
||||||
#define SET_INTERFACE 11
|
|
||||||
// HID (human interface device)
|
|
||||||
#define HID_GET_REPORT 1
|
|
||||||
#define HID_GET_IDLE 2
|
|
||||||
#define HID_GET_PROTOCOL 3
|
|
||||||
#define HID_SET_REPORT 9
|
|
||||||
#define HID_SET_IDLE 10
|
|
||||||
#define HID_SET_PROTOCOL 11
|
|
||||||
#define HID_REPORT_INPUT 1
|
|
||||||
#define HID_REPORT_OUTPUT 2
|
|
||||||
#define HID_REPORT_FEATURE 3
|
|
||||||
// CDC (communication class device)
|
|
||||||
#define CDC_SET_LINE_CODING 0x20
|
|
||||||
#define CDC_GET_LINE_CODING 0x21
|
|
||||||
#define CDC_SET_CONTROL_LINE_STATE 0x22
|
|
||||||
// HID feature selectors
|
|
||||||
#define DEVICE_REMOTE_WAKEUP 1
|
|
||||||
#define ENDPOINT_HALT 0
|
|
||||||
#define TEST_MODE 2
|
|
||||||
|
|
||||||
/*------------------------------------------------------------------*
|
|
||||||
* Keyboard descriptor setting
|
|
||||||
*------------------------------------------------------------------*/
|
|
||||||
#define KBD_INTERFACE 0
|
|
||||||
#define KBD_ENDPOINT 1
|
|
||||||
#define KBD_SIZE 8
|
|
||||||
#define KBD_BUFFER EP_SINGLE_BUFFER
|
|
||||||
#define KBD_REPORT_KEYS (KBD_SIZE - 2)
|
|
||||||
|
|
||||||
// secondary keyboard
|
|
||||||
#ifdef NKRO_ENABLE
|
|
||||||
# define KBD2_INTERFACE 4
|
|
||||||
# define KBD2_ENDPOINT 5
|
|
||||||
# define KBD2_SIZE 16
|
|
||||||
# define KBD2_BUFFER EP_DOUBLE_BUFFER
|
|
||||||
# define KBD2_REPORT_KEYS (KBD2_SIZE - 1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
/* USB Keyboard Plus Debug Channel Example for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_keyboard.html
|
|
||||||
* Copyright (c) 2009 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <avr/interrupt.h>
|
|
||||||
#include "sendchar.h"
|
|
||||||
#include "usb_debug.h"
|
|
||||||
|
|
||||||
// the time remaining before we transmit any partially full
|
|
||||||
// packet, or send a zero length packet.
|
|
||||||
volatile uint8_t debug_flush_timer = 0;
|
|
||||||
|
|
||||||
int8_t sendchar(uint8_t c) {
|
|
||||||
static uint8_t previous_timeout = 0;
|
|
||||||
uint8_t timeout, intr_state;
|
|
||||||
|
|
||||||
// if we're not online (enumerated and configured), error
|
|
||||||
if (!usb_configured()) return -1;
|
|
||||||
// interrupts are disabled so these functions can be
|
|
||||||
// used from the main program or interrupt context,
|
|
||||||
// even both in the same program!
|
|
||||||
intr_state = SREG;
|
|
||||||
cli();
|
|
||||||
UENUM = DEBUG_TX_ENDPOINT;
|
|
||||||
// if we gave up due to timeout before, don't wait again
|
|
||||||
if (previous_timeout) {
|
|
||||||
if (!(UEINTX & (1 << RWAL))) {
|
|
||||||
SREG = intr_state;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
previous_timeout = 0;
|
|
||||||
}
|
|
||||||
// wait for the FIFO to be ready to accept data
|
|
||||||
timeout = UDFNUML + 4;
|
|
||||||
while (1) {
|
|
||||||
// are we ready to transmit?
|
|
||||||
if (UEINTX & (1 << RWAL)) break;
|
|
||||||
SREG = intr_state;
|
|
||||||
// have we waited too long?
|
|
||||||
if (UDFNUML == timeout) {
|
|
||||||
previous_timeout = 1;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
// has the USB gone offline?
|
|
||||||
if (!usb_configured()) return -1;
|
|
||||||
// get ready to try checking again
|
|
||||||
intr_state = SREG;
|
|
||||||
cli();
|
|
||||||
UENUM = DEBUG_TX_ENDPOINT;
|
|
||||||
}
|
|
||||||
// actually write the byte into the FIFO
|
|
||||||
UEDATX = c;
|
|
||||||
// if this completed a packet, transmit it now!
|
|
||||||
if (!(UEINTX & (1 << RWAL))) {
|
|
||||||
UEINTX = 0x3A;
|
|
||||||
debug_flush_timer = 0;
|
|
||||||
} else {
|
|
||||||
debug_flush_timer = 2;
|
|
||||||
}
|
|
||||||
SREG = intr_state;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// immediately transmit any buffered output.
|
|
||||||
void usb_debug_flush_output(void) {
|
|
||||||
uint8_t intr_state;
|
|
||||||
|
|
||||||
intr_state = SREG;
|
|
||||||
cli();
|
|
||||||
if (debug_flush_timer) {
|
|
||||||
UENUM = DEBUG_TX_ENDPOINT;
|
|
||||||
while ((UEINTX & (1 << RWAL))) {
|
|
||||||
UEDATX = 0;
|
|
||||||
}
|
|
||||||
UEINTX = 0x3A;
|
|
||||||
debug_flush_timer = 0;
|
|
||||||
}
|
|
||||||
SREG = intr_state;
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
/* USB Keyboard Plus Debug Channel Example for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_keyboard.html
|
|
||||||
* Copyright (c) 2009 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef USB_DEBUG_H
|
|
||||||
#define USB_DEBUG_H 1
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include "usb.h"
|
|
||||||
|
|
||||||
#define DEBUG_INTERFACE 2
|
|
||||||
#define DEBUG_TX_ENDPOINT 3
|
|
||||||
#define DEBUG_TX_SIZE 32
|
|
||||||
#define DEBUG_TX_BUFFER EP_DOUBLE_BUFFER
|
|
||||||
|
|
||||||
extern volatile uint8_t debug_flush_timer;
|
|
||||||
|
|
||||||
void usb_debug_flush_output(void); // immediately transmit any buffered output
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
/* USB Keyboard Plus Debug Channel Example for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_keyboard.html
|
|
||||||
* Copyright (c) 2009 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <util/delay.h>
|
|
||||||
#include <avr/interrupt.h>
|
|
||||||
#include "host.h"
|
|
||||||
#include "usb_extra.h"
|
|
||||||
|
|
||||||
int8_t usb_extra_send(uint8_t report_id, uint16_t data) {
|
|
||||||
uint8_t intr_state, timeout;
|
|
||||||
|
|
||||||
if (!usb_configured()) return -1;
|
|
||||||
intr_state = SREG;
|
|
||||||
cli();
|
|
||||||
UENUM = EXTRA_ENDPOINT;
|
|
||||||
timeout = UDFNUML + 50;
|
|
||||||
while (1) {
|
|
||||||
// are we ready to transmit?
|
|
||||||
if (UEINTX & (1 << RWAL)) break;
|
|
||||||
SREG = intr_state;
|
|
||||||
// has the USB gone offline?
|
|
||||||
if (!usb_configured()) return -1;
|
|
||||||
// have we waited too long?
|
|
||||||
if (UDFNUML == timeout) return -1;
|
|
||||||
// get ready to try checking again
|
|
||||||
intr_state = SREG;
|
|
||||||
cli();
|
|
||||||
UENUM = EXTRA_ENDPOINT;
|
|
||||||
}
|
|
||||||
|
|
||||||
UEDATX = report_id;
|
|
||||||
UEDATX = data & 0xFF;
|
|
||||||
UEDATX = (data >> 8) & 0xFF;
|
|
||||||
|
|
||||||
UEINTX = 0x3A;
|
|
||||||
SREG = intr_state;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int8_t usb_extra_consumer_send(uint16_t bits) { return usb_extra_send(REPORT_ID_CONSUMER, bits); }
|
|
||||||
|
|
||||||
int8_t usb_extra_system_send(uint16_t bits) { return usb_extra_send(REPORT_ID_SYSTEM, bits); }
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
/* USB Keyboard Plus Debug Channel Example for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_keyboard.html
|
|
||||||
* Copyright (c) 2009 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef USB_EXTRA_H
|
|
||||||
#define USB_EXTRA_H 1
|
|
||||||
/*
|
|
||||||
* Enhanced keyboard features for Windows:
|
|
||||||
* Audio control and System control
|
|
||||||
*
|
|
||||||
* http://www.microsoft.com/whdc/archive/w2kbd.mspx
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include "usb.h"
|
|
||||||
|
|
||||||
#define EXTRA_INTERFACE 3
|
|
||||||
#define EXTRA_ENDPOINT 4
|
|
||||||
#define EXTRA_SIZE 8
|
|
||||||
#define EXTRA_BUFFER EP_DOUBLE_BUFFER
|
|
||||||
|
|
||||||
int8_t usb_extra_consumer_send(uint16_t bits);
|
|
||||||
int8_t usb_extra_system_send(uint16_t bits);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
/* USB Keyboard Plus Debug Channel Example for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_keyboard.html
|
|
||||||
* Copyright (c) 2009 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <avr/interrupt.h>
|
|
||||||
#include <avr/pgmspace.h>
|
|
||||||
#include "keycode.h"
|
|
||||||
#include "usb_keyboard.h"
|
|
||||||
#include "print.h"
|
|
||||||
#include "debug.h"
|
|
||||||
#include "util.h"
|
|
||||||
#include "host.h"
|
|
||||||
|
|
||||||
#ifdef NKRO_ENABLE
|
|
||||||
# include "keycode_config.h"
|
|
||||||
|
|
||||||
extern keymap_config_t keymap_config;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// protocol setting from the host. We use exactly the same report
|
|
||||||
// either way, so this variable only stores the setting since we
|
|
||||||
// are required to be able to report which setting is in use.
|
|
||||||
uint8_t keyboard_protocol = 1;
|
|
||||||
|
|
||||||
// the idle configuration, how often we send the report to the
|
|
||||||
// host (ms * 4) even when it hasn't changed
|
|
||||||
// Windows and Linux set 0 while OS X sets 6(24ms) by SET_IDLE request.
|
|
||||||
uint8_t keyboard_idle = 125;
|
|
||||||
|
|
||||||
// count until idle timeout
|
|
||||||
uint8_t usb_keyboard_idle_count = 0;
|
|
||||||
|
|
||||||
// 1=num lock, 2=caps lock, 4=scroll lock, 8=compose, 16=kana
|
|
||||||
volatile uint8_t usb_keyboard_leds = 0;
|
|
||||||
|
|
||||||
static inline int8_t send_report(report_keyboard_t *report, uint8_t endpoint, uint8_t keys_start, uint8_t keys_end);
|
|
||||||
|
|
||||||
int8_t usb_keyboard_send_report(report_keyboard_t *report) {
|
|
||||||
int8_t result = 0;
|
|
||||||
|
|
||||||
#ifdef NKRO_ENABLE
|
|
||||||
if (keymap_config.nkro)
|
|
||||||
result = send_report(report, KBD2_ENDPOINT, 0, KBD2_SIZE);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
result = send_report(report, KBD_ENDPOINT, 0, KBD_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result) return result;
|
|
||||||
usb_keyboard_idle_count = 0;
|
|
||||||
usb_keyboard_print_report(report);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void usb_keyboard_print_report(report_keyboard_t *report) {
|
|
||||||
if (!debug_keyboard) return;
|
|
||||||
print("keys: ");
|
|
||||||
for (int i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
|
|
||||||
phex(report->keys[i]);
|
|
||||||
print(" ");
|
|
||||||
}
|
|
||||||
print(" mods: ");
|
|
||||||
phex(report->mods);
|
|
||||||
print("\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int8_t send_report(report_keyboard_t *report, uint8_t endpoint, uint8_t keys_start, uint8_t keys_end) {
|
|
||||||
uint8_t intr_state, timeout;
|
|
||||||
|
|
||||||
if (!usb_configured()) return -1;
|
|
||||||
intr_state = SREG;
|
|
||||||
cli();
|
|
||||||
UENUM = endpoint;
|
|
||||||
timeout = UDFNUML + 50;
|
|
||||||
while (1) {
|
|
||||||
// are we ready to transmit?
|
|
||||||
if (UEINTX & (1 << RWAL)) break;
|
|
||||||
SREG = intr_state;
|
|
||||||
// has the USB gone offline?
|
|
||||||
if (!usb_configured()) return -1;
|
|
||||||
// have we waited too long?
|
|
||||||
if (UDFNUML == timeout) return -1;
|
|
||||||
// get ready to try checking again
|
|
||||||
intr_state = SREG;
|
|
||||||
cli();
|
|
||||||
UENUM = endpoint;
|
|
||||||
}
|
|
||||||
for (uint8_t i = keys_start; i < keys_end; i++) {
|
|
||||||
UEDATX = report->raw[i];
|
|
||||||
}
|
|
||||||
UEINTX = 0x3A;
|
|
||||||
SREG = intr_state;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
/* USB Keyboard Plus Debug Channel Example for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_keyboard.html
|
|
||||||
* Copyright (c) 2009 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef USB_KEYBOARD_H
|
|
||||||
#define USB_KEYBOARD_H 1
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include "usb.h"
|
|
||||||
#include "host.h"
|
|
||||||
|
|
||||||
extern uint8_t usb_keyboard_idle_count;
|
|
||||||
extern volatile uint8_t usb_keyboard_leds;
|
|
||||||
|
|
||||||
int8_t usb_keyboard_send_report(report_keyboard_t *report);
|
|
||||||
void usb_keyboard_print_report(report_keyboard_t *report);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
/* USB Mouse Plus Debug Channel Example for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_mouse.html
|
|
||||||
* Copyright (c) 2009 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <avr/interrupt.h>
|
|
||||||
#include <util/delay.h>
|
|
||||||
#include "usb_mouse.h"
|
|
||||||
#include "print.h"
|
|
||||||
#include "debug.h"
|
|
||||||
|
|
||||||
uint8_t usb_mouse_protocol = 1;
|
|
||||||
|
|
||||||
int8_t usb_mouse_send(int8_t x, int8_t y, int8_t wheel_v, int8_t wheel_h, uint8_t buttons) {
|
|
||||||
uint8_t intr_state, timeout;
|
|
||||||
|
|
||||||
if (!usb_configured()) return -1;
|
|
||||||
if (x == -128) x = -127;
|
|
||||||
if (y == -128) y = -127;
|
|
||||||
if (wheel_v == -128) wheel_v = -127;
|
|
||||||
if (wheel_h == -128) wheel_h = -127;
|
|
||||||
intr_state = SREG;
|
|
||||||
cli();
|
|
||||||
UENUM = MOUSE_ENDPOINT;
|
|
||||||
timeout = UDFNUML + 50;
|
|
||||||
while (1) {
|
|
||||||
// are we ready to transmit?
|
|
||||||
if (UEINTX & (1 << RWAL)) break;
|
|
||||||
SREG = intr_state;
|
|
||||||
// has the USB gone offline?
|
|
||||||
if (!usb_configured()) return -1;
|
|
||||||
// have we waited too long?
|
|
||||||
if (UDFNUML == timeout) return -1;
|
|
||||||
// get ready to try checking again
|
|
||||||
intr_state = SREG;
|
|
||||||
cli();
|
|
||||||
UENUM = MOUSE_ENDPOINT;
|
|
||||||
}
|
|
||||||
UEDATX = buttons;
|
|
||||||
UEDATX = x;
|
|
||||||
UEDATX = y;
|
|
||||||
if (usb_mouse_protocol) {
|
|
||||||
UEDATX = wheel_v;
|
|
||||||
UEDATX = wheel_h;
|
|
||||||
}
|
|
||||||
|
|
||||||
UEINTX = 0x3A;
|
|
||||||
SREG = intr_state;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void usb_mouse_print(int8_t x, int8_t y, int8_t wheel_v, int8_t wheel_h, uint8_t buttons) {
|
|
||||||
if (!debug_mouse) return;
|
|
||||||
print("usb_mouse[btn|x y v h]: ");
|
|
||||||
phex(buttons);
|
|
||||||
print("|");
|
|
||||||
phex(x);
|
|
||||||
print(" ");
|
|
||||||
phex(y);
|
|
||||||
print(" ");
|
|
||||||
phex(wheel_v);
|
|
||||||
print(" ");
|
|
||||||
phex(wheel_h);
|
|
||||||
print("\n");
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
/* USB Mouse Plus Debug Channel Example for Teensy USB Development Board
|
|
||||||
* http://www.pjrc.com/teensy/usb_mouse.html
|
|
||||||
* Copyright (c) 2009 PJRC.COM, LLC
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef USB_MOUSE_H
|
|
||||||
#define USB_MOUSE_H 1
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include "usb.h"
|
|
||||||
|
|
||||||
#define MOUSE_INTERFACE 1
|
|
||||||
#define MOUSE_ENDPOINT 2
|
|
||||||
#define MOUSE_SIZE 8
|
|
||||||
#define MOUSE_BUFFER EP_SINGLE_BUFFER
|
|
||||||
|
|
||||||
#define MOUSE_BTN1 (1 << 0)
|
|
||||||
#define MOUSE_BTN2 (1 << 1)
|
|
||||||
#define MOUSE_BTN3 (1 << 2)
|
|
||||||
#define MOUSE_BTN4 (1 << 3)
|
|
||||||
#define MOUSE_BTN5 (1 << 4)
|
|
||||||
|
|
||||||
extern uint8_t usb_mouse_protocol;
|
|
||||||
|
|
||||||
int8_t usb_mouse_send(int8_t x, int8_t y, int8_t wheel_v, int8_t wheel_h, uint8_t buttons);
|
|
||||||
void usb_mouse_print(int8_t x, int8_t y, int8_t wheel_v, int8_t wheel_h, uint8_t buttons);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -48,7 +48,7 @@ Complete firmwares for various keyboards and protocol converters.
|
|||||||
License
|
License
|
||||||
-------
|
-------
|
||||||
**GPLv2** or later. Some protocol files are under **Modified BSD License**.
|
**GPLv2** or later. Some protocol files are under **Modified BSD License**.
|
||||||
LUFA, PJRC and V-USB stack have their own license respectively.
|
ChibiOS, LUFA and V-USB stack have their own license respectively.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -85,9 +85,9 @@ Architecture
|
|||||||
/ /| Keys/Mouse | Protocol |d| | Action | | | Protocol |
|
/ /| Keys/Mouse | Protocol |d| | Action | | | Protocol |
|
||||||
/__________/ |<-----------| LUFA |r| | Layer, Tap | | | Matrix |
|
/__________/ |<-----------| LUFA |r| | Layer, Tap | | | Matrix |
|
||||||
|.--------.| | LED | V-USB |i| |-------------| | | PS/2,IBM | __________________
|
|.--------.| | LED | V-USB |i| |-------------| | | PS/2,IBM | __________________
|
||||||
|| || |----------->| PJRC |v| | Keymap | | | ADB,M0110| Keys / /_/_/_/_/_/_/_/ /|
|
|| || |----------->| iWRAP(BT)|v| | Keymap | | | ADB,M0110| Keys / /_/_/_/_/_/_/_/ /|
|
||||||
|| Host || | Console | iWRAP(BT)|e| | Mousekey | | | SUN/NEWS |<----------/ /_/_/_/_/_/_/_/ / /
|
|| Host || | Console | UART |e| | Mousekey | | | SUN/NEWS |<----------/ /_/_/_/_/_/_/_/ / /
|
||||||
||________||/.<-----------| UART |r| | Report | | | X68K/PC98| Control / /_/_/_/_/_/_/_/ / /
|
||________||/.<-----------| |r| | Report | | | X68K/PC98| Control / /_/_/_/_/_/_/_/ / /
|
||||||
`_========_'/| |---------------------------------------------|-------->/___ /_______/ ___/ /
|
`_========_'/| |---------------------------------------------|-------->/___ /_______/ ___/ /
|
||||||
|_o______o_|/ | Sendchar, Print, Debug, Command, ... | |_________________|/
|
|_o______o_|/ | Sendchar, Print, Debug, Command, ... | |_________________|/
|
||||||
+---------------------------------------------+ Keyboard
|
+---------------------------------------------+ Keyboard
|
||||||
@@ -133,7 +133,6 @@ Files and Directories
|
|||||||
|
|
||||||
### Keyboard Protocols
|
### Keyboard Protocols
|
||||||
* lufa/ - LUFA USB stack
|
* lufa/ - LUFA USB stack
|
||||||
* pjrc/ - PJRC USB stack
|
|
||||||
* vusb/ - Objective Development V-USB
|
* vusb/ - Objective Development V-USB
|
||||||
* iwrap/ - Bluetooth HID for Bluegiga iWRAP
|
* iwrap/ - Bluetooth HID for Bluegiga iWRAP
|
||||||
* ps2.c - PS/2 protocol
|
* ps2.c - PS/2 protocol
|
||||||
|
|||||||
Reference in New Issue
Block a user