forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
handwire
Jack Humbert 7 years ago
parent 8a91aa5e6c fca31693df
commit b075df1c87
47 changed files with 799 additions and 1255 deletions
Show Stats Download Patch File Download Diff File

5
build_keyboard.mk
Unescape View File

@ -121,7 +121,6 @@ else
endif endif
ifeq ($(PLATFORM),CHIBIOS) ifeq ($(PLATFORM),CHIBIOS)
include $(TMK_PATH)/protocol/chibios.mk
include $(TMK_PATH)/chibios.mk include $(TMK_PATH)/chibios.mk
OPT_OS = chibios OPT_OS = chibios
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/bootloader_defs.h)","") ifneq ("$(wildcard $(KEYBOARD_PATH_5)/bootloader_defs.h)","")
@ -247,6 +246,10 @@ endif
include $(TMK_PATH)/avr.mk include $(TMK_PATH)/avr.mk
endif endif
ifeq ($(PLATFORM),CHIBIOS)
include $(TMK_PATH)/protocol/chibios.mk
endif
ifeq ($(strip $(VISUALIZER_ENABLE)), yes) ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer
VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer

4
docs/feature_audio.md
Unescape View File

@ -82,6 +82,10 @@ The pitch standard (`PITCH_STANDARD_A`) is 440.0f by default - to change this, a
#define PITCH_STANDARD_A 432.0f #define PITCH_STANDARD_A 432.0f
You can completely disable Music Mode as well. This is useful, if you're pressed for space on your controller. To disable it, add this to your `confid.h`:
#define NO_MUSIC_MODE
## MIDI Functionality ## MIDI Functionality
This is still a WIP, but check out `quantum/keymap_midi.c` to see what's happening. Enable from the Makefile. This is still a WIP, but check out `quantum/keymap_midi.c` to see what's happening. Enable from the Makefile.

8
keyboards/chibios_test/config.h
Unescape View File

@ -24,11 +24,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
/* in python2: list(u"whatever".encode('utf-16-le')) */ /* in python2: list(u"whatever".encode('utf-16-le')) */
/* at most 32 characters or the ugly hack in usb_main.c borks */ /* at most 32 characters or the ugly hack in usb_main.c borks */
#define MANUFACTURER "QMK" #define MANUFACTURER QMK
#define USBSTR_MANUFACTURER 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', '\xc6', '\x00' #define PRODUCT ChibiOS QMK test
#define PRODUCT "ChibiOS QMK test" #define DESCRIPTION QMK keyboard firmware test for ChibiOS
#define USBSTR_PRODUCT 'C', '\x00', 'h', '\x00', 'i', '\x00', 'b', '\x00', 'i', '\x00', 'O', '\x00', 'S', '\x00', ' ', '\x00', 'Q', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', 't', '\x00', 'e', '\x00', 's', '\x00', 't', '\x00'
#define DESCRIPTION "QMK keyboard firmware test for ChibiOS"
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 1 #define MATRIX_ROWS 1

2
keyboards/chibios_test/stm32_f072_onekey/halconf.h
Unescape View File

@ -139,7 +139,7 @@
* @brief Enables the SERIAL over USB subsystem. * @brief Enables the SERIAL over USB subsystem.
*/ */
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
#define HAL_USE_SERIAL_USB FALSE #define HAL_USE_SERIAL_USB TRUE
#endif #endif
/** /**

2
keyboards/chibios_test/stm32_f103_onekey/halconf.h
Unescape View File

@ -139,7 +139,7 @@
* @brief Enables the SERIAL over USB subsystem. * @brief Enables the SERIAL over USB subsystem.
*/ */
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
#define HAL_USE_SERIAL_USB FALSE #define HAL_USE_SERIAL_USB TRUE
#endif #endif
/** /**

2
keyboards/chibios_test/teensy_lc_onekey/halconf.h
Unescape View File

@ -139,7 +139,7 @@
* @brief Enables the SERIAL over USB subsystem. * @brief Enables the SERIAL over USB subsystem.
*/ */
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
#define HAL_USE_SERIAL_USB FALSE #define HAL_USE_SERIAL_USB TRUE
#endif #endif
/** /**

8
keyboards/clueboard/60/config.h
Unescape View File

@ -22,11 +22,9 @@
#define VENDOR_ID 0xC1ED #define VENDOR_ID 0xC1ED
#define PRODUCT_ID 0x2350 #define PRODUCT_ID 0x2350
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER "Clueboard" #define MANUFACTURER Clueboard
#define USBSTR_MANUFACTURER 'C', '\x00', 'l', '\x00', 'u', '\x00', 'e', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00' #define PRODUCT Clueboard 60%
#define PRODUCT "Clueboard60" #define DESCRIPTION Clueboard 60%
#define USBSTR_PRODUCT 'C', '\x00', 'l', '\x00', 'u', '\x00', 'e', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', ' ', '\x00', '6', '\x00', '0', '\x00', '%', '\x00'
#define DESCRIPTION "Clueboard 60%"
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 5 #define MATRIX_ROWS 5

8
keyboards/ergodox_infinity/config.h
Unescape View File

@ -23,12 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xFEED #define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6464 #define PRODUCT_ID 0x6464
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
/* in python2: list(u"whatever".encode('utf-16-le')) */ #define MANUFACTURER Input Club
/* at most 32 characters or the ugly hack in usb_main.c borks */ #define PRODUCT Ergodox Infinity (QMK)
#define MANUFACTURER "TMK"
#define USBSTR_MANUFACTURER 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00'
#define PRODUCT "Infinity keyboard/TMK"
#define USBSTR_PRODUCT 'I', '\x00', 'n', '\x00', 'f', '\x00', 'i', '\x00', 'n', '\x00', 'i', '\x00', 't', '\x00', 'y', '\x00', ' ', '\x00', 'k', '\x00', 'e', '\x00', 'y', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '/', '\x00', 'T', '\x00', 'M', '\x00', 'K', '\x00'
#define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0 #define MOUSEKEY_DELAY 0

6
keyboards/infinity60/config.h
Unescape View File

@ -26,10 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
/* in python2: list(u"whatever".encode('utf-16-le')) */ /* in python2: list(u"whatever".encode('utf-16-le')) */
/* at most 32 characters or the ugly hack in usb_main.c borks */ /* at most 32 characters or the ugly hack in usb_main.c borks */
#define MANUFACTURER "Input Club" #define MANUFACTURER Input Club
#define USBSTR_MANUFACTURER 'I', '\x00', 'n', '\x00', 'p', '\x00', 'u', '\x00', 't', '\x00', ' ', '\x00', 'C', '\x00', 'l', '\x00', 'u', '\x00', 'b', '\x00' #define PRODUCT Infinity 60% keyboard (QMK)
#define PRODUCT "Infinity keyboard/QMK"
#define USBSTR_PRODUCT 'I', '\x00', 'n', '\x00', 'f', '\x00', 'i', '\x00', 'n', '\x00', 'i', '\x00', 't', '\x00', 'y', '\x00', ' ', '\x00', 'k', '\x00', 'e', '\x00', 'y', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '/', '\x00', 'Q', '\x00', 'M', '\x00', 'K', '\x00'
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 9 #define MATRIX_ROWS 9
#define MATRIX_COLS 7 #define MATRIX_COLS 7

2
keyboards/infinity60/halconf.h
Unescape View File

@ -139,7 +139,7 @@
* @brief Enables the SERIAL over USB subsystem. * @brief Enables the SERIAL over USB subsystem.
*/ */
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
#define HAL_USE_SERIAL_USB FALSE #define HAL_USE_SERIAL_USB TRUE
#endif #endif
/** /**

35
keyboards/iris/keymaps/default/keymap.c
Unescape View File

@ -23,6 +23,15 @@ enum custom_keycodes {
#define KC_RASE RAISE #define KC_RASE RAISE
#define KC_RST RESET #define KC_RST RESET
#define KC_BL_S BL_STEP #define KC_BL_S BL_STEP
#define KC_DBUG DEBUG
#define KC_RTOG RGB_TOG
#define KC_RMOD RGB_MOD
#define KC_RHUI RGB_HUI
#define KC_RHUD RGB_HUD
#define KC_RSAI RGB_SAI
#define KC_RSAD RGB_SAD
#define KC_RVAI RGB_VAI
#define KC_RVAD RGB_VAD
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@ -34,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
RASE, A , S , D , F , G , H , J , K , L ,SCLN,QUOT, RASE, A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
LSFT, Z , X , C , V , B ,SPC , ENT , N , M ,COMM,DOT ,SLSH,RGHT, LSFT, Z , X , C , V , B ,SPC , ENT , N , M ,COMM,DOT ,SLSH,RSFT,
//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'
LCTL,LOWR,SPC , ENT ,LGUI,LALT LCTL,LOWR,SPC , ENT ,LGUI,LALT
// `----+----+----' `----+----+----' // `----+----+----' `----+----+----'
@ -68,18 +77,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// `----+----+----' `----+----+----' // `----+----+----' `----+----+----'
), ),
[_ADJUST] = KEYMAP( [_ADJUST] = KC_KEYMAP(
//,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------. //,----+----+----+----+----+----. ,----+----+----+----+----+----.
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, , , , , , , , , , , , ,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|----+----+----+----+----+----| |----+----+----+----+----+----|
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, RTOG,RMOD,RHUI,RSAI,RVAI, , , , , , , ,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|----+----+----+----+----+----| |----+----+----+----+----+----|
_______, DEBUG , RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, ,DBUG,RHUD,RSAD,RVAD, , , , , , , ,
//|--------+--------+--------+--------+--------+--------+--------. ,--------|--------+--------+--------+--------+--------+--------| //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
BL_STEP, RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_S,RST , , , , , , , , , , , , ,
//`--------+--------+--------+----+---+--------+--------+--------/ \--------+--------+--------+---+----+--------+--------+--------' //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'
_______, _______, _______, _______, _______, _______ , , , , ,
// `--------+--------+--------' `--------+--------+--------' // `----+----+----' `----+----+----'
) )
}; };

8
keyboards/jm60/config.h
Unescape View File

@ -26,11 +26,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
/* in python2: list(u"whatever".encode('utf-16-le')) */ /* in python2: list(u"whatever".encode('utf-16-le')) */
/* at most 32 characters or the ugly hack in usb_main.c borks */ /* at most 32 characters or the ugly hack in usb_main.c borks */
#define MANUFACTURER "JMWS" #define MANUFACTURER JMWS
#define USBSTR_MANUFACTURER 'J', '\x00', 'M', '\x00', 'W', '\x00', 'S', '\x00' #define PRODUCT JM60 RGB Keyboard(QMK)
#define PRODUCT "JM60 RGB Keyboard(QMK)" #define DESCRIPTION QMK keyboard firmware for JM60 RGB Keyboard
#define USBSTR_PRODUCT 'J', '\x00', 'M', '\x00', '6', '\x00', '0', '\x00', ' ', '\x00', 'R', '\x00', 'G', '\x00', 'B', '\x00', ' ', '\x00', 'K', '\x00', 'e', '\x00', 'y', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '(', '\x00', 'Q', '\x00', 'M', '\x00', 'K', '\x00', ')', '\x00'
#define DESCRIPTION "QMK keyboard firmware for JM60 RGB Keyboard"
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 5 #define MATRIX_ROWS 5

2
keyboards/jm60/halconf.h
Unescape View File

@ -139,7 +139,7 @@
* @brief Enables the SERIAL over USB subsystem. * @brief Enables the SERIAL over USB subsystem.
*/ */
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
#define HAL_USE_SERIAL_USB FALSE #define HAL_USE_SERIAL_USB TRUE
#endif #endif
/** /**

1
keyboards/orthodox/keymaps/drashna/config.h
Unescape View File

@ -69,6 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#define C6_AUDIO #define C6_AUDIO
#define STARTUP_SONG SONG(IMPERIAL_MARCH) #define STARTUP_SONG SONG(IMPERIAL_MARCH)
#define NO_MUSIC_MODE
#endif #endif
#undef PRODUCT #undef PRODUCT

2
keyboards/tv44/keymaps/jetpacktuxedo/keymap.c
Unescape View File

@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
[3] = KEYMAP_ARROW_COMMAND( /* LAYER 3 */ [3] = KEYMAP_ARROW_COMMAND( /* LAYER 3 */
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
), ),

2
keyboards/tv44/keymaps/jetpacktuxedo/readme.md
Unescape View File

@ -34,7 +34,7 @@ I don't want to be using two key combos constantly, so I also added this symbol
I very rarely use Fkeys, but figured I'd throw them on anyway just in case. The setup basically mimics the way Fkeys are usually done on a 60%, with F11 and F12 still on - and =, even though the location of those keys has moved. I very rarely use Fkeys, but figured I'd throw them on anyway just in case. The setup basically mimics the way Fkeys are usually done on a 60%, with F11 and F12 still on - and =, even though the location of those keys has moved.
``` ```
| | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 |F10 | | | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 |F10 | |
| | | | | | | | | |F11 |F12 | | | | | | | | | | |F11 |F12 | | |
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | |
``` ```

4
keyboards/viterbi/keymaps/default/keymap.c
Unescape View File

@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
UNDS, ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,LCBR,RCBR, UNDS, ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,LCBR,RCBR,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
PLUS, , F1 , F2 , F3 , F4 , F5 , F6 ,MINS,PLUS,LCBR,RCBR, , , PLUS, , F1 , F2 , F3 , F4 , F5 , F6 ,UNDS,PLUS,LCBR,RCBR, , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
, , F7 , F8 , F9 ,F10 ,F11 , F12 , , , , , , , , , F7 , F8 , F9 ,F10 ,F11 , F12 , , , , , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
UNDS, , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,LCBR,RCBR, UNDS, , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,LCBR,RCBR,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
PLUS, , F1 , F2 , F3 , F4 , F5 , F6 ,MINS,PLUS,LBRC,RBRC, , , PLUS, , F1 , F2 , F3 , F4 , F5 , F6 ,MINS,EQL ,LBRC,RBRC, , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
, , F7 , F8 , F9 ,F10 ,F11 , F12 ,NUHS,NUBS, , , , , , , F7 , F8 , F9 ,F10 ,F11 , F12 ,NUHS,NUBS, , , , ,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|

6
keyboards/whitefox/config.h
Unescape View File

@ -26,10 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
/* in python2: list(u"whatever".encode('utf-16-le')) */ /* in python2: list(u"whatever".encode('utf-16-le')) */
/* at most 32 characters or the ugly hack in usb_main.c borks */ /* at most 32 characters or the ugly hack in usb_main.c borks */
#define MANUFACTURER "Input Club" #define MANUFACTURER Input Club
#define USBSTR_MANUFACTURER 'I', '\x00', 'n', '\x00', 'p', '\x00', 'u', '\x00', 't', '\x00', ' ', '\x00', 'C', '\x00', 'l', '\x00', 'u', '\x00', 'b', '\x00' #define PRODUCT WhiteFox (QMK)
#define PRODUCT "WhiteFox/QMK"
#define USBSTR_PRODUCT 'W', '\x00', 'h', '\x00', 'i', '\x00', 't', '\x00', 'e', '\x00', 'F', '\x00', 'o', '\x00', 'x', '\x00', ' ', '\x00'
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 9 #define MATRIX_ROWS 9

2
lib/chibios

@ -1 +1 @@
Subproject commit e26cb16a7296a196d7c74eae22cbee00989cb7b6 Subproject commit 587968d6cbc2b0e1c7147540872f2a67e59ca18b

2
lib/chibios-contrib

@ -1 +1 @@
Subproject commit 432bc1762f17eb7b506e8fbca8ec30a3d61629b8 Subproject commit ede48346eee4b8d6847c19bc01420bee76a5e486

1
quantum/api/api_sysex.c
Unescape View File

@ -16,6 +16,7 @@
#include "api_sysex.h" #include "api_sysex.h"
#include "sysex_tools.h" #include "sysex_tools.h"
#include "print.h" #include "print.h"
#include "qmk_midi.h"
void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, uint16_t length) { void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, uint16_t length) {
// SEND_STRING("\nTX: "); // SEND_STRING("\nTX: ");

2
quantum/audio/audio_arm.c
Unescape View File

@ -241,7 +241,7 @@ static const dacsample_t dac_buffer_2[DAC_BUFFER_SIZE] = {
* DAC streaming callback. * DAC streaming callback.
*/ */
size_t nx = 0, ny = 0, nz = 0; size_t nx = 0, ny = 0, nz = 0;
static void end_cb1(DACDriver *dacp, const dacsample_t *buffer, size_t n) { static void end_cb1(DACDriver *dacp, dacsample_t *buffer, size_t n) {
(void)dacp; (void)dacp;

3
quantum/keymap.h
Unescape View File

@ -23,6 +23,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action.h" #include "action.h"
#if defined(__AVR__) #if defined(__AVR__)
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#elif defined PROTOCOL_CHIBIOS
//We need to ensure that chibios is include before redefining reset
#include "ch.h"
#endif #endif
#include "keycode.h" #include "keycode.h"
#include "action_macro.h" #include "action_macro.h"

56
quantum/process_keycode/process_midi.c
Unescape View File

@ -16,7 +16,9 @@
#include "process_midi.h" #include "process_midi.h"
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
#include <LUFA/Drivers/USB/USB.h>
#include "midi.h" #include "midi.h"
#include "qmk_midi.h"
#ifdef MIDI_BASIC #ifdef MIDI_BASIC
@ -46,6 +48,7 @@ static uint8_t tone_status[MIDI_TONE_COUNT];
static uint8_t midi_modulation; static uint8_t midi_modulation;
static int8_t midi_modulation_step; static int8_t midi_modulation_step;
static uint16_t midi_modulation_timer; static uint16_t midi_modulation_timer;
midi_config_t midi_config;
inline uint8_t compute_velocity(uint8_t setting) inline uint8_t compute_velocity(uint8_t setting)
{ {
@ -70,30 +73,6 @@ void midi_init(void)
midi_modulation_timer = 0; midi_modulation_timer = 0;
} }
void midi_task(void)
{
if (timer_elapsed(midi_modulation_timer) < midi_config.modulation_interval)
return;
midi_modulation_timer = timer_read();
if (midi_modulation_step != 0)
{
dprintf("midi modulation %d\n", midi_modulation);
midi_send_cc(&midi_device, midi_config.channel, 0x1, midi_modulation);
if (midi_modulation_step < 0 && midi_modulation < -midi_modulation_step) {
midi_modulation = 0;
midi_modulation_step = 0;
return;
}
midi_modulation += midi_modulation_step;
if (midi_modulation > 127)
midi_modulation = 127;
}
}
uint8_t midi_compute_note(uint16_t keycode) uint8_t midi_compute_note(uint16_t keycode)
{ {
return 12 * midi_config.octave + (keycode - MIDI_TONE_MIN) + midi_config.transpose; return 12 * midi_config.octave + (keycode - MIDI_TONE_MIN) + midi_config.transpose;
@ -250,4 +229,33 @@ bool process_midi(uint16_t keycode, keyrecord_t *record)
#endif // MIDI_ADVANCED #endif // MIDI_ADVANCED
void midi_task(void)
{
midi_device_process(&midi_device);
#ifdef MIDI_ADVANCED
if (timer_elapsed(midi_modulation_timer) < midi_config.modulation_interval)
return;
midi_modulation_timer = timer_read();
if (midi_modulation_step != 0)
{
dprintf("midi modulation %d\n", midi_modulation);
midi_send_cc(&midi_device, midi_config.channel, 0x1, midi_modulation);
if (midi_modulation_step < 0 && midi_modulation < -midi_modulation_step) {
midi_modulation = 0;
midi_modulation_step = 0;
return;
}
midi_modulation += midi_modulation_step;
if (midi_modulation > 127)
midi_modulation = 127;
}
#endif
}
#endif // MIDI_ENABLE #endif // MIDI_ENABLE

5
quantum/process_keycode/process_midi.h
Unescape View File

@ -27,6 +27,8 @@ void process_midi_basic_noteoff(uint8_t note);
void process_midi_all_notes_off(void); void process_midi_all_notes_off(void);
#endif #endif
void midi_task(void);
#ifdef MIDI_ADVANCED #ifdef MIDI_ADVANCED
typedef union { typedef union {
uint32_t raw; uint32_t raw;
@ -39,10 +41,9 @@ typedef union {
}; };
} midi_config_t; } midi_config_t;
midi_config_t midi_config; extern midi_config_t midi_config;
void midi_init(void); void midi_init(void);
void midi_task(void);
bool process_midi(uint16_t keycode, keyrecord_t *record); bool process_midi(uint16_t keycode, keyrecord_t *record);
#define MIDI_INVALID_NOTE 0xFF #define MIDI_INVALID_NOTE 0xFF

14
quantum/quantum.c
Unescape View File

@ -34,6 +34,14 @@ extern backlight_config_t backlight_config;
#include "fauxclicky.h" #include "fauxclicky.h"
#endif #endif
#ifdef API_ENABLE
#include "api.h"
#endif
#ifdef MIDI_ENABLE
#include "process_midi.h"
#endif
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#ifndef GOODBYE_SONG #ifndef GOODBYE_SONG
#define GOODBYE_SONG SONG(GOODBYE_SOUND) #define GOODBYE_SONG SONG(GOODBYE_SOUND)
@ -139,7 +147,7 @@ void reset_keyboard(void) {
#if defined(MIDI_ENABLE) && defined(MIDI_BASIC) #if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
process_midi_all_notes_off(); process_midi_all_notes_off();
#endif #endif
#if defined(AUDIO_ENABLE) #if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
music_all_notes_off(); music_all_notes_off();
uint16_t timer_start = timer_read(); uint16_t timer_start = timer_read();
PLAY_SONG(goodbye_song); PLAY_SONG(goodbye_song);
@ -228,7 +236,7 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef STENO_ENABLE #ifdef STENO_ENABLE
process_steno(keycode, record) && process_steno(keycode, record) &&
#endif #endif
#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) #if ( defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))) && !defined(NO_MUSIC_MODE)
process_music(keycode, record) && process_music(keycode, record) &&
#endif #endif
#ifdef TAP_DANCE_ENABLE #ifdef TAP_DANCE_ENABLE
@ -826,7 +834,7 @@ void matrix_init_quantum() {
} }
void matrix_scan_quantum() { void matrix_scan_quantum() {
#ifdef AUDIO_ENABLE #if defined(AUDIO_ENABLE)
matrix_scan_music(); matrix_scan_music();
#endif #endif

1
quantum/quantum.h
Unescape View File

@ -49,7 +49,6 @@ extern uint32_t default_layer_state;
#endif #endif
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
#include <lufa.h>
#ifdef MIDI_ADVANCED #ifdef MIDI_ADVANCED
#include "process_midi.h" #include "process_midi.h"
#endif #endif

9
tmk_core/avr.mk
Unescape View File

@ -172,13 +172,14 @@ avrdude: $(BUILD_DIR)/$(TARGET).hex check-size
if grep -q -s Microsoft /proc/version; then \ if grep -q -s Microsoft /proc/version; then \
echo 'ERROR: AVR flashing cannot be automated within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \ echo 'ERROR: AVR flashing cannot be automated within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \
else \ else \
printf "Detecting USB port, reset your controller now."; \
ls /dev/tty* > /tmp/1; \ ls /dev/tty* > /tmp/1; \
echo -e "Detecting USB port, reset your controller now.\c"; \
while [ -z $$USB ]; do \ while [ -z $$USB ]; do \
sleep 1; \ sleep 0.5; \
echo -e ".\c"; \ printf "."; \
ls /dev/tty* > /tmp/2; \ ls /dev/tty* > /tmp/2; \
USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \ USB=`comm -13 /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
mv /tmp/2 /tmp/1; \
done; \ done; \
echo ""; \ echo ""; \
echo "Detected controller on USB port at $$USB"; \ echo "Detected controller on USB port at $$USB"; \

2
tmk_core/chibios.mk
Unescape View File

@ -149,6 +149,7 @@ COMPILEFLAGS += -falign-functions=16
COMPILEFLAGS += -ffunction-sections COMPILEFLAGS += -ffunction-sections
COMPILEFLAGS += -fdata-sections COMPILEFLAGS += -fdata-sections
COMPILEFLAGS += -fno-common COMPILEFLAGS += -fno-common
COMPILEFLAGS += -fshort-wchar
COMPILEFLAGS += $(THUMBFLAGS) COMPILEFLAGS += $(THUMBFLAGS)
CFLAGS += $(COMPILEFLAGS) CFLAGS += $(COMPILEFLAGS)
@ -159,6 +160,7 @@ CPPFLAGS += $(COMPILEFLAGS)
CPPFLAGS += -fno-rtti CPPFLAGS += -fno-rtti
LDFLAGS +=-Wl,--gc-sections LDFLAGS +=-Wl,--gc-sections
LDFLAGS +=-Wl,--no-wchar-size-warning
LDFLAGS += -mno-thumb-interwork -mthumb LDFLAGS += -mno-thumb-interwork -mthumb
LDSYMBOLS =,--defsym=__process_stack_size__=$(USE_PROCESS_STACKSIZE) LDSYMBOLS =,--defsym=__process_stack_size__=$(USE_PROCESS_STACKSIZE)
LDSYMBOLS :=$(LDSYMBOLS),--defsym=__main_stack_size__=$(USE_EXCEPTIONS_STACKSIZE) LDSYMBOLS :=$(LDSYMBOLS),--defsym=__main_stack_size__=$(USE_EXCEPTIONS_STACKSIZE)

5
tmk_core/common/host_driver.h
Unescape View File

@ -30,11 +30,6 @@ typedef struct {
void (*send_mouse)(report_mouse_t *); void (*send_mouse)(report_mouse_t *);
void (*send_system)(uint16_t); void (*send_system)(uint16_t);
void (*send_consumer)(uint16_t); void (*send_consumer)(uint16_t);
#ifdef MIDI_ENABLE
void (*usb_send_func)(MidiDevice *, uint16_t, uint8_t, uint8_t, uint8_t);
void (*usb_get_midi)(MidiDevice *);
void (*midi_usb_init)(MidiDevice *);
#endif
} host_driver_t; } host_driver_t;
#endif #endif

7
tmk_core/common/keyboard.c
Unescape View File

@ -66,6 +66,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef POINTING_DEVICE_ENABLE #ifdef POINTING_DEVICE_ENABLE
# include "pointing_device.h" # include "pointing_device.h"
#endif #endif
#ifdef MIDI_ENABLE
# include "process_midi.h"
#endif
#ifdef MATRIX_HAS_GHOST #ifdef MATRIX_HAS_GHOST
extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
@ -260,6 +263,10 @@ MATRIX_LOOP_END:
pointing_device_task(); pointing_device_task();
#endif #endif
#ifdef MIDI_ENABLE
midi_task();
#endif
// update LED // update LED
if (led_status != host_keyboard_leds()) { if (led_status != host_keyboard_leds()) {
led_status = host_keyboard_leds(); led_status = host_keyboard_leds();

30
tmk_core/common/report.h
Unescape View File

@ -73,22 +73,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key report size(NKRO or boot mode) */ /* key report size(NKRO or boot mode) */
#if defined(PROTOCOL_PJRC) && defined(NKRO_ENABLE) #if defined(NKRO_ENABLE)
# include "usb.h" #if defined(PROTOCOL_PJRC)
# define KEYBOARD_REPORT_SIZE KBD2_SIZE #include "usb.h"
# define KEYBOARD_REPORT_KEYS (KBD2_SIZE - 2) #define KEYBOARD_REPORT_SIZE KBD2_SIZE
# define KEYBOARD_REPORT_BITS (KBD2_SIZE - 1) #define KEYBOARD_REPORT_KEYS (KBD2_SIZE - 2)
#define KEYBOARD_REPORT_BITS (KBD2_SIZE - 1)
#elif defined(PROTOCOL_LUFA) && defined(NKRO_ENABLE) #elif defined(PROTOCOL_LUFA) || defined(PROTOCOL_CHIBIOS)
# include "protocol/lufa/descriptor.h" #include "protocol/usb_descriptor.h"
# define KEYBOARD_REPORT_SIZE NKRO_EPSIZE #define KEYBOARD_REPORT_SIZE NKRO_EPSIZE
# define KEYBOARD_REPORT_KEYS (NKRO_EPSIZE - 2) #define KEYBOARD_REPORT_KEYS (NKRO_EPSIZE - 2)
# define KEYBOARD_REPORT_BITS (NKRO_EPSIZE - 1) #define KEYBOARD_REPORT_BITS (NKRO_EPSIZE - 1)
#elif defined(PROTOCOL_CHIBIOS) && defined(NKRO_ENABLE) #else
# include "protocol/chibios/usb_main.h" #error "NKRO not supported with this protocol"
# define KEYBOARD_REPORT_SIZE NKRO_EPSIZE #endif
# define KEYBOARD_REPORT_KEYS (NKRO_EPSIZE - 2)
# define KEYBOARD_REPORT_BITS (NKRO_EPSIZE - 1)
#else #else
# define KEYBOARD_REPORT_SIZE 8 # define KEYBOARD_REPORT_SIZE 8

9
tmk_core/protocol/chibios.mk
Unescape View File

@ -4,7 +4,16 @@ CHIBIOS_DIR = $(PROTOCOL_DIR)/chibios
SRC += $(CHIBIOS_DIR)/usb_main.c SRC += $(CHIBIOS_DIR)/usb_main.c
SRC += $(CHIBIOS_DIR)/main.c SRC += $(CHIBIOS_DIR)/main.c
SRC += usb_descriptor.c
VPATH += $(TMK_PATH)/$(PROTOCOL_DIR) VPATH += $(TMK_PATH)/$(PROTOCOL_DIR)
VPATH += $(TMK_PATH)/$(CHIBIOS_DIR) VPATH += $(TMK_PATH)/$(CHIBIOS_DIR)
VPATH += $(TMK_PATH)/$(CHIBIOS_DIR)/lufa_utils
OPT_DEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=64
OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1
ifeq ($(strip $(MIDI_ENABLE)), yes)
include $(TMK_PATH)/protocol/midi.mk
endif

42
tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
Unescape View File

@ -0,0 +1,42 @@
#include "progmem.h"
#include "stddef.h"
#include "inttypes.h"
#define ATTR_PACKED __attribute__ ((packed))
/** Concatenates the given input into a single token, via the C Preprocessor.
*
* \param[in] x First item to concatenate.
* \param[in] y Second item to concatenate.
*
* \return Concatenated version of the input.
*/
#define CONCAT(x, y) x ## y
/** CConcatenates the given input into a single token after macro expansion, via the C Preprocessor.
*
* \param[in] x First item to concatenate.
* \param[in] y Second item to concatenate.
*
* \return Concatenated version of the expanded input.
*/
#define CONCAT_EXPANDED(x, y) CONCAT(x, y)
#define CPU_TO_LE16(x) (x)
// We don't need anything from the following files, or we have defined it already
#define __LUFA_COMMON_H__
#define __USBMODE_H__
#define __USBEVENTS_H__
#define __HIDPARSER_H__
#define __USBCONTROLLER_AVR8_H__
#define __INCLUDE_FROM_USB_DRIVER
#define __INCLUDE_FROM_HID_DRIVER
#define __INCLUDE_FROM_CDC_DRIVER
#define __INCLUDE_FROM_AUDIO_DRIVER
#define __INCLUDE_FROM_MIDI_DRIVER
#include "lib/lufa/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h"
#include "lib/lufa/LUFA/Drivers/USB/Class/Common/HIDReportData.h"
#include "lib/lufa/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h"
#include "lib/lufa/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h"
#include "lib/lufa/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h"
#include "lib/lufa/LUFA/Drivers/USB/Core/USBController.h"

27
tmk_core/protocol/chibios/main.c
Unescape View File

@ -41,6 +41,9 @@
#ifdef VISUALIZER_ENABLE #ifdef VISUALIZER_ENABLE
#include "visualizer/visualizer.h" #include "visualizer/visualizer.h"
#endif #endif
#ifdef MIDI_ENABLE
#include "qmk_midi.h"
#endif
#include "suspend.h" #include "suspend.h"
#include "wait.h" #include "wait.h"
@ -65,6 +68,17 @@ host_driver_t chibios_driver = {
send_consumer send_consumer
}; };
#ifdef VIRTSER_ENABLE
void virtser_task(void);
#endif
#ifdef RAW_HID_ENABLE
void raw_hid_task(void);
#endif
#ifdef CONSOLE_ENABLE
void console_task(void);
#endif
/* TESTING /* TESTING
* Amber LED blinker thread, times are in milliseconds. * Amber LED blinker thread, times are in milliseconds.
@ -104,6 +118,10 @@ int main(void) {
/* init printf */ /* init printf */
init_printf(NULL,sendchar_pf); init_printf(NULL,sendchar_pf);
#ifdef MIDI_ENABLE
setup_midi();
#endif
#ifdef SERIAL_LINK_ENABLE #ifdef SERIAL_LINK_ENABLE
init_serial_link(); init_serial_link();
#endif #endif
@ -182,5 +200,14 @@ int main(void) {
} }
keyboard_task(); keyboard_task();
#ifdef CONSOLE_ENABLE
console_task();
#endif
#ifdef VIRTSER_ENABLE
virtser_task();
#endif
#ifdef RAW_HID_ENABLE
raw_hid_task();
#endif
} }
} }

1027
tmk_core/protocol/chibios/usb_main.c
Unescape View File

@ -28,6 +28,7 @@
#include "led.h" #include "led.h"
#endif #endif
#include "wait.h" #include "wait.h"
#include "usb_descriptor.h"
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
#include "keycode_config.h" #include "keycode_config.h"
@ -63,24 +64,12 @@ report_mouse_t mouse_report_blank = {0};
uint8_t extra_report_blank[3] = {0}; uint8_t extra_report_blank[3] = {0};
#endif /* EXTRAKEY_ENABLE */ #endif /* EXTRAKEY_ENABLE */
#ifdef CONSOLE_ENABLE
/* The emission buffers queue */
output_buffers_queue_t console_buf_queue;
static uint8_t console_queue_buffer[BQ_BUFFER_SIZE(CONSOLE_QUEUE_CAPACITY, CONSOLE_EPSIZE)];
static virtual_timer_t console_flush_timer;
void console_queue_onotify(io_buffers_queue_t *bqp);
static void console_flush_cb(void *arg);
#endif /* CONSOLE_ENABLE */
/* --------------------------------------------------------- /* ---------------------------------------------------------
* Descriptors and USB driver objects * Descriptors and USB driver objects
* --------------------------------------------------------- * ---------------------------------------------------------
*/ */
/* HID specific constants */ /* HID specific constants */
#define USB_DESCRIPTOR_HID 0x21
#define USB_DESCRIPTOR_HID_REPORT 0x22
#define HID_GET_REPORT 0x01 #define HID_GET_REPORT 0x01
#define HID_GET_IDLE 0x02 #define HID_GET_IDLE 0x02
#define HID_GET_PROTOCOL 0x03 #define HID_GET_PROTOCOL 0x03
@ -88,593 +77,21 @@ static void console_flush_cb(void *arg);
#define HID_SET_IDLE 0x0A #define HID_SET_IDLE 0x0A
#define HID_SET_PROTOCOL 0x0B #define HID_SET_PROTOCOL 0x0B
/* USB Device Descriptor */
static const uint8_t usb_device_descriptor_data[] = {
USB_DESC_DEVICE(0x0200, // bcdUSB (1.1)
0, // bDeviceClass (defined in later in interface)
0, // bDeviceSubClass
0, // bDeviceProtocol
64, // bMaxPacketSize (64 bytes) (the driver didn't work with 32)
VENDOR_ID, // idVendor
PRODUCT_ID, // idProduct
DEVICE_VER, // bcdDevice
1, // iManufacturer
2, // iProduct
3, // iSerialNumber
1) // bNumConfigurations
};
/* Device Descriptor wrapper */
static const USBDescriptor usb_device_descriptor = {
sizeof usb_device_descriptor_data,
usb_device_descriptor_data
};
/*
* HID Report Descriptor
*
* See "Device Class Definition for Human Interface Devices (HID)"
* (http://www.usb.org/developers/hidpage/HID1_11.pdf) for the
* detailed descrition of all the fields
*/
/* Keyboard Protocol 1, HID 1.11 spec, Appendix B, page 59-60 */
static const uint8_t keyboard_hid_report_desc_data[] = {
0x05, 0x01, // Usage Page (Generic Desktop),
0x09, 0x06, // Usage (Keyboard),
0xA1, 0x01, // Collection (Application),
0x75, 0x01, // Report Size (1),
0x95, 0x08, // Report Count (8),
0x05, 0x07, // Usage Page (Key Codes),
0x19, 0xE0, // Usage Minimum (224),
0x29, 0xE7, // Usage Maximum (231),
0x15, 0x00, // Logical Minimum (0),
0x25, 0x01, // Logical Maximum (1),
0x81, 0x02, // Input (Data, Variable, Absolute), ;Modifier byte
0x95, 0x01, // Report Count (1),
0x75, 0x08, // Report Size (8),
0x81, 0x03, // Input (Constant), ;Reserved byte
0x95, 0x05, // Report Count (5),
0x75, 0x01, // Report Size (1),
0x05, 0x08, // Usage Page (LEDs),
0x19, 0x01, // Usage Minimum (1),
0x29, 0x05, // Usage Maximum (5),
0x91, 0x02, // Output (Data, Variable, Absolute), ;LED report
0x95, 0x01, // Report Count (1),
0x75, 0x03, // Report Size (3),
0x91, 0x03, // Output (Constant), ;LED report padding
0x95, KBD_REPORT_KEYS, // Report Count (),
0x75, 0x08, // Report Size (8),
0x15, 0x00, // Logical Minimum (0),
0x26, 0xFF, 0x00, // Logical Maximum(255),
0x05, 0x07, // Usage Page (Key Codes),
0x19, 0x00, // Usage Minimum (0),
0x29, 0xFF, // Usage Maximum (255),
0x81, 0x00, // Input (Data, Array),
0xc0 // End Collection
};
/* wrapper */
static const USBDescriptor keyboard_hid_report_descriptor = {
sizeof keyboard_hid_report_desc_data,
keyboard_hid_report_desc_data
};
#ifdef NKRO_ENABLE
static const uint8_t nkro_hid_report_desc_data[] = {
0x05, 0x01, // Usage Page (Generic Desktop),
0x09, 0x06, // Usage (Keyboard),
0xA1, 0x01, // Collection (Application),
// bitmap of modifiers
0x75, 0x01, // Report Size (1),
0x95, 0x08, // Report Count (8),
0x05, 0x07, // Usage Page (Key Codes),
0x19, 0xE0, // Usage Minimum (224),
0x29, 0xE7, // Usage Maximum (231),
0x15, 0x00, // Logical Minimum (0),
0x25, 0x01, // Logical Maximum (1),
0x81, 0x02, // Input (Data, Variable, Absolute), ;Modifier byte
// LED output report
0x95, 0x05, // Report Count (5),
0x75, 0x01, // Report Size (1),
0x05, 0x08, // Usage Page (LEDs),
0x19, 0x01, // Usage Minimum (1),
0x29, 0x05, // Usage Maximum (5),
0x91, 0x02, // Output (Data, Variable, Absolute),
0x95, 0x01, // Report Count (1),
0x75, 0x03, // Report Size (3),
0x91, 0x03, // Output (Constant),
// bitmap of keys
0x95, NKRO_REPORT_KEYS * 8, // Report Count (),
0x75, 0x01, // Report Size (1),
0x15, 0x00, // Logical Minimum (0),
0x25, 0x01, // Logical Maximum(1),
0x05, 0x07, // Usage Page (Key Codes),
0x19, 0x00, // Usage Minimum (0),
0x29, NKRO_REPORT_KEYS * 8 - 1, // Usage Maximum (),
0x81, 0x02, // Input (Data, Variable, Absolute),
0xc0 // End Collection
};
/* wrapper */
static const USBDescriptor nkro_hid_report_descriptor = {
sizeof nkro_hid_report_desc_data,
nkro_hid_report_desc_data
};
#endif /* NKRO_ENABLE */
#ifdef MOUSE_ENABLE
/* Mouse Protocol 1, HID 1.11 spec, Appendix B, page 59-60, with wheel extension
* http://www.microchip.com/forums/tm.aspx?high=&m=391435&mpage=1#391521
* http://www.keil.com/forum/15671/
* http://www.microsoft.com/whdc/device/input/wheel.mspx */
static const uint8_t mouse_hid_report_desc_data[] = {
/* mouse */
0x05, 0x01, // USAGE_PAGE (Generic Desktop)
0x09, 0x02, // USAGE (Mouse)
0xa1, 0x01, // COLLECTION (Application)
//0x85, REPORT_ID_MOUSE, // REPORT_ID (1)
0x09, 0x01, // USAGE (Pointer)
0xa1, 0x00, // COLLECTION (Physical)
// ---------------------------- Buttons
0x05, 0x09, // USAGE_PAGE (Button)
0x19, 0x01, // USAGE_MINIMUM (Button 1)
0x29, 0x05, // USAGE_MAXIMUM (Button 5)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x01, // LOGICAL_MAXIMUM (1)
0x75, 0x01, // REPORT_SIZE (1)
0x95, 0x05, // REPORT_COUNT (5)
0x81, 0x02, // INPUT (Data,Var,Abs)
0x75, 0x03, // REPORT_SIZE (3)
0x95, 0x01, // REPORT_COUNT (1)
0x81, 0x03, // INPUT (Cnst,Var,Abs)
// ---------------------------- X,Y position
0x05, 0x01, // USAGE_PAGE (Generic Desktop)
0x09, 0x30, // USAGE (X)
0x09, 0x31, // USAGE (Y)
0x15, 0x81, // LOGICAL_MINIMUM (-127)
0x25, 0x7f, // LOGICAL_MAXIMUM (127)
0x75, 0x08, // REPORT_SIZE (8)
0x95, 0x02, // REPORT_COUNT (2)
0x81, 0x06, // INPUT (Data,Var,Rel)
// ---------------------------- Vertical wheel
0x09, 0x38, // USAGE (Wheel)
0x15, 0x81, // LOGICAL_MINIMUM (-127)
0x25, 0x7f, // LOGICAL_MAXIMUM (127)
0x35, 0x00, // PHYSICAL_MINIMUM (0) - reset physical
0x45, 0x00, // PHYSICAL_MAXIMUM (0)
0x75, 0x08, // REPORT_SIZE (8)
0x95, 0x01, // REPORT_COUNT (1)
0x81, 0x06, // INPUT (Data,Var,Rel)
// ---------------------------- Horizontal wheel
0x05, 0x0c, // USAGE_PAGE (Consumer Devices)
0x0a, 0x38, 0x02, // USAGE (AC Pan)
0x15, 0x81, // LOGICAL_MINIMUM (-127)
0x25, 0x7f, // LOGICAL_MAXIMUM (127)
0x75, 0x08, // REPORT_SIZE (8)
0x95, 0x01, // REPORT_COUNT (1)
0x81, 0x06, // INPUT (Data,Var,Rel)
0xc0, // END_COLLECTION
0xc0, // END_COLLECTION
};
/* wrapper */
static const USBDescriptor mouse_hid_report_descriptor = {
sizeof mouse_hid_report_desc_data,
mouse_hid_report_desc_data
};
#endif /* MOUSE_ENABLE */
#ifdef CONSOLE_ENABLE
static const uint8_t console_hid_report_desc_data[] = {
0x06, 0x31, 0xFF, // Usage Page 0xFF31 (vendor defined)
0x09, 0x74, // Usage 0x74
0xA1, 0x53, // Collection 0x53
0x75, 0x08, // report size = 8 bits
0x15, 0x00, // logical minimum = 0
0x26, 0xFF, 0x00, // logical maximum = 255
0x95, CONSOLE_EPSIZE, // report count
0x09, 0x75, // usage
0x81, 0x02, // Input (array)
0xC0 // end collection
};
/* wrapper */
static const USBDescriptor console_hid_report_descriptor = {
sizeof console_hid_report_desc_data,
console_hid_report_desc_data
};
#endif /* CONSOLE_ENABLE */
#ifdef EXTRAKEY_ENABLE
/* audio controls & system controls
* http://www.microsoft.com/whdc/archive/w2kbd.mspx */
static const uint8_t extra_hid_report_desc_data[] = {
/* system control */
0x05, 0x01, // USAGE_PAGE (Generic Desktop)
0x09, 0x80, // USAGE (System Control)
0xa1, 0x01, // COLLECTION (Application)
0x85, REPORT_ID_SYSTEM, // REPORT_ID (2)
0x15, 0x01, // LOGICAL_MINIMUM (0x1)
0x25, 0xb7, // LOGICAL_MAXIMUM (0xb7)
0x19, 0x01, // USAGE_MINIMUM (0x1)
0x29, 0xb7, // USAGE_MAXIMUM (0xb7)
0x75, 0x10, // REPORT_SIZE (16)
0x95, 0x01, // REPORT_COUNT (1)
0x81, 0x00, // INPUT (Data,Array,Abs)
0xc0, // END_COLLECTION
/* consumer */
0x05, 0x0c, // USAGE_PAGE (Consumer Devices)
0x09, 0x01, // USAGE (Consumer Control)
0xa1, 0x01, // COLLECTION (Application)
0x85, REPORT_ID_CONSUMER, // REPORT_ID (3)
0x15, 0x01, // LOGICAL_MINIMUM (0x1)
0x26, 0x9c, 0x02, // LOGICAL_MAXIMUM (0x29c)
0x19, 0x01, // USAGE_MINIMUM (0x1)
0x2a, 0x9c, 0x02, // USAGE_MAXIMUM (0x29c)
0x75, 0x10, // REPORT_SIZE (16)
0x95, 0x01, // REPORT_COUNT (1)
0x81, 0x00, // INPUT (Data,Array,Abs)
0xc0, // END_COLLECTION
};
/* wrapper */
static const USBDescriptor extra_hid_report_descriptor = {
sizeof extra_hid_report_desc_data,
extra_hid_report_desc_data
};
#endif /* EXTRAKEY_ENABLE */
/*
* Configuration Descriptor tree for a HID device
*
* The HID Specifications version 1.11 require the following order:
* - Configuration Descriptor
* - Interface Descriptor
* - HID Descriptor
* - Endpoints Descriptors
*/
#define KBD_HID_DESC_NUM 0
#define KBD_HID_DESC_OFFSET (9 + (9 + 9 + 7) * KBD_HID_DESC_NUM + 9)
#ifdef MOUSE_ENABLE
# define MOUSE_HID_DESC_NUM (KBD_HID_DESC_NUM + 1)
# define MOUSE_HID_DESC_OFFSET (9 + (9 + 9 + 7) * MOUSE_HID_DESC_NUM + 9)
#else /* MOUSE_ENABLE */
# define MOUSE_HID_DESC_NUM (KBD_HID_DESC_NUM + 0)
#endif /* MOUSE_ENABLE */
#ifdef CONSOLE_ENABLE
#define CONSOLE_HID_DESC_NUM (MOUSE_HID_DESC_NUM + 1)
#define CONSOLE_HID_DESC_OFFSET (9 + (9 + 9 + 7) * CONSOLE_HID_DESC_NUM + 9)
#else /* CONSOLE_ENABLE */
# define CONSOLE_HID_DESC_NUM (MOUSE_HID_DESC_NUM + 0)
#endif /* CONSOLE_ENABLE */
#ifdef EXTRAKEY_ENABLE
# define EXTRA_HID_DESC_NUM (CONSOLE_HID_DESC_NUM + 1)
# define EXTRA_HID_DESC_OFFSET (9 + (9 + 9 + 7) * EXTRA_HID_DESC_NUM + 9)
#else /* EXTRAKEY_ENABLE */
# define EXTRA_HID_DESC_NUM (CONSOLE_HID_DESC_NUM + 0)
#endif /* EXTRAKEY_ENABLE */
#ifdef NKRO_ENABLE
# define NKRO_HID_DESC_NUM (EXTRA_HID_DESC_NUM + 1)
# define NKRO_HID_DESC_OFFSET (9 + (9 + 9 + 7) * EXTRA_HID_DESC_NUM + 9)
#else /* NKRO_ENABLE */
# define NKRO_HID_DESC_NUM (EXTRA_HID_DESC_NUM + 0)
#endif /* NKRO_ENABLE */
#define NUM_INTERFACES (NKRO_HID_DESC_NUM + 1)
#define CONFIG1_DESC_SIZE (9 + (9 + 9 + 7) * NUM_INTERFACES)
static const uint8_t hid_configuration_descriptor_data[] = {
/* Configuration Descriptor (9 bytes) USB spec 9.6.3, page 264-266, Table 9-10 */
USB_DESC_CONFIGURATION(CONFIG1_DESC_SIZE, // wTotalLength
NUM_INTERFACES, // bNumInterfaces
1, // bConfigurationValue
0, // iConfiguration
0xA0, // bmAttributes (RESERVED|REMOTEWAKEUP)
50), // bMaxPower (50mA)
/* Interface Descriptor (9 bytes) USB spec 9.6.5, page 267-269, Table 9-12 */
USB_DESC_INTERFACE(KBD_INTERFACE, // bInterfaceNumber
0, // bAlternateSetting
1, // bNumEndpoints
0x03, // bInterfaceClass: HID
0x01, // bInterfaceSubClass: Boot
0x01, // bInterfaceProtocol: Keyboard
0), // iInterface
/* HID descriptor (9 bytes) HID 1.11 spec, section 6.2.1 */
USB_DESC_BYTE(9), // bLength
USB_DESC_BYTE(0x21), // bDescriptorType (HID class)
USB_DESC_BCD(0x0111), // bcdHID: HID version 1.11
USB_DESC_BYTE(0), // bCountryCode
USB_DESC_BYTE(1), // bNumDescriptors
USB_DESC_BYTE(0x22), // bDescriptorType (report desc)
USB_DESC_WORD(sizeof(keyboard_hid_report_desc_data)), // wDescriptorLength
/* Endpoint Descriptor (7 bytes) USB spec 9.6.6, page 269-271, Table 9-13 */
USB_DESC_ENDPOINT(KBD_ENDPOINT | 0x80, // bEndpointAddress
0x03, // bmAttributes (Interrupt)
KBD_EPSIZE,// wMaxPacketSize
10), // bInterval
#ifdef MOUSE_ENABLE
/* Interface Descriptor (9 bytes) USB spec 9.6.5, page 267-269, Table 9-12 */
USB_DESC_INTERFACE(MOUSE_INTERFACE, // bInterfaceNumber
0, // bAlternateSetting
1, // bNumEndpoints
0x03, // bInterfaceClass (0x03 = HID)
// ThinkPad T23 BIOS doesn't work with boot mouse.
0x00, // bInterfaceSubClass (0x01 = Boot)
0x00, // bInterfaceProtocol (0x02 = Mouse)
/*
0x01, // bInterfaceSubClass (0x01 = Boot)
0x02, // bInterfaceProtocol (0x02 = Mouse)
*/
0), // iInterface
/* HID descriptor (9 bytes) HID 1.11 spec, section 6.2.1 */
USB_DESC_BYTE(9), // bLength
USB_DESC_BYTE(0x21), // bDescriptorType (HID class)
USB_DESC_BCD(0x0111), // bcdHID: HID version 1.11
USB_DESC_BYTE(0), // bCountryCode
USB_DESC_BYTE(1), // bNumDescriptors
USB_DESC_BYTE(0x22), // bDescriptorType (report desc)
USB_DESC_WORD(sizeof(mouse_hid_report_desc_data)), // wDescriptorLength
/* Endpoint Descriptor (7 bytes) USB spec 9.6.6, page 269-271, Table 9-13 */
USB_DESC_ENDPOINT(MOUSE_ENDPOINT | 0x80, // bEndpointAddress
0x03, // bmAttributes (Interrupt)
MOUSE_EPSIZE, // wMaxPacketSize
1), // bInterval
#endif /* MOUSE_ENABLE */
#ifdef CONSOLE_ENABLE
/* Interface Descriptor (9 bytes) USB spec 9.6.5, page 267-269, Table 9-12 */
USB_DESC_INTERFACE(CONSOLE_INTERFACE, // bInterfaceNumber
0, // bAlternateSetting
1, // bNumEndpoints
0x03, // bInterfaceClass: HID
0x00, // bInterfaceSubClass: None
0x00, // bInterfaceProtocol: None
0), // iInterface
/* HID descriptor (9 bytes) HID 1.11 spec, section 6.2.1 */
USB_DESC_BYTE(9), // bLength
USB_DESC_BYTE(0x21), // bDescriptorType (HID class)
USB_DESC_BCD(0x0111), // bcdHID: HID version 1.11
USB_DESC_BYTE(0), // bCountryCode
USB_DESC_BYTE(1), // bNumDescriptors
USB_DESC_BYTE(0x22), // bDescriptorType (report desc)
USB_DESC_WORD(sizeof(console_hid_report_desc_data)), // wDescriptorLength
/* Endpoint Descriptor (7 bytes) USB spec 9.6.6, page 269-271, Table 9-13 */
USB_DESC_ENDPOINT(CONSOLE_ENDPOINT | 0x80, // bEndpointAddress
0x03, // bmAttributes (Interrupt)
CONSOLE_EPSIZE, // wMaxPacketSize
1), // bInterval
#endif /* CONSOLE_ENABLE */
#ifdef EXTRAKEY_ENABLE
/* Interface Descriptor (9 bytes) USB spec 9.6.5, page 267-269, Table 9-12 */
USB_DESC_INTERFACE(EXTRA_INTERFACE, // bInterfaceNumber
0, // bAlternateSetting
1, // bNumEndpoints
0x03, // bInterfaceClass: HID
0x00, // bInterfaceSubClass: None
0x00, // bInterfaceProtocol: None
0), // iInterface
/* HID descriptor (9 bytes) HID 1.11 spec, section 6.2.1 */
USB_DESC_BYTE(9), // bLength
USB_DESC_BYTE(0x21), // bDescriptorType (HID class)
USB_DESC_BCD(0x0111), // bcdHID: HID version 1.11
USB_DESC_BYTE(0), // bCountryCode
USB_DESC_BYTE(1), // bNumDescriptors
USB_DESC_BYTE(0x22), // bDescriptorType (report desc)
USB_DESC_WORD(sizeof(extra_hid_report_desc_data)), // wDescriptorLength
/* Endpoint Descriptor (7 bytes) USB spec 9.6.6, page 269-271, Table 9-13 */
USB_DESC_ENDPOINT(EXTRA_ENDPOINT | 0x80, // bEndpointAddress
0x03, // bmAttributes (Interrupt)
EXTRA_EPSIZE, // wMaxPacketSize
10), // bInterval
#endif /* EXTRAKEY_ENABLE */
#ifdef NKRO_ENABLE
/* Interface Descriptor (9 bytes) USB spec 9.6.5, page 267-269, Table 9-12 */
USB_DESC_INTERFACE(NKRO_INTERFACE, // bInterfaceNumber
0, // bAlternateSetting
1, // bNumEndpoints
0x03, // bInterfaceClass: HID
0x00, // bInterfaceSubClass: None
0x00, // bInterfaceProtocol: None
0), // iInterface
/* HID descriptor (9 bytes) HID 1.11 spec, section 6.2.1 */
USB_DESC_BYTE(9), // bLength
USB_DESC_BYTE(0x21), // bDescriptorType (HID class)
USB_DESC_BCD(0x0111), // bcdHID: HID version 1.11
USB_DESC_BYTE(0), // bCountryCode
USB_DESC_BYTE(1), // bNumDescriptors
USB_DESC_BYTE(0x22), // bDescriptorType (report desc)
USB_DESC_WORD(sizeof(nkro_hid_report_desc_data)), // wDescriptorLength
/* Endpoint Descriptor (7 bytes) USB spec 9.6.6, page 269-271, Table 9-13 */
USB_DESC_ENDPOINT(NKRO_ENDPOINT | 0x80, // bEndpointAddress
0x03, // bmAttributes (Interrupt)
NKRO_EPSIZE, // wMaxPacketSize
1), // bInterval
#endif /* NKRO_ENABLE */
};
/* Configuration Descriptor wrapper */
static const USBDescriptor hid_configuration_descriptor = {
sizeof hid_configuration_descriptor_data,
hid_configuration_descriptor_data
};
/* wrappers */
#define HID_DESCRIPTOR_SIZE 9
static const USBDescriptor keyboard_hid_descriptor = {
HID_DESCRIPTOR_SIZE,
&hid_configuration_descriptor_data[KBD_HID_DESC_OFFSET]
};
#ifdef MOUSE_ENABLE
static const USBDescriptor mouse_hid_descriptor = {
HID_DESCRIPTOR_SIZE,
&hid_configuration_descriptor_data[MOUSE_HID_DESC_OFFSET]
};
#endif /* MOUSE_ENABLE */
#ifdef CONSOLE_ENABLE
static const USBDescriptor console_hid_descriptor = {
HID_DESCRIPTOR_SIZE,
&hid_configuration_descriptor_data[CONSOLE_HID_DESC_OFFSET]
};
#endif /* CONSOLE_ENABLE */
#ifdef EXTRAKEY_ENABLE
static const USBDescriptor extra_hid_descriptor = {
HID_DESCRIPTOR_SIZE,
&hid_configuration_descriptor_data[EXTRA_HID_DESC_OFFSET]
};
#endif /* EXTRAKEY_ENABLE */
#ifdef NKRO_ENABLE
static const USBDescriptor nkro_hid_descriptor = {
HID_DESCRIPTOR_SIZE,
&hid_configuration_descriptor_data[NKRO_HID_DESC_OFFSET]
};
#endif /* NKRO_ENABLE */
/* U.S. English language identifier */
static const uint8_t usb_string_langid[] = {
USB_DESC_BYTE(4), // bLength
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), // bDescriptorType
USB_DESC_WORD(0x0409) // wLANGID (U.S. English)
};
/* ugly ugly hack */
#define PP_NARG(...) \
PP_NARG_(__VA_ARGS__,PP_RSEQ_N())
#define PP_NARG_(...) \
PP_ARG_N(__VA_ARGS__)
#define PP_ARG_N( \
_1, _2, _3, _4, _5, _6, _7, _8, _9,_10, \
_11,_12,_13,_14,_15,_16,_17,_18,_19,_20, \
_21,_22,_23,_24,_25,_26,_27,_28,_29,_30, \
_31,_32,_33,_34,_35,_36,_37,_38,_39,_40, \
_41,_42,_43,_44,_45,_46,_47,_48,_49,_50, \
_51,_52,_53,_54,_55,_56,_57,_58,_59,_60, \
_61,_62,_63,N,...) N
#define PP_RSEQ_N() \
63,62,61,60, \
59,58,57,56,55,54,53,52,51,50, \
49,48,47,46,45,44,43,42,41,40, \
39,38,37,36,35,34,33,32,31,30, \
29,28,27,26,25,24,23,22,21,20, \
19,18,17,16,15,14,13,12,11,10, \
9,8,7,6,5,4,3,2,1,0
/* Vendor string = manufacturer */
static const uint8_t usb_string_vendor[] = {
USB_DESC_BYTE(PP_NARG(USBSTR_MANUFACTURER)+2), // bLength
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), // bDescriptorType
USBSTR_MANUFACTURER
};
/* Device Description string = product */
static const uint8_t usb_string_description[] = {
USB_DESC_BYTE(PP_NARG(USBSTR_PRODUCT)+2), // bLength
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), // bDescriptorType
USBSTR_PRODUCT
};
/* Serial Number string (will be filled by the function init_usb_serial_string) */
static uint8_t usb_string_serial[] = {
USB_DESC_BYTE(22), // bLength
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), // bDescriptorType
'0', 0, 'x', 0, 'D', 0, 'E', 0, 'A', 0, 'D', 0, 'B', 0, 'E', 0, 'E', 0, 'F', 0
};
/* Strings wrappers array */
static const USBDescriptor usb_strings[] = {
{ sizeof usb_string_langid, usb_string_langid }
,
{ sizeof usb_string_vendor, usb_string_vendor }
,
{ sizeof usb_string_description, usb_string_description }
,
{ sizeof usb_string_serial, usb_string_serial }
};
/* /*
* Handles the GET_DESCRIPTOR callback * Handles the GET_DESCRIPTOR callback
* *
* Returns the proper descriptor * Returns the proper descriptor
*/ */
static const USBDescriptor *usb_get_descriptor_cb(USBDriver *usbp, uint8_t dtype, uint8_t dindex, uint16_t lang) { static const USBDescriptor *usb_get_descriptor_cb(USBDriver *usbp, uint8_t dtype, uint8_t dindex, uint16_t wIndex) {
(void)usbp; (void)usbp;
(void)lang; static USBDescriptor desc;
switch(dtype) { uint16_t wValue = ((uint16_t)dtype << 8) | dindex;
/* Generic descriptors */ desc.ud_string = NULL;
case USB_DESCRIPTOR_DEVICE: /* Device Descriptor */ desc.ud_size = get_usb_descriptor(wValue, wIndex, (const void** const)&desc.ud_string);
return &usb_device_descriptor; if (desc.ud_string == NULL)
return NULL;
case USB_DESCRIPTOR_CONFIGURATION: /* Configuration Descriptor */ else
return &hid_configuration_descriptor; return &desc;
case USB_DESCRIPTOR_STRING: /* Strings */
if(dindex < 4)
return &usb_strings[dindex];
break;
/* HID specific descriptors */
case USB_DESCRIPTOR_HID: /* HID Descriptors */
switch(lang) { /* yea, poor label, it's actually wIndex from the setup packet */
case KBD_INTERFACE:
return &keyboard_hid_descriptor;
#ifdef MOUSE_ENABLE
case MOUSE_INTERFACE:
return &mouse_hid_descriptor;
#endif /* MOUSE_ENABLE */
#ifdef CONSOLE_ENABLE
case CONSOLE_INTERFACE:
return &console_hid_descriptor;
#endif /* CONSOLE_ENABLE */
#ifdef EXTRAKEY_ENABLE
case EXTRA_INTERFACE:
return &extra_hid_descriptor;
#endif /* EXTRAKEY_ENABLE */
#ifdef NKRO_ENABLE
case NKRO_INTERFACE:
return &nkro_hid_descriptor;
#endif /* NKRO_ENABLE */
}
case USB_DESCRIPTOR_HID_REPORT: /* HID Report Descriptor */
switch(lang) {
case KBD_INTERFACE:
return &keyboard_hid_report_descriptor;
#ifdef MOUSE_ENABLE
case MOUSE_INTERFACE:
return &mouse_hid_report_descriptor;
#endif /* MOUSE_ENABLE */
#ifdef CONSOLE_ENABLE
case CONSOLE_INTERFACE:
return &console_hid_report_descriptor;
#endif /* CONSOLE_ENABLE */
#ifdef EXTRAKEY_ENABLE
case EXTRA_INTERFACE:
return &extra_hid_report_descriptor;
#endif /* EXTRAKEY_ENABLE */
#ifdef NKRO_ENABLE
case NKRO_INTERFACE:
return &nkro_hid_report_descriptor;
#endif /* NKRO_ENABLE */
}
}
return NULL;
} }
/* keyboard endpoint state structure */ /* keyboard endpoint state structure */
@ -685,7 +102,7 @@ static const USBEndpointConfig kbd_ep_config = {
NULL, /* SETUP packet notification callback */ NULL, /* SETUP packet notification callback */
kbd_in_cb, /* IN notification callback */ kbd_in_cb, /* IN notification callback */
NULL, /* OUT notification callback */ NULL, /* OUT notification callback */
KBD_EPSIZE, /* IN maximum packet size */ KEYBOARD_EPSIZE, /* IN maximum packet size */
0, /* OUT maximum packet size */ 0, /* OUT maximum packet size */
&kbd_ep_state, /* IN Endpoint state */ &kbd_ep_state, /* IN Endpoint state */
NULL, /* OUT endpoint state */ NULL, /* OUT endpoint state */
@ -712,25 +129,6 @@ static const USBEndpointConfig mouse_ep_config = {
}; };
#endif /* MOUSE_ENABLE */ #endif /* MOUSE_ENABLE */
#ifdef CONSOLE_ENABLE
/* console endpoint state structure */
static USBInEndpointState console_ep_state;
/* console endpoint initialization structure (IN) */
static const USBEndpointConfig console_ep_config = {
USB_EP_MODE_TYPE_INTR, /* Interrupt EP */
NULL, /* SETUP packet notification callback */
console_in_cb, /* IN notification callback */
NULL, /* OUT notification callback */
CONSOLE_EPSIZE, /* IN maximum packet size */
0, /* OUT maximum packet size */
&console_ep_state, /* IN Endpoint state */
NULL, /* OUT endpoint state */
2, /* IN multiplier */
NULL /* SETUP buffer (not a SETUP endpoint) */
};
#endif /* CONSOLE_ENABLE */
#ifdef EXTRAKEY_ENABLE #ifdef EXTRAKEY_ENABLE
/* extrakey endpoint state structure */ /* extrakey endpoint state structure */
static USBInEndpointState extra_ep_state; static USBInEndpointState extra_ep_state;
@ -741,7 +139,7 @@ static const USBEndpointConfig extra_ep_config = {
NULL, /* SETUP packet notification callback */ NULL, /* SETUP packet notification callback */
extra_in_cb, /* IN notification callback */ extra_in_cb, /* IN notification callback */
NULL, /* OUT notification callback */ NULL, /* OUT notification callback */
EXTRA_EPSIZE, /* IN maximum packet size */ EXTRAKEY_EPSIZE, /* IN maximum packet size */
0, /* OUT maximum packet size */ 0, /* OUT maximum packet size */
&extra_ep_state, /* IN Endpoint state */ &extra_ep_state, /* IN Endpoint state */
NULL, /* OUT endpoint state */ NULL, /* OUT endpoint state */
@ -769,6 +167,129 @@ static const USBEndpointConfig nkro_ep_config = {
}; };
#endif /* NKRO_ENABLE */ #endif /* NKRO_ENABLE */
typedef struct {
size_t queue_capacity_in;
size_t queue_capacity_out;
uint8_t* queue_buffer_in;
uint8_t* queue_buffer_out;
USBInEndpointState in_ep_state;
USBOutEndpointState out_ep_state;
USBInEndpointState int_ep_state;
USBEndpointConfig in_ep_config;
USBEndpointConfig out_ep_config;
USBEndpointConfig int_ep_config;
const SerialUSBConfig config;
SerialUSBDriver driver;
} stream_driver_t;
#define STREAM_DRIVER(stream, notification) { \
.queue_capacity_in = stream##_IN_CAPACITY, \
.queue_capacity_out = stream##_OUT_CAPACITY, \
.queue_buffer_in = (uint8_t[BQ_BUFFER_SIZE(stream##_IN_CAPACITY, stream##_EPSIZE)]) {}, \
.queue_buffer_out = (uint8_t[BQ_BUFFER_SIZE(stream##_OUT_CAPACITY,stream##_EPSIZE)]) {}, \
.in_ep_config = { \
.ep_mode = stream##_IN_MODE, \
.setup_cb = NULL, \
.in_cb = sduDataTransmitted, \
.out_cb = NULL, \
.in_maxsize = stream##_EPSIZE, \
.out_maxsize = 0, \
/* The pointer to the states will be filled during initialization */ \
.in_state = NULL, \
.out_state = NULL, \
.ep_buffers = 2, \
.setup_buf = NULL \
}, \
.out_ep_config = { \
.ep_mode = stream##_OUT_MODE, \
.setup_cb = NULL, \
.in_cb = NULL, \
.out_cb = sduDataReceived, \
.in_maxsize = 0, \
.out_maxsize = stream##_EPSIZE, \
/* The pointer to the states will be filled during initialization */ \
.in_state = NULL, \
.out_state = NULL, \
.ep_buffers = 2, \
.setup_buf = NULL, \
}, \
.int_ep_config = { \
.ep_mode = USB_EP_MODE_TYPE_INTR, \
.setup_cb = NULL, \
.in_cb = sduInterruptTransmitted, \
.out_cb = NULL, \
.in_maxsize = CDC_NOTIFICATION_EPSIZE, \
.out_maxsize = 0, \
/* The pointer to the states will be filled during initialization */ \
.in_state = NULL, \
.out_state = NULL, \
.ep_buffers = 2, \
.setup_buf = NULL, \
}, \
.config = { \
.usbp = &USB_DRIVER, \
.bulk_in = stream##_IN_EPNUM, \
.bulk_out = stream##_OUT_EPNUM, \
.int_in = notification \
} \
}
typedef struct {
union {
struct {
#ifdef CONSOLE_ENABLE
stream_driver_t console_driver;
#endif
#ifdef RAW_ENABLE
stream_driver_t raw_driver;
#endif
#ifdef MIDI_ENABLE
stream_driver_t midi_driver;
#endif
#ifdef VIRTSER_ENABLE
stream_driver_t serial_driver;
#endif
};
stream_driver_t array[0];
};
} stream_drivers_t;
static stream_drivers_t drivers = {
#ifdef CONSOLE_ENABLE
#define CONSOLE_IN_CAPACITY 4
#define CONSOLE_OUT_CAPACITY 4
#define CONSOLE_IN_MODE USB_EP_MODE_TYPE_INTR
#define CONSOLE_OUT_MODE USB_EP_MODE_TYPE_INTR
.console_driver = STREAM_DRIVER(CONSOLE, 0),
#endif
#ifdef RAW_ENABLE
#define RAW_IN_CAPACITY 4
#define RAW_OUT_CAPACITY 4
#define RAW_IN_MODE USB_EP_MODE_TYPE_INTR
#define RAW_OUT_MODE USB_EP_MODE_TYPE_INTR
.raw_driver = STREAM_DRIVER(RAW, 0),
#endif
#ifdef MIDI_ENABLE
#define MIDI_STREAM_IN_CAPACITY 4
#define MIDI_STREAM_OUT_CAPACITY 4
#define MIDI_STREAM_IN_MODE USB_EP_MODE_TYPE_BULK
#define MIDI_STREAM_OUT_MODE USB_EP_MODE_TYPE_BULK
.midi_driver = STREAM_DRIVER(MIDI_STREAM, 0),
#endif
#ifdef VIRTSER_ENABLE
#define CDC_IN_CAPACITY 4
#define CDC_OUT_CAPACITY 4
#define CDC_IN_MODE USB_EP_MODE_TYPE_BULK
#define CDC_OUT_MODE USB_EP_MODE_TYPE_BULK
.serial_driver = STREAM_DRIVER(CDC, CDC_NOTIFICATION_EPNUM),
#endif
};
#define NUM_STREAM_DRIVERS (sizeof(drivers) / sizeof(stream_driver_t))
/* --------------------------------------------------------- /* ---------------------------------------------------------
* USB driver functions * USB driver functions
* --------------------------------------------------------- * ---------------------------------------------------------
@ -784,24 +305,27 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
case USB_EVENT_CONFIGURED: case USB_EVENT_CONFIGURED:
osalSysLockFromISR(); osalSysLockFromISR();
/* Enable the endpoints specified into the configuration. */ /* Enable the endpoints specified into the configuration. */
usbInitEndpointI(usbp, KBD_ENDPOINT, &kbd_ep_config); usbInitEndpointI(usbp, KEYBOARD_IN_EPNUM, &kbd_ep_config);
#ifdef MOUSE_ENABLE #ifdef MOUSE_ENABLE
usbInitEndpointI(usbp, MOUSE_ENDPOINT, &mouse_ep_config); usbInitEndpointI(usbp, MOUSE_IN_EPNUM, &mouse_ep_config);
#endif /* MOUSE_ENABLE */ #endif /* MOUSE_ENABLE */
#ifdef CONSOLE_ENABLE
usbInitEndpointI(usbp, CONSOLE_ENDPOINT, &console_ep_config);
/* don't need to start the flush timer, it starts from console_in_cb automatically */
#endif /* CONSOLE_ENABLE */
#ifdef EXTRAKEY_ENABLE #ifdef EXTRAKEY_ENABLE
usbInitEndpointI(usbp, EXTRA_ENDPOINT, &extra_ep_config); usbInitEndpointI(usbp, EXTRAKEY_IN_EPNUM, &extra_ep_config);
#endif /* EXTRAKEY_ENABLE */ #endif /* EXTRAKEY_ENABLE */
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
usbInitEndpointI(usbp, NKRO_ENDPOINT, &nkro_ep_config); usbInitEndpointI(usbp, NKRO_IN_EPNUM, &nkro_ep_config);
#endif /* NKRO_ENABLE */ #endif /* NKRO_ENABLE */
for (int i=0;i<NUM_STREAM_DRIVERS;i++) {
usbInitEndpointI(usbp, drivers.array[i].config.bulk_in, &drivers.array[i].in_ep_config);
usbInitEndpointI(usbp, drivers.array[i].config.bulk_out, &drivers.array[i].out_ep_config);
if (drivers.array[i].config.int_in) {
usbInitEndpointI(usbp, drivers.array[i].config.int_in, &drivers.array[i].int_ep_config);
}
sduConfigureHookI(&drivers.array[i].driver);
}
osalSysUnlockFromISR(); osalSysUnlockFromISR();
return; return;
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
//TODO: from ISR! print("[S]");
#ifdef SLEEP_LED_ENABLE #ifdef SLEEP_LED_ENABLE
sleep_led_enable(); sleep_led_enable();
#endif /* SLEEP_LED_ENABLE */ #endif /* SLEEP_LED_ENABLE */
@ -809,10 +333,22 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
case USB_EVENT_UNCONFIGURED: case USB_EVENT_UNCONFIGURED:
/* Falls into.*/ /* Falls into.*/
case USB_EVENT_RESET: case USB_EVENT_RESET:
for (int i=0;i<NUM_STREAM_DRIVERS;i++) {
chSysLockFromISR();
/* Disconnection event on suspend.*/
sduSuspendHookI(&drivers.array[i].driver);
chSysUnlockFromISR();
}
return; return;
case USB_EVENT_WAKEUP: case USB_EVENT_WAKEUP:
//TODO: from ISR! print("[W]"); //TODO: from ISR! print("[W]");
for (int i=0;i<NUM_STREAM_DRIVERS;i++) {
chSysLockFromISR();
/* Disconnection event on suspend.*/
sduWakeupHookI(&drivers.array[i].driver);
chSysUnlockFromISR();
}
suspend_wakeup_init(); suspend_wakeup_init();
#ifdef SLEEP_LED_ENABLE #ifdef SLEEP_LED_ENABLE
sleep_led_disable(); sleep_led_disable();
@ -868,7 +404,7 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
switch(usbp->setup[1]) { /* bRequest */ switch(usbp->setup[1]) { /* bRequest */
case HID_GET_REPORT: case HID_GET_REPORT:
switch(usbp->setup[4]) { /* LSB(wIndex) (check MSB==0?) */ switch(usbp->setup[4]) { /* LSB(wIndex) (check MSB==0?) */
case KBD_INTERFACE: case KEYBOARD_INTERFACE:
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
case NKRO_INTERFACE: case NKRO_INTERFACE:
#endif /* NKRO_ENABLE */ #endif /* NKRO_ENABLE */
@ -883,15 +419,8 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
break; break;
#endif /* MOUSE_ENABLE */ #endif /* MOUSE_ENABLE */
#ifdef CONSOLE_ENABLE
case CONSOLE_INTERFACE:
usbSetupTransfer(usbp, console_queue_buffer, CONSOLE_EPSIZE, NULL);
return TRUE;
break;
#endif /* CONSOLE_ENABLE */
#ifdef EXTRAKEY_ENABLE #ifdef EXTRAKEY_ENABLE
case EXTRA_INTERFACE: case EXTRAKEY_INTERFACE:
if(usbp->setup[3] == 1) { /* MSB(wValue) [Report Type] == 1 [Input Report] */ if(usbp->setup[3] == 1) { /* MSB(wValue) [Report Type] == 1 [Input Report] */
switch(usbp->setup[2]) { /* LSB(wValue) [Report ID] */ switch(usbp->setup[2]) { /* LSB(wValue) [Report ID] */
case REPORT_ID_SYSTEM: case REPORT_ID_SYSTEM:
@ -921,7 +450,7 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
break; break;
case HID_GET_PROTOCOL: case HID_GET_PROTOCOL:
if((usbp->setup[4] == KBD_INTERFACE) && (usbp->setup[5] == 0)) { /* wIndex */ if((usbp->setup[4] == KEYBOARD_INTERFACE) && (usbp->setup[5] == 0)) { /* wIndex */
usbSetupTransfer(usbp, &keyboard_protocol, 1, NULL); usbSetupTransfer(usbp, &keyboard_protocol, 1, NULL);
return TRUE; return TRUE;
} }
@ -938,7 +467,7 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
switch(usbp->setup[1]) { /* bRequest */ switch(usbp->setup[1]) { /* bRequest */
case HID_SET_REPORT: case HID_SET_REPORT:
switch(usbp->setup[4]) { /* LSB(wIndex) (check MSB==0 and wLength==1?) */ switch(usbp->setup[4]) { /* LSB(wIndex) (check MSB==0 and wLength==1?) */
case KBD_INTERFACE: case KEYBOARD_INTERFACE:
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
case NKRO_INTERFACE: case NKRO_INTERFACE:
#endif /* NKRO_ENABLE */ #endif /* NKRO_ENABLE */
@ -951,7 +480,7 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
break; break;
case HID_SET_PROTOCOL: case HID_SET_PROTOCOL:
if((usbp->setup[4] == KBD_INTERFACE) && (usbp->setup[5] == 0)) { /* wIndex */ if((usbp->setup[4] == KEYBOARD_INTERFACE) && (usbp->setup[5] == 0)) { /* wIndex */
keyboard_protocol = ((usbp->setup[2]) != 0x00); /* LSB(wValue) */ keyboard_protocol = ((usbp->setup[2]) != 0x00); /* LSB(wValue) */
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
keymap_config.nkro = !!keyboard_protocol; keymap_config.nkro = !!keyboard_protocol;
@ -998,12 +527,24 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
return TRUE; return TRUE;
} }
for (int i=0;i<NUM_STREAM_DRIVERS;i++) {
if (drivers.array[i].config.int_in) {
// NOTE: Assumes that we only have one serial driver
return sduRequestsHook(usbp);
}
}
return FALSE; return FALSE;
} }
/* Start-of-frame callback */ /* Start-of-frame callback */
static void usb_sof_cb(USBDriver *usbp) { static void usb_sof_cb(USBDriver *usbp) {
kbd_sof_cb(usbp); kbd_sof_cb(usbp);
osalSysLockFromISR();
for (int i=0; i<NUM_STREAM_DRIVERS;i++) {
sduSOFHookI(&drivers.array[i].driver);
}
osalSysUnlockFromISR();
} }
@ -1019,6 +560,19 @@ static const USBConfig usbcfg = {
* Initialize the USB driver * Initialize the USB driver
*/ */
void init_usb_driver(USBDriver *usbp) { void init_usb_driver(USBDriver *usbp) {
for (int i=0; i<NUM_STREAM_DRIVERS;i++) {
SerialUSBDriver* driver = &drivers.array[i].driver;
drivers.array[i].in_ep_config.in_state = &drivers.array[i].in_ep_state;
drivers.array[i].out_ep_config.out_state = &drivers.array[i].out_ep_state;
drivers.array[i].int_ep_config.in_state = &drivers.array[i].int_ep_state;
sduObjectInit(driver);
bqnotify_t notify = driver->ibqueue.notify;
ibqObjectInit(&driver->ibqueue, false, drivers.array[i].queue_buffer_in, drivers.array[i].in_ep_config.in_maxsize, drivers.array[i].queue_capacity_in, notify, driver);
notify = driver->obqueue.notify;
ibqObjectInit(&driver->ibqueue, false, drivers.array[i].queue_buffer_out, drivers.array[i].out_ep_config.out_maxsize, drivers.array[i].queue_capacity_out, notify, driver);
sduStart(driver, &drivers.array[i].config);
}
/* /*
* Activates the USB driver and then the USB bus pull-up on D+. * Activates the USB driver and then the USB bus pull-up on D+.
* Note, a delay is inserted in order to not have to disconnect the cable * Note, a delay is inserted in order to not have to disconnect the cable
@ -1030,17 +584,12 @@ void init_usb_driver(USBDriver *usbp) {
usbConnectBus(usbp); usbConnectBus(usbp);
chVTObjectInit(&keyboard_idle_timer); chVTObjectInit(&keyboard_idle_timer);
#ifdef CONSOLE_ENABLE
obqObjectInit(&console_buf_queue, false, console_queue_buffer, CONSOLE_EPSIZE, CONSOLE_QUEUE_CAPACITY, console_queue_onotify, (void*)usbp);
chVTObjectInit(&console_flush_timer);
#endif
} }
/* --------------------------------------------------------- /* ---------------------------------------------------------
* Keyboard functions * Keyboard functions
* --------------------------------------------------------- * ---------------------------------------------------------
*/ */
/* keyboard IN callback hander (a kbd report has made it IN) */ /* keyboard IN callback hander (a kbd report has made it IN) */
void kbd_in_cb(USBDriver *usbp, usbep_t ep) { void kbd_in_cb(USBDriver *usbp, usbep_t ep) {
/* STUB */ /* STUB */
@ -1084,8 +633,8 @@ static void keyboard_idle_timer_cb(void *arg) {
if(keyboard_idle) { if(keyboard_idle) {
#endif /* NKRO_ENABLE */ #endif /* NKRO_ENABLE */
/* TODO: are we sure we want the KBD_ENDPOINT? */ /* TODO: are we sure we want the KBD_ENDPOINT? */
if(!usbGetTransmitStatusI(usbp, KBD_ENDPOINT)) { if(!usbGetTransmitStatusI(usbp, KEYBOARD_IN_EPNUM)) {
usbStartTransmitI(usbp, KBD_ENDPOINT, (uint8_t *)&keyboard_report_sent, KBD_EPSIZE); usbStartTransmitI(usbp, KEYBOARD_IN_EPNUM, (uint8_t *)&keyboard_report_sent, KEYBOARD_EPSIZE);
} }
/* rearm the timer */ /* rearm the timer */
chVTSetI(&keyboard_idle_timer, 4*MS2ST(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp); chVTSetI(&keyboard_idle_timer, 4*MS2ST(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp);
@ -1119,14 +668,14 @@ void send_keyboard(report_keyboard_t *report) {
* this is more efficient */ * this is more efficient */
/* busy wait, should be short and not very common */ /* busy wait, should be short and not very common */
osalSysLock(); osalSysLock();
if(usbGetTransmitStatusI(&USB_DRIVER, NKRO_ENDPOINT)) { if(usbGetTransmitStatusI(&USB_DRIVER, NKRO_IN_EPNUM)) {
/* Need to either suspend, or loop and call unlock/lock during /* Need to either suspend, or loop and call unlock/lock during
* every iteration - otherwise the system will remain locked, * every iteration - otherwise the system will remain locked,
* no interrupts served, so USB not going through as well. * no interrupts served, so USB not going through as well.
* Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */ * Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */
osalThreadSuspendS(&(&USB_DRIVER)->epc[NKRO_ENDPOINT]->in_state->thread); osalThreadSuspendS(&(&USB_DRIVER)->epc[NKRO_IN_EPNUM]->in_state->thread);
} }
usbStartTransmitI(&USB_DRIVER, NKRO_ENDPOINT, (uint8_t *)report, sizeof(report_keyboard_t)); usbStartTransmitI(&USB_DRIVER, NKRO_IN_EPNUM, (uint8_t *)report, sizeof(report_keyboard_t));
osalSysUnlock(); osalSysUnlock();
} else } else
#endif /* NKRO_ENABLE */ #endif /* NKRO_ENABLE */
@ -1134,14 +683,14 @@ void send_keyboard(report_keyboard_t *report) {
/* need to wait until the previous packet has made it through */ /* need to wait until the previous packet has made it through */
/* busy wait, should be short and not very common */ /* busy wait, should be short and not very common */
osalSysLock(); osalSysLock();
if(usbGetTransmitStatusI(&USB_DRIVER, KBD_ENDPOINT)) { if(usbGetTransmitStatusI(&USB_DRIVER, KEYBOARD_IN_EPNUM)) {
/* Need to either suspend, or loop and call unlock/lock during /* Need to either suspend, or loop and call unlock/lock during
* every iteration - otherwise the system will remain locked, * every iteration - otherwise the system will remain locked,
* no interrupts served, so USB not going through as well. * no interrupts served, so USB not going through as well.
* Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */ * Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */
osalThreadSuspendS(&(&USB_DRIVER)->epc[KBD_ENDPOINT]->in_state->thread); osalThreadSuspendS(&(&USB_DRIVER)->epc[KEYBOARD_IN_EPNUM]->in_state->thread);
} }
usbStartTransmitI(&USB_DRIVER, KBD_ENDPOINT, (uint8_t *)report, KBD_EPSIZE); usbStartTransmitI(&USB_DRIVER, KEYBOARD_IN_EPNUM, (uint8_t *)report, KEYBOARD_EPSIZE);
osalSysUnlock(); osalSysUnlock();
} }
keyboard_report_sent = *report; keyboard_report_sent = *report;
@ -1174,7 +723,7 @@ void send_mouse(report_mouse_t *report) {
*/ */
osalSysLock(); osalSysLock();
usbStartTransmitI(&USB_DRIVER, MOUSE_ENDPOINT, (uint8_t *)report, sizeof(report_mouse_t)); usbStartTransmitI(&USB_DRIVER, MOUSE_IN_EPNUM, (uint8_t *)report, sizeof(report_mouse_t));
osalSysUnlock(); osalSysUnlock();
} }
@ -1210,7 +759,7 @@ static void send_extra_report(uint8_t report_id, uint16_t data) {
.usage = data .usage = data
}; };
usbStartTransmitI(&USB_DRIVER, EXTRA_ENDPOINT, (uint8_t *)&report, sizeof(report_extra_t)); usbStartTransmitI(&USB_DRIVER, EXTRAKEY_IN_EPNUM, (uint8_t *)&report, sizeof(report_extra_t));
osalSysUnlock(); osalSysUnlock();
} }
@ -1238,125 +787,107 @@ void send_consumer(uint16_t data) {
#ifdef CONSOLE_ENABLE #ifdef CONSOLE_ENABLE
/* console IN callback hander */ int8_t sendchar(uint8_t c) {
void console_in_cb(USBDriver *usbp, usbep_t ep) { // The previous implmentation had timeouts, but I think it's better to just slow down
(void)ep; /* should have ep == CONSOLE_ENDPOINT, so use that to save time/space */ // and make sure that everything is transferred, rather than dropping stuff
uint8_t *buf; return chnWrite(&drivers.console_driver.driver, &c, 1);
size_t n; }
osalSysLockFromISR(); // Just a dummy function for now, this could be exposed as a weak function
// Or connected to the actual QMK console
static void console_receive( uint8_t *data, uint8_t length ) {
(void)data;
(void)length;
}
/* rearm the timer */ void console_task(void) {
chVTSetI(&console_flush_timer, MS2ST(CONSOLE_FLUSH_MS), console_flush_cb, (void *)usbp); uint8_t buffer[CONSOLE_EPSIZE];
size_t size = 0;
do {
size_t size = chnReadTimeout(&drivers.console_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
if (size > 0) {
console_receive(buffer, size);
}
} while(size > 0);
}
/* Freeing the buffer just transmitted, if it was not a zero size packet.*/ #else /* CONSOLE_ENABLE */
if (usbp->epc[CONSOLE_ENDPOINT]->in_state->txsize > 0U) { int8_t sendchar(uint8_t c) {
obqReleaseEmptyBufferI(&console_buf_queue); (void)c;
} return 0;
}
#endif /* CONSOLE_ENABLE */
/* Checking if there is a buffer ready for transmission.*/ void sendchar_pf(void *p, char c) {
buf = obqGetFullBufferI(&console_buf_queue, &n); (void)p;
sendchar((uint8_t)c);
}
if (buf != NULL) { #ifdef RAW_ENABLE
/* The endpoint cannot be busy, we are in the context of the callback, void raw_hid_send( uint8_t *data, uint8_t length ) {
so it is safe to transmit without a check.*/ // TODO: implement variable size packet
/* Should have n == CONSOLE_EPSIZE; check it? */ if ( length != RAW_EPSIZE )
usbStartTransmitI(usbp, CONSOLE_ENDPOINT, buf, CONSOLE_EPSIZE); {
} else { return;
/* Nothing to transmit.*/
}
osalSysUnlockFromISR(); }
chnWrite(&drivers.raw_driver.driver, data, length);
} }
/* Callback when data is inserted into the output queue __attribute__ ((weak))
* Called from a locked state */ void raw_hid_receive( uint8_t *data, uint8_t length ) {
void console_queue_onotify(io_buffers_queue_t *bqp) { // Users should #include "raw_hid.h" in their own code
size_t n; // and implement this function there. Leave this as weak linkage
USBDriver *usbp = bqGetLinkX(bqp); // so users can opt to not handle data coming in.
}
if(usbGetDriverStateI(usbp) != USB_ACTIVE)
return;
/* Checking if there is already a transaction ongoing on the endpoint.*/ void raw_hid_task(void) {
if (!usbGetTransmitStatusI(usbp, CONSOLE_ENDPOINT)) { uint8_t buffer[RAW_EPSIZE];
/* Trying to get a full buffer.*/ size_t size = 0;
uint8_t *buf = obqGetFullBufferI(&console_buf_queue, &n); do {
if (buf != NULL) { size_t size = chnReadTimeout(&drivers.raw_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
/* Buffer found, starting a new transaction.*/ if (size > 0) {
/* Should have n == CONSOLE_EPSIZE; check this? */ raw_hid_receive(buffer, size);
usbStartTransmitI(usbp, CONSOLE_ENDPOINT, buf, CONSOLE_EPSIZE);
} }
} } while(size > 0);
} }
/* Flush timer code #endif
* callback (called from ISR, unlocked state) */
static void console_flush_cb(void *arg) {
USBDriver *usbp = (USBDriver *)arg;
osalSysLockFromISR();
/* check that the states of things are as they're supposed to */ #ifdef MIDI_ENABLE
if(usbGetDriverStateI(usbp) != USB_ACTIVE) {
/* rearm the timer */
chVTSetI(&console_flush_timer, MS2ST(CONSOLE_FLUSH_MS), console_flush_cb, (void *)usbp);
osalSysUnlockFromISR();
return;
}
/* If there is already a transaction ongoing then another one cannot be void send_midi_packet(MIDI_EventPacket_t* event) {
started.*/ chnWrite(&drivers.midi_driver.driver, (uint8_t*)event, sizeof(MIDI_EventPacket_t));
if (usbGetTransmitStatusI(usbp, CONSOLE_ENDPOINT)) { }
/* rearm the timer */
chVTSetI(&console_flush_timer, MS2ST(CONSOLE_FLUSH_MS), console_flush_cb, (void *)usbp);
osalSysUnlockFromISR();
return;
}
/* Checking if there only a buffer partially filled, if so then it is bool recv_midi_packet(MIDI_EventPacket_t* const event) {
enforced in the queue and transmitted.*/ size_t size = chnReadTimeout(&drivers.midi_driver.driver, (uint8_t*)event, sizeof(MIDI_EventPacket_t), TIME_IMMEDIATE);
if(obqTryFlushI(&console_buf_queue)) { return size == sizeof(MIDI_EventPacket_t);
size_t n,i; }
uint8_t *buf = obqGetFullBufferI(&console_buf_queue, &n);
osalDbgAssert(buf != NULL, "queue is empty"); #endif
/* zero the rest of the buffer (buf should point to allocated space) */ #ifdef VIRTSER_ENABLE
for(i=n; i<CONSOLE_EPSIZE; i++)
buf[i]=0;
usbStartTransmitI(usbp, CONSOLE_ENDPOINT, buf, CONSOLE_EPSIZE);
}
/* rearm the timer */ void virtser_send(const uint8_t byte) {
chVTSetI(&console_flush_timer, MS2ST(CONSOLE_FLUSH_MS), console_flush_cb, (void *)usbp); chnWrite(&drivers.serial_driver.driver, &byte, 1);
osalSysUnlockFromISR();
} }
__attribute__ ((weak))
int8_t sendchar(uint8_t c) { void virtser_recv(uint8_t c)
osalSysLock(); {
if(usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) { // Ignore by default
osalSysUnlock();
return 0;
}
osalSysUnlock();
/* Timeout after 100us if the queue is full.
* Increase this timeout if too much stuff is getting
* dropped (i.e. the buffer is getting full too fast
* for USB/HIDRAW to dequeue). Another possibility
* for fixing this kind of thing is to increase
* CONSOLE_QUEUE_CAPACITY. */
return(obqPutTimeout(&console_buf_queue, c, US2ST(100)));
} }
#else /* CONSOLE_ENABLE */ void virtser_task(void) {
int8_t sendchar(uint8_t c) { uint8_t numBytesReceived = 0;
(void)c; uint8_t buffer[16];
return 0; do {
numBytesReceived = chnReadTimeout(&drivers.serial_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
for (int i=0;i<numBytesReceived;i++) {
virtser_recv(buffer[i]);
}
} while (numBytesReceived > 0);
} }
#endif /* CONSOLE_ENABLE */
void sendchar_pf(void *p, char c) { #endif
(void)p;
sendchar((uint8_t)c);
}

34
tmk_core/protocol/chibios/usb_main.h
Unescape View File

@ -41,20 +41,6 @@ void init_usb_driver(USBDriver *usbp);
* --------------- * ---------------
*/ */
/* main keyboard (6kro) */
#define KBD_INTERFACE 0
#define KBD_ENDPOINT 1
#define KBD_EPSIZE 8
#define KBD_REPORT_KEYS (KBD_EPSIZE - 2)
/* secondary keyboard */
#ifdef NKRO_ENABLE
#define NKRO_INTERFACE 4
#define NKRO_ENDPOINT 5
#define NKRO_EPSIZE 16
#define NKRO_REPORT_KEYS (NKRO_EPSIZE - 1)
#endif
/* extern report_keyboard_t keyboard_report_sent; */ /* extern report_keyboard_t keyboard_report_sent; */
/* keyboard IN request callback handler */ /* keyboard IN request callback handler */
@ -75,10 +61,6 @@ void nkro_in_cb(USBDriver *usbp, usbep_t ep);
#ifdef MOUSE_ENABLE #ifdef MOUSE_ENABLE
#define MOUSE_INTERFACE 1
#define MOUSE_ENDPOINT 2
#define MOUSE_EPSIZE 8
/* mouse IN request callback handler */ /* mouse IN request callback handler */
void mouse_in_cb(USBDriver *usbp, usbep_t ep); void mouse_in_cb(USBDriver *usbp, usbep_t ep);
#endif /* MOUSE_ENABLE */ #endif /* MOUSE_ENABLE */
@ -90,10 +72,6 @@ void mouse_in_cb(USBDriver *usbp, usbep_t ep);
#ifdef EXTRAKEY_ENABLE #ifdef EXTRAKEY_ENABLE
#define EXTRA_INTERFACE 3
#define EXTRA_ENDPOINT 4
#define EXTRA_EPSIZE 8
/* extrakey IN request callback handler */ /* extrakey IN request callback handler */
void extra_in_cb(USBDriver *usbp, usbep_t ep); void extra_in_cb(USBDriver *usbp, usbep_t ep);
@ -111,24 +89,12 @@ typedef struct {
#ifdef CONSOLE_ENABLE #ifdef CONSOLE_ENABLE
#define CONSOLE_INTERFACE 2
#define CONSOLE_ENDPOINT 3
#define CONSOLE_EPSIZE 16
/* Number of IN reports that can be stored inside the output queue */
#define CONSOLE_QUEUE_CAPACITY 4
/* Console flush time */
#define CONSOLE_FLUSH_MS 50
/* Putchar over the USB console */ /* Putchar over the USB console */
int8_t sendchar(uint8_t c); int8_t sendchar(uint8_t c);
/* Flush output (send everything immediately) */ /* Flush output (send everything immediately) */
void console_flush_output(void); void console_flush_output(void);
/* console IN request callback handler */
void console_in_cb(USBDriver *usbp, usbep_t ep);
#endif /* CONSOLE_ENABLE */ #endif /* CONSOLE_ENABLE */
void sendchar_pf(void *p, char c); void sendchar_pf(void *p, char c);

2
tmk_core/protocol/lufa.mk
Unescape View File

@ -15,7 +15,7 @@ else
endif endif
LUFA_SRC = lufa.c \ LUFA_SRC = lufa.c \
descriptor.c \ usb_descriptor.c \
outputselect.c \ outputselect.c \
$(LUFA_SRC_USB) $(LUFA_SRC_USB)

338
tmk_core/protocol/lufa/lufa.c
Unescape View File

@ -49,7 +49,7 @@
#endif #endif
#include "suspend.h" #include "suspend.h"
#include "descriptor.h" #include "usb_descriptor.h"
#include "lufa.h" #include "lufa.h"
#include "quantum.h" #include "quantum.h"
#include <util/atomic.h> #include <util/atomic.h>
@ -83,7 +83,7 @@
#endif #endif
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
#include "sysex_tools.h" #include "qmk_midi.h"
#endif #endif
#ifdef RAW_ENABLE #ifdef RAW_ENABLE
@ -97,12 +97,6 @@ static uint8_t keyboard_led_stats = 0;
static report_keyboard_t keyboard_report_sent; static report_keyboard_t keyboard_report_sent;
#ifdef MIDI_ENABLE
static void usb_send_func(MidiDevice * device, uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2);
static void usb_get_midi(MidiDevice * device);
static void midi_usb_init(MidiDevice * device);
#endif
/* Host driver */ /* Host driver */
static uint8_t keyboard_leds(void); static uint8_t keyboard_leds(void);
static void send_keyboard(report_keyboard_t *report); static void send_keyboard(report_keyboard_t *report);
@ -115,48 +109,8 @@ host_driver_t lufa_driver = {
send_mouse, send_mouse,
send_system, send_system,
send_consumer, send_consumer,
#ifdef MIDI_ENABLE
usb_send_func,
usb_get_midi,
midi_usb_init
#endif
};
/*******************************************************************************
* MIDI
******************************************************************************/
#ifdef MIDI_ENABLE
USB_ClassInfo_MIDI_Device_t USB_MIDI_Interface =
{
.Config =
{
.StreamingInterfaceNumber = AS_INTERFACE,
.DataINEndpoint =
{
.Address = MIDI_STREAM_IN_EPADDR,
.Size = MIDI_STREAM_EPSIZE,
.Banks = 1,
},
.DataOUTEndpoint =
{
.Address = MIDI_STREAM_OUT_EPADDR,
.Size = MIDI_STREAM_EPSIZE,
.Banks = 1,
},
},
}; };
#define SYSEX_START_OR_CONT 0x40
#define SYSEX_ENDS_IN_1 0x50
#define SYSEX_ENDS_IN_2 0x60
#define SYSEX_ENDS_IN_3 0x70
#define SYS_COMMON_1 0x50
#define SYS_COMMON_2 0x20
#define SYS_COMMON_3 0x30
#endif
#ifdef VIRTSER_ENABLE #ifdef VIRTSER_ENABLE
USB_ClassInfo_CDC_Device_t cdc_device = USB_ClassInfo_CDC_Device_t cdc_device =
{ {
@ -853,170 +807,32 @@ int8_t sendchar(uint8_t c)
******************************************************************************/ ******************************************************************************/
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
static void usb_send_func(MidiDevice * device, uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2) { USB_ClassInfo_MIDI_Device_t USB_MIDI_Interface =
MIDI_EventPacket_t event;
event.Data1 = byte0;
event.Data2 = byte1;
event.Data3 = byte2;
uint8_t cable = 0;
// Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);
//if the length is undefined we assume it is a SYSEX message
if (midi_packet_length(byte0) == UNDEFINED) {
switch(cnt) {
case 3:
if (byte2 == SYSEX_END)
event.Event = MIDI_EVENT(cable, SYSEX_ENDS_IN_3);
else
event.Event = MIDI_EVENT(cable, SYSEX_START_OR_CONT);
break;
case 2:
if (byte1 == SYSEX_END)
event.Event = MIDI_EVENT(cable, SYSEX_ENDS_IN_2);
else
event.Event = MIDI_EVENT(cable, SYSEX_START_OR_CONT);
break;
case 1:
if (byte0 == SYSEX_END)
event.Event = MIDI_EVENT(cable, SYSEX_ENDS_IN_1);
else
event.Event = MIDI_EVENT(cable, SYSEX_START_OR_CONT);
break;
default:
return; //invalid cnt
}
} else {
//deal with 'system common' messages
//TODO are there any more?
switch(byte0 & 0xF0){
case MIDI_SONGPOSITION:
event.Event = MIDI_EVENT(cable, SYS_COMMON_3);
break;
case MIDI_SONGSELECT:
case MIDI_TC_QUARTERFRAME:
event.Event = MIDI_EVENT(cable, SYS_COMMON_2);
break;
default:
event.Event = MIDI_EVENT(cable, byte0);
break;
}
}
// Endpoint_Write_Stream_LE(&event, sizeof(event), NULL);
// Endpoint_ClearIN();
MIDI_Device_SendEventPacket(&USB_MIDI_Interface, &event);
MIDI_Device_Flush(&USB_MIDI_Interface);
MIDI_Device_USBTask(&USB_MIDI_Interface);
USB_USBTask();
}
static void usb_get_midi(MidiDevice * device) {
MIDI_EventPacket_t event;
while (MIDI_Device_ReceiveEventPacket(&USB_MIDI_Interface, &event)) {
midi_packet_length_t length = midi_packet_length(event.Data1);
uint8_t input[3];
input[0] = event.Data1;
input[1] = event.Data2;
input[2] = event.Data3;
if (length == UNDEFINED) {
//sysex
if (event.Event == MIDI_EVENT(0, SYSEX_START_OR_CONT) || event.Event == MIDI_EVENT(0, SYSEX_ENDS_IN_3)) {
length = 3;
} else if (event.Event == MIDI_EVENT(0, SYSEX_ENDS_IN_2)) {
length = 2;
} else if(event.Event == MIDI_EVENT(0, SYSEX_ENDS_IN_1)) {
length = 1;
} else {
//XXX what to do?
}
}
//pass the data to the device input function
if (length != UNDEFINED)
midi_device_input(device, length, input);
}
MIDI_Device_USBTask(&USB_MIDI_Interface);
USB_USBTask();
}
static void midi_usb_init(MidiDevice * device){
midi_device_init(device);
midi_device_set_send_func(device, usb_send_func);
midi_device_set_pre_input_process_func(device, usb_get_midi);
// SetupHardware();
sei();
}
void MIDI_Task(void)
{ {
.Config =
/* Device must be connected and configured for the task to run */ {
dprint("in MIDI_TASK\n"); .StreamingInterfaceNumber = AS_INTERFACE,
if (USB_DeviceState != DEVICE_STATE_Configured) .DataINEndpoint =
return;
dprint("continuing in MIDI_TASK\n");
Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPADDR);
if (Endpoint_IsINReady())
{ {
.Address = MIDI_STREAM_IN_EPADDR,
dprint("Endpoint is ready\n"); .Size = MIDI_STREAM_EPSIZE,
.Banks = 1,
uint8_t MIDICommand = 0; },
uint8_t MIDIPitch; .DataOUTEndpoint =
/* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */
uint8_t Channel = MIDI_CHANNEL(1);
MIDICommand = MIDI_COMMAND_NOTE_ON;
MIDIPitch = 0x3E;
/* Check if a MIDI command is to be sent */
if (MIDICommand)
{
dprint("Command exists\n");
MIDI_EventPacket_t MIDIEvent = (MIDI_EventPacket_t)
{
.Event = MIDI_EVENT(0, MIDICommand),
.Data1 = MIDICommand | Channel,
.Data2 = MIDIPitch,
.Data3 = MIDI_STANDARD_VELOCITY,
};
/* Write the MIDI event packet to the endpoint */
Endpoint_Write_Stream_LE(&MIDIEvent, sizeof(MIDIEvent), NULL);
/* Send the data in the endpoint to the host */
Endpoint_ClearIN();
}
}
/* Select the MIDI OUT stream */
Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPADDR);
/* Check if a MIDI command has been received */
if (Endpoint_IsOUTReceived())
{ {
MIDI_EventPacket_t MIDIEvent; .Address = MIDI_STREAM_OUT_EPADDR,
.Size = MIDI_STREAM_EPSIZE,
.Banks = 1,
},
},
};
/* Read the MIDI event packet from the endpoint */ void send_midi_packet(MIDI_EventPacket_t* event) {
Endpoint_Read_Stream_LE(&MIDIEvent, sizeof(MIDIEvent), NULL); MIDI_Device_SendEventPacket(&USB_MIDI_Interface, event);
}
/* If the endpoint is now empty, clear the bank */ bool recv_midi_packet(MIDI_EventPacket_t* const event) {
if (!(Endpoint_BytesInEndpoint())) return MIDI_Device_ReceiveEventPacket(&USB_MIDI_Interface, event);
{
/* Clear the endpoint ready for new packet */
Endpoint_ClearOUT();
}
}
} }
#endif #endif
@ -1105,26 +921,6 @@ static void setup_usb(void)
print_set_sendchar(sendchar); print_set_sendchar(sendchar);
} }
#ifdef MIDI_ENABLE
void fallthrough_callback(MidiDevice * device,
uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2);
void cc_callback(MidiDevice * device,
uint8_t chan, uint8_t num, uint8_t val);
void sysex_callback(MidiDevice * device,
uint16_t start, uint8_t length, uint8_t * data);
void setup_midi(void)
{
#ifdef MIDI_ADVANCED
midi_init();
#endif
midi_device_init(&midi_device);
midi_device_set_send_func(&midi_device, usb_send_func);
midi_device_set_pre_input_process_func(&midi_device, usb_get_midi);
}
#endif
int main(void) __attribute__ ((weak)); int main(void) __attribute__ ((weak));
int main(void) int main(void)
{ {
@ -1137,18 +933,6 @@ int main(void)
setup_usb(); setup_usb();
sei(); sei();
#ifdef MIDI_ENABLE
midi_register_fallthrough_callback(&midi_device, fallthrough_callback);
midi_register_cc_callback(&midi_device, cc_callback);
midi_register_sysex_callback(&midi_device, sysex_callback);
// init_notes();
// midi_send_cc(&midi_device, 0, 1, 2);
// midi_send_cc(&midi_device, 15, 1, 0);
// midi_send_noteon(&midi_device, 0, 64, 127);
// midi_send_noteoff(&midi_device, 0, 64, 127);
#endif
#if defined(MODULE_ADAFRUIT_EZKEY) || defined(MODULE_RN42) #if defined(MODULE_ADAFRUIT_EZKEY) || defined(MODULE_RN42)
serial_init(); serial_init();
#endif #endif
@ -1193,10 +977,7 @@ int main(void)
keyboard_task(); keyboard_task();
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
midi_device_process(&midi_device); MIDI_Device_USBTask(&USB_MIDI_Interface);
#ifdef MIDI_ADVANCED
midi_task();
#endif
#endif #endif
#if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE) #if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE)
@ -1223,71 +1004,10 @@ int main(void)
} }
} }
#ifdef MIDI_ENABLE uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
void fallthrough_callback(MidiDevice * device, const uint16_t wIndex,
uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2){ const void** const DescriptorAddress)
{
#ifdef AUDIO_ENABLE return get_usb_descriptor(wValue, wIndex, DescriptorAddress);
if (cnt == 3) {
switch (byte0 & 0xF0) {
case MIDI_NOTEON:
play_note(((double)261.6)*pow(2.0, -4.0)*pow(2.0,(byte1 & 0x7F)/12.0), (byte2 & 0x7F) / 8);
break;
case MIDI_NOTEOFF:
stop_note(((double)261.6)*pow(2.0, -4.0)*pow(2.0,(byte1 & 0x7F)/12.0));
break;
}
}
if (byte0 == MIDI_STOP) {
stop_all_notes();
}
#endif
}
void cc_callback(MidiDevice * device,
uint8_t chan, uint8_t num, uint8_t val) {
//sending it back on the next channel
// midi_send_cc(device, (chan + 1) % 16, num, val);
}
#ifdef API_SYSEX_ENABLE
uint8_t midi_buffer[MIDI_SYSEX_BUFFER] = {0};
#endif
void sysex_callback(MidiDevice * device, uint16_t start, uint8_t length, uint8_t * data) {
#ifdef API_SYSEX_ENABLE
// SEND_STRING("\n");
// send_word(start);
// SEND_STRING(": ");
// Don't store the header
int16_t pos = start - 4;
for (uint8_t place = 0; place < length; place++) {
// send_byte(*data);
if (pos >= 0) {
if (*data == 0xF7) {
// SEND_STRING("\nRD: ");
// for (uint8_t i = 0; i < start + place + 1; i++){
// send_byte(midi_buffer[i]);
// SEND_STRING(" ");
// }
const unsigned decoded_length = sysex_decoded_length(pos);
uint8_t decoded[API_SYSEX_MAX_SIZE];
sysex_decode(decoded, midi_buffer, pos);
process_api(decoded_length, decoded);
return;
}
else if (pos >= MIDI_SYSEX_BUFFER) {
return;
}
midi_buffer[pos] = *data;
}
// SEND_STRING(" ");
data++;
pos++;
}
#endif
} }
#endif

8
tmk_core/protocol/lufa/lufa.h
Unescape View File

@ -48,9 +48,6 @@
#include <LUFA/Version.h> #include <LUFA/Version.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include "host.h" #include "host.h"
#ifdef MIDI_ENABLE
#include "process_midi.h"
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -67,11 +64,6 @@ typedef struct {
uint16_t usage; uint16_t usage;
} __attribute__ ((packed)) report_extra_t; } __attribute__ ((packed)) report_extra_t;
#ifdef MIDI_ENABLE
void MIDI_Task(void);
MidiDevice midi_device;
#endif
#ifdef API_ENABLE #ifdef API_ENABLE
#include "api.h" #include "api.h"
#endif #endif

1
tmk_core/protocol/midi.mk
Unescape View File

@ -5,6 +5,7 @@ SRC += midi.c \
bytequeue/bytequeue.c \ bytequeue/bytequeue.c \
bytequeue/interrupt_setting.c \ bytequeue/interrupt_setting.c \
sysex_tools.c \ sysex_tools.c \
qmk_midi.c \
$(LUFA_SRC_USBCLASS) $(LUFA_SRC_USBCLASS)
VPATH += $(TMK_PATH)/$(MIDI_DIR) VPATH += $(TMK_PATH)/$(MIDI_DIR)

13
tmk_core/protocol/midi/bytequeue/interrupt_setting.c
Unescape View File

@ -22,6 +22,7 @@
//implementations of the typedef and these functions //implementations of the typedef and these functions
#include "interrupt_setting.h" #include "interrupt_setting.h"
#if defined(__AVR__)
#include <avr/interrupt.h> #include <avr/interrupt.h>
interrupt_setting_t store_and_clear_interrupt(void) { interrupt_setting_t store_and_clear_interrupt(void) {
@ -33,4 +34,16 @@ interrupt_setting_t store_and_clear_interrupt(void) {
void restore_interrupt_setting(interrupt_setting_t setting) { void restore_interrupt_setting(interrupt_setting_t setting) {
SREG = setting; SREG = setting;
} }
#elif defined(__arm__)
#include "ch.h"
interrupt_setting_t store_and_clear_interrupt(void) {
chSysLock();
return 0;
}
void restore_interrupt_setting(interrupt_setting_t setting) {
chSysUnlock();
}
#endif

184
tmk_core/protocol/midi/qmk_midi.c
Unescape View File

@ -0,0 +1,184 @@
#include <LUFA/Drivers/USB/USB.h>
#include "qmk_midi.h"
#include "sysex_tools.h"
#include "midi.h"
#include "usb_descriptor.h"
#include "process_midi.h"
#if API_SYSEX_ENABLE
#include "api.h"
#endif
/*******************************************************************************
* MIDI
******************************************************************************/
MidiDevice midi_device;
#define SYSEX_START_OR_CONT 0x40
#define SYSEX_ENDS_IN_1 0x50
#define SYSEX_ENDS_IN_2 0x60
#define SYSEX_ENDS_IN_3 0x70
#define SYS_COMMON_1 0x50
#define SYS_COMMON_2 0x20
#define SYS_COMMON_3 0x30
static void usb_send_func(MidiDevice * device, uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2) {
MIDI_EventPacket_t event;
event.Data1 = byte0;
event.Data2 = byte1;
event.Data3 = byte2;
uint8_t cable = 0;
//if the length is undefined we assume it is a SYSEX message
if (midi_packet_length(byte0) == UNDEFINED) {
switch(cnt) {
case 3:
if (byte2 == SYSEX_END)
event.Event = MIDI_EVENT(cable, SYSEX_ENDS_IN_3);
else
event.Event = MIDI_EVENT(cable, SYSEX_START_OR_CONT);
break;
case 2:
if (byte1 == SYSEX_END)
event.Event = MIDI_EVENT(cable, SYSEX_ENDS_IN_2);
else
event.Event = MIDI_EVENT(cable, SYSEX_START_OR_CONT);
break;
case 1:
if (byte0 == SYSEX_END)
event.Event = MIDI_EVENT(cable, SYSEX_ENDS_IN_1);
else
event.Event = MIDI_EVENT(cable, SYSEX_START_OR_CONT);
break;
default:
return; //invalid cnt
}
} else {
//deal with 'system common' messages
//TODO are there any more?
switch(byte0 & 0xF0){
case MIDI_SONGPOSITION:
event.Event = MIDI_EVENT(cable, SYS_COMMON_3);
break;
case MIDI_SONGSELECT:
case MIDI_TC_QUARTERFRAME:
event.Event = MIDI_EVENT(cable, SYS_COMMON_2);
break;
default:
event.Event = MIDI_EVENT(cable, byte0);
break;
}
}
send_midi_packet(&event);
}
static void usb_get_midi(MidiDevice * device) {
MIDI_EventPacket_t event;
while (recv_midi_packet(&event)) {
midi_packet_length_t length = midi_packet_length(event.Data1);
uint8_t input[3];
input[0] = event.Data1;
input[1] = event.Data2;
input[2] = event.Data3;
if (length == UNDEFINED) {
//sysex
if (event.Event == MIDI_EVENT(0, SYSEX_START_OR_CONT) || event.Event == MIDI_EVENT(0, SYSEX_ENDS_IN_3)) {
length = 3;
} else if (event.Event == MIDI_EVENT(0, SYSEX_ENDS_IN_2)) {
length = 2;
} else if(event.Event == MIDI_EVENT(0, SYSEX_ENDS_IN_1)) {
length = 1;
} else {
//XXX what to do?
}
}
//pass the data to the device input function
if (length != UNDEFINED)
midi_device_input(device, length, input);
}
}
static void fallthrough_callback(MidiDevice * device,
uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2){
#ifdef AUDIO_ENABLE
if (cnt == 3) {
switch (byte0 & 0xF0) {
case MIDI_NOTEON:
play_note(((double)261.6)*pow(2.0, -4.0)*pow(2.0,(byte1 & 0x7F)/12.0), (byte2 & 0x7F) / 8);
break;
case MIDI_NOTEOFF:
stop_note(((double)261.6)*pow(2.0, -4.0)*pow(2.0,(byte1 & 0x7F)/12.0));
break;
}
}
if (byte0 == MIDI_STOP) {
stop_all_notes();
}
#endif
}
static void cc_callback(MidiDevice * device,
uint8_t chan, uint8_t num, uint8_t val) {
//sending it back on the next channel
// midi_send_cc(device, (chan + 1) % 16, num, val);
}
#ifdef API_SYSEX_ENABLE
uint8_t midi_buffer[MIDI_SYSEX_BUFFER] = {0};
static void sysex_callback(MidiDevice * device, uint16_t start, uint8_t length, uint8_t * data) {
// SEND_STRING("\n");
// send_word(start);
// SEND_STRING(": ");
// Don't store the header
int16_t pos = start - 4;
for (uint8_t place = 0; place < length; place++) {
// send_byte(*data);
if (pos >= 0) {
if (*data == 0xF7) {
// SEND_STRING("\nRD: ");
// for (uint8_t i = 0; i < start + place + 1; i++){
// send_byte(midi_buffer[i]);
// SEND_STRING(" ");
// }
const unsigned decoded_length = sysex_decoded_length(pos);
uint8_t decoded[API_SYSEX_MAX_SIZE];
sysex_decode(decoded, midi_buffer, pos);
process_api(decoded_length, decoded);
return;
}
else if (pos >= MIDI_SYSEX_BUFFER) {
return;
}
midi_buffer[pos] = *data;
}
// SEND_STRING(" ");
data++;
pos++;
}
}
#endif
void midi_init(void);
void setup_midi(void)
{
#ifdef MIDI_ADVANCED
midi_init();
#endif
midi_device_init(&midi_device);
midi_device_set_send_func(&midi_device, usb_send_func);
midi_device_set_pre_input_process_func(&midi_device, usb_get_midi);
midi_register_fallthrough_callback(&midi_device, fallthrough_callback);
midi_register_cc_callback(&midi_device, cc_callback);
#ifdef API_SYSEX_ENABLE
midi_register_sysex_callback(&midi_device, sysex_callback);
#endif
}

9
tmk_core/protocol/midi/qmk_midi.h
Unescape View File

@ -0,0 +1,9 @@
#pragma once
#ifdef MIDI_ENABLE
#include "midi.h"
extern MidiDevice midi_device;
void setup_midi(void);
void send_midi_packet(MIDI_EventPacket_t* event);
bool recv_midi_packet(MIDI_EventPacket_t* const event);
#endif

26
tmk_core/protocol/lufa/descriptor.c → tmk_core/protocol/usb_descriptor.c
Unescape View File

@ -38,7 +38,7 @@
#include "util.h" #include "util.h"
#include "report.h" #include "report.h"
#include "descriptor.h" #include "usb_descriptor.h"
#ifndef USB_MAX_POWER_CONSUMPTION #ifndef USB_MAX_POWER_CONSUMPTION
#define USB_MAX_POWER_CONSUMPTION 500 #define USB_MAX_POWER_CONSUMPTION 500
@ -571,6 +571,19 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
#endif #endif
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
.Audio_Interface_Association =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
.FirstInterfaceIndex = AC_INTERFACE,
.TotalInterfaces = 2,
.Class = AUDIO_CSCP_AudioClass,
.SubClass = AUDIO_CSCP_ControlSubclass,
.Protocol = AUDIO_CSCP_ControlProtocol,
.IADStrIndex = NO_DESCRIPTOR,
},
.Audio_ControlInterface = .Audio_ControlInterface =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
@ -622,8 +635,9 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.AudioSpecification = VERSION_BCD(1,0,0), .AudioSpecification = VERSION_BCD(1,0,0),
.TotalLength = (sizeof(USB_Descriptor_Configuration_t) - .TotalLength = offsetof(USB_Descriptor_Configuration_t, MIDI_Out_Jack_Endpoint_SPC)
offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC)) + sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t)
- offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC)
}, },
.MIDI_In_Jack_Emb = .MIDI_In_Jack_Emb =
@ -879,9 +893,9 @@ const USB_Descriptor_String_t PROGMEM SerialNumberString =
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the * is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
* USB host. * USB host.
*/ */
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, uint16_t get_usb_descriptor(const uint16_t wValue,
const uint16_t wIndex, const uint16_t wIndex,
const void** const DescriptorAddress) const void** const DescriptorAddress)
{ {
const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorIndex = (wValue & 0xFF); const uint8_t DescriptorIndex = (wValue & 0xFF);

65
tmk_core/protocol/lufa/descriptor.h → tmk_core/protocol/usb_descriptor.h
Unescape View File

@ -45,8 +45,9 @@
#define _DESCRIPTORS_H_ #define _DESCRIPTORS_H_
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include <avr/pgmspace.h> #ifdef PROTOCOL_CHIBIOS
#include "hal.h"
#endif
typedef struct typedef struct
{ {
@ -95,25 +96,26 @@ typedef struct
#endif #endif
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
// MIDI Audio Control Interface USB_Descriptor_Interface_Association_t Audio_Interface_Association;
USB_Descriptor_Interface_t Audio_ControlInterface; // MIDI Audio Control Interface
USB_Audio_Descriptor_Interface_AC_t Audio_ControlInterface_SPC; USB_Descriptor_Interface_t Audio_ControlInterface;
USB_Audio_Descriptor_Interface_AC_t Audio_ControlInterface_SPC;
// MIDI Audio Streaming Interface
USB_Descriptor_Interface_t Audio_StreamInterface; // MIDI Audio Streaming Interface
USB_MIDI_Descriptor_AudioInterface_AS_t Audio_StreamInterface_SPC; USB_Descriptor_Interface_t Audio_StreamInterface;
USB_MIDI_Descriptor_InputJack_t MIDI_In_Jack_Emb; USB_MIDI_Descriptor_AudioInterface_AS_t Audio_StreamInterface_SPC;
USB_MIDI_Descriptor_InputJack_t MIDI_In_Jack_Ext; USB_MIDI_Descriptor_InputJack_t MIDI_In_Jack_Emb;
USB_MIDI_Descriptor_OutputJack_t MIDI_Out_Jack_Emb; USB_MIDI_Descriptor_InputJack_t MIDI_In_Jack_Ext;
USB_MIDI_Descriptor_OutputJack_t MIDI_Out_Jack_Ext; USB_MIDI_Descriptor_OutputJack_t MIDI_Out_Jack_Emb;
USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_In_Jack_Endpoint; USB_MIDI_Descriptor_OutputJack_t MIDI_Out_Jack_Ext;
USB_MIDI_Descriptor_Jack_Endpoint_t MIDI_In_Jack_Endpoint_SPC; USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_In_Jack_Endpoint;
USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_Out_Jack_Endpoint; USB_MIDI_Descriptor_Jack_Endpoint_t MIDI_In_Jack_Endpoint_SPC;
USB_MIDI_Descriptor_Jack_Endpoint_t MIDI_Out_Jack_Endpoint_SPC; USB_Audio_Descriptor_StreamEndpoint_Std_t MIDI_Out_Jack_Endpoint;
USB_MIDI_Descriptor_Jack_Endpoint_t MIDI_Out_Jack_Endpoint_SPC;
#endif #endif
#ifdef VIRTSER_ENABLE #ifdef VIRTSER_ENABLE
USB_Descriptor_Interface_Association_t CDC_Interface_Association; USB_Descriptor_Interface_Association_t CDC_Interface_Association;
// CDC Control Interface // CDC Control Interface
USB_Descriptor_Interface_t CDC_CCI_Interface; USB_Descriptor_Interface_t CDC_CCI_Interface;
@ -208,8 +210,14 @@ typedef struct
#ifdef CONSOLE_ENABLE #ifdef CONSOLE_ENABLE
# define CONSOLE_IN_EPNUM (RAW_OUT_EPNUM + 1) # define CONSOLE_IN_EPNUM (RAW_OUT_EPNUM + 1)
//# define CONSOLE_OUT_EPNUM (RAW_OUT_EPNUM + 2) #ifdef PROTOCOL_CHIBIOS
// ChibiOS has enough memory and descriptor to actually enable the endpoint
// It could use the same endpoint numbers, as that's supported by ChibiOS
// But the QMK code currently assumes that the endpoint numbers are different
# define CONSOLE_OUT_EPNUM (RAW_OUT_EPNUM + 2)
#else
# define CONSOLE_OUT_EPNUM (RAW_OUT_EPNUM + 1) # define CONSOLE_OUT_EPNUM (RAW_OUT_EPNUM + 1)
#endif
#else #else
# define CONSOLE_OUT_EPNUM RAW_OUT_EPNUM # define CONSOLE_OUT_EPNUM RAW_OUT_EPNUM
#endif #endif
@ -241,27 +249,24 @@ typedef struct
# define CDC_OUT_EPNUM MIDI_STREAM_OUT_EPNUM # define CDC_OUT_EPNUM MIDI_STREAM_OUT_EPNUM
#endif #endif
#if (defined(__AVR_ATmega32U2__) && CDC_OUT_EPNUM > 4) || \ #if (defined(PROTOCOL_LUFA) && CDC_OUT_EPNUM > (ENDPOINT_TOTAL_ENDPOINTS - 1)) || \
(defined(__AVR_ATmega32U4__) && CDC_OUT_EPNUM > 6) (defined(PROTOCOL_CHIBIOS) && CDC_OUT_EPNUM > USB_MAX_ENDPOINTS)
# error "Endpoints are not available enough to support all functions. Remove some in Makefile.(MOUSEKEY, EXTRAKEY, CONSOLE, NKRO, MIDI, SERIAL)" # error "There are not enough available endpoints to support all functions. Remove some in the rules.mk file.(MOUSEKEY, EXTRAKEY, CONSOLE, NKRO, MIDI, SERIAL, STENO)"
#endif #endif
#define KEYBOARD_EPSIZE 8 #define KEYBOARD_EPSIZE 8
#define MOUSE_EPSIZE 8 #define MOUSE_EPSIZE 8
#define EXTRAKEY_EPSIZE 8 #define EXTRAKEY_EPSIZE 8
#define RAW_EPSIZE 32 #define RAW_EPSIZE 32
#define CONSOLE_EPSIZE 32 #define CONSOLE_EPSIZE 32
#define NKRO_EPSIZE 32 #define NKRO_EPSIZE 32
#define MIDI_STREAM_EPSIZE 64 #define MIDI_STREAM_EPSIZE 64
#define CDC_NOTIFICATION_EPSIZE 8 #define CDC_NOTIFICATION_EPSIZE 32
#define CDC_EPSIZE 16 #define CDC_EPSIZE 16
uint16_t get_usb_descriptor(const uint16_t wValue,
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex,
const uint16_t wIndex, const void** const DescriptorAddress);
const void** const DescriptorAddress)
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
/* new API */ /* new API */
#if LUFA_VERSION_INTEGER < 0x140302 #if LUFA_VERSION_INTEGER < 0x140302

7
tmk_core/rules.mk
Unescape View File

@ -370,13 +370,18 @@ show_path:
@echo SRC=$(SRC) @echo SRC=$(SRC)
@echo OBJ=$(OBJ) @echo OBJ=$(OBJ)
ifeq ($(CC),avr-gcc)
check-size: check-size:
$(eval MAX_SIZE=$(shell n=`avr-gcc -E -mmcu=$(MCU) $(CFLAGS) $(OPT_DEFS) tmk_core/common/avr/bootloader_size.c 2> /dev/null | perl -ne 'print "$&\n" if /(?<=AVR_SIZE: ).+/'`; echo $$(($$n)) || echo 0)) $(eval MAX_SIZE=$(shell n=`avr-gcc -E -mmcu=$(MCU) $(CFLAGS) $(OPT_DEFS) tmk_core/common/avr/bootloader_size.c 2> /dev/null | sed -ne '/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'`; echo $$(($$n)) || echo 0))
$(eval CURRENT_SIZE=$(shell if [ -f $(BUILD_DIR)/$(TARGET).hex ]; then $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(AWK) 'NR==2 {print $$4}'; else printf 0; fi)) $(eval CURRENT_SIZE=$(shell if [ -f $(BUILD_DIR)/$(TARGET).hex ]; then $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(AWK) 'NR==2 {print $$4}'; else printf 0; fi))
if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \ if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \
$(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \ $(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \
if [ $(CURRENT_SIZE) -gt $(MAX_SIZE) ]; then $(PRINT_WARNING_PLAIN); $(SILENT) || printf " * $(MSG_FILE_TOO_BIG)" ; else $(PRINT_OK); $(SILENT) || printf " * $(MSG_FILE_JUST_RIGHT)"; fi \ if [ $(CURRENT_SIZE) -gt $(MAX_SIZE) ]; then $(PRINT_WARNING_PLAIN); $(SILENT) || printf " * $(MSG_FILE_TOO_BIG)" ; else $(PRINT_OK); $(SILENT) || printf " * $(MSG_FILE_JUST_RIGHT)"; fi \
fi fi
else
check-size:
echo "(Firmware size check does not yet support $(MCU) microprocessors; skipping.)"
endif
# Create build directory # Create build directory
$(shell mkdir -p $(BUILD_DIR) 2>/dev/null) $(shell mkdir -p $(BUILD_DIR) 2>/dev/null)

Write Preview
Loading…
Cancel
Save