diff options
21 files changed, 1177 insertions, 64 deletions
| diff --git a/keyboards/converter/Makefile b/keyboards/converter/Makefile new file mode 100644 index 0000000000..4e2a6f00fd --- /dev/null +++ b/keyboards/converter/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED +	include ../../Makefile +endif
\ No newline at end of file diff --git a/keyboards/converter/converter.c b/keyboards/converter/converter.c new file mode 100644 index 0000000000..aa4bef63a9 --- /dev/null +++ b/keyboards/converter/converter.c @@ -0,0 +1 @@ +#include "converter.h"
\ No newline at end of file diff --git a/keyboards/converter/converter.h b/keyboards/converter/converter.h new file mode 100644 index 0000000000..7a4a4835e6 --- /dev/null +++ b/keyboards/converter/converter.h @@ -0,0 +1 @@ +#include "quantum.h"
\ No newline at end of file diff --git a/keyboards/converter/ibm_terminal/Makefile b/keyboards/converter/ibm_terminal/Makefile new file mode 100644 index 0000000000..191c6bb664 --- /dev/null +++ b/keyboards/converter/ibm_terminal/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED +	include ../../../Makefile +endif
\ No newline at end of file diff --git a/keyboards/converter/ibm_terminal/README b/keyboards/converter/ibm_terminal/README new file mode 100644 index 0000000000..6b7aff2c84 --- /dev/null +++ b/keyboards/converter/ibm_terminal/README @@ -0,0 +1,40 @@ +Keyboard converter for IBM terminal keyboard +============================================ + +This is a port of TMK's converter/terminal_usb to QMK. + +It supports PS/2 Scan Code Set 3 and runs on USB AVR chips such like PJRC Teensy. +I tested the converter on ATMega32U4 with 1392595(102keys) and 6110345(122keys). + +Source code: https://github.com/tmk/tmk_keyboard +Article: http://geekhack.org/index.php?topic=27272.0 + + +CONNECTION +---------- +Keyboard    ATMega32U4 +---------------------- +Data:       PD2 +Clock:      PD5 + +And VCC and GND, of course. See RESOURCE for keyboard connector pin assign. + + +BUILD +----- +$ git clone https://github.com/tmk/tmk_keyboard.git +$ cd converter/terminal_usb +$ make  + + +RESOURCE +-------- +Soarer's Converter: http://geekhack.org/index.php?topic=17458.0 +102keys(1392595): http://geekhack.org/index.php?topic=10737.0 +122keys(1390876): http://www.seasip.info/VintagePC/ibm_1390876.html +KbdBabel: http://www.kbdbabel.org/ +RJ45 Connector: http://www.kbdbabel.org/conn/kbd_connector_ibmterm.png +DIN Connector: http://www.kbdbabel.org/conn/kbd_connector_ibm3179_318x_319x.png +WinAVR: http://winavr.sourceforge.net/ + +EOF diff --git a/keyboards/converter/ibm_terminal/config.h b/keyboards/converter/ibm_terminal/config.h new file mode 100644 index 0000000000..4dd85f6983 --- /dev/null +++ b/keyboards/converter/ibm_terminal/config.h @@ -0,0 +1,138 @@ +/* +Copyright 2012 Jun Wako <[email protected]> +Copyright 2016 Priyadi Iman Nurcahyo <[email protected]> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program.  If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef CONFIG_H +#define CONFIG_H + + +#define VENDOR_ID       0xFEED +#define PRODUCT_ID      0x6535 +#define DEVICE_VER      0x0100 +#define MANUFACTURER    QMK +#define PRODUCT         IBM Terminal Keyboard +#define DESCRIPTION     USB converter for IBM Terminal Keyboard + + +/* matrix size */ +#define MATRIX_ROWS 17  // keycode bit: 3-0 +#define MATRIX_COLS 8   // keycode bit: 6-4 + + +/* legacy keymap support */ +#define USE_LEGACY_KEYMAP + + +/* key combination for command */ +#define IS_COMMAND() ( \ +    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT) | MOD_BIT(KC_RALT) | MOD_BIT(KC_RCTL)) \ +) + + +/*  + * PS/2 USART configuration for ATMega32U4 + */ +#ifdef PS2_USE_USART +/* XCK for clock line */ +#define PS2_CLOCK_PORT  PORTD +#define PS2_CLOCK_PIN   PIND +#define PS2_CLOCK_DDR   DDRD +#define PS2_CLOCK_BIT   5 +/* RXD for data line */ +#define PS2_DATA_PORT   PORTD +#define PS2_DATA_PIN    PIND +#define PS2_DATA_DDR    DDRD +#define PS2_DATA_BIT    2 + +/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */ +/* set DDR of CLOCK as input to be slave */ +#define PS2_USART_INIT() do {   \ +    PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT);   \ +    PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT);     \ +    UCSR1C = ((1 << UMSEL10) |  \ +              (3 << UPM10)   |  \ +              (0 << USBS1)   |  \ +              (3 << UCSZ10)  |  \ +              (0 << UCPOL1));   \ +    UCSR1A = 0;                 \ +    UBRR1H = 0;                 \ +    UBRR1L = 0;                 \ +} while (0) +#define PS2_USART_RX_INT_ON() do {  \ +    UCSR1B = ((1 << RXCIE1) |       \ +              (1 << RXEN1));        \ +} while (0) +#define PS2_USART_RX_POLL_ON() do { \ +    UCSR1B = (1 << RXEN1);          \ +} while (0) +#define PS2_USART_OFF() do {    \ +    UCSR1C = 0;                 \ +    UCSR1B &= ~((1 << RXEN1) |  \ +                (1 << TXEN1));  \ +} while (0) +#define PS2_USART_RX_READY      (UCSR1A & (1<<RXC1)) +#define PS2_USART_RX_DATA       UDR1 +#define PS2_USART_ERROR         (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1))) +#define PS2_USART_RX_VECT       USART1_RX_vect +#endif + + +/* + * PS/2 Interrupt configuration + */ +#ifdef PS2_USE_INT +/* uses INT1 for clock line(ATMega32U4) */ +#define PS2_CLOCK_PORT  PORTD +#define PS2_CLOCK_PIN   PIND +#define PS2_CLOCK_DDR   DDRD +#define PS2_CLOCK_BIT   1 + +#define PS2_DATA_PORT   PORTD +#define PS2_DATA_PIN    PIND +#define PS2_DATA_DDR    DDRD +#define PS2_DATA_BIT    0 + +#define PS2_INT_INIT()  do {    \ +    EICRA |= ((1<<ISC11) |      \ +              (0<<ISC10));      \ +} while (0) +#define PS2_INT_ON()  do {      \ +    EIMSK |= (1<<INT1);         \ +} while (0) +#define PS2_INT_OFF() do {      \ +    EIMSK &= ~(1<<INT1);        \ +} while (0) +#define PS2_INT_VECT    INT1_vect +#endif + + +/* + * PS/2 Busywait configuration + */ +#ifdef PS2_USE_BUSYWAIT +#define PS2_CLOCK_PORT  PORTD +#define PS2_CLOCK_PIN   PIND +#define PS2_CLOCK_DDR   DDRD +#define PS2_CLOCK_BIT   1 + +#define PS2_DATA_PORT   PORTD +#define PS2_DATA_PIN    PIND +#define PS2_DATA_DDR    DDRD +#define PS2_DATA_BIT    0 +#endif + +#endif diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.c b/keyboards/converter/ibm_terminal/ibm_terminal.c new file mode 100644 index 0000000000..17296864a3 --- /dev/null +++ b/keyboards/converter/ibm_terminal/ibm_terminal.c @@ -0,0 +1,6 @@ +#include "ibm_terminal.h" + +// void matrix_init_kb(void) { + +//     matrix_init_user(); +// }
\ No newline at end of file diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.h b/keyboards/converter/ibm_terminal/ibm_terminal.h new file mode 100644 index 0000000000..c6468349ca --- /dev/null +++ b/keyboards/converter/ibm_terminal/ibm_terminal.h @@ -0,0 +1,82 @@ +#ifndef IBM_TERMINAL_H +#define IBM_TERMINAL_H + +#include "quantum.h" + +void matrix_init_user(void); + +/* + * IBM Terminal keyboard 6110345(122keys)/1392595(102keys) + * http://geekhack.org/showthread.php?10737-What-Can-I-Do-With-a-Terminal-Model-M + * http://www.seasip.info/VintagePC/ibm_1391406.html + * + * Keymap array: + *     8 bytes + *   +---------+ + *  0|         | + *  :|         | 0x00-0x87 + *  ;|         | + * 17|         | + *   +---------+ + */ +#define KEYMAP( \ +                  K08,K10,K18,K20,K28,K30,K38,K40,K48,K50,K57,K5F,                                         \ +                  K07,K0F,K17,K1F,K27,K2F,K37,K3F,K47,K4F,K56,K5E,                                         \ +                                                                                                           \ +    K05,K06,  K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K5D,K66,  K67,K6E,K6F,  K76,K77,K7E,K84, \ +    K04,K0C,  K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,    K5C,  K64,K65,K6D,  K6C,K75,K7D,K7C, \ +    K03,K0B,  K14,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K53,K5A,      K63,      K6B,K73,K74,K7B, \ +    K83,K0A,  K12,K13,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K51,K59,  K61,K62,K6A,  K69,K72,K7A,K79, \ +    K01,K09,  K11,    K19,            K29,                    K39,    K58,      K60,      K68,K70,K71,K78  \ +) { \ +    { KC_NO, K01,   KC_NO, K03,   K04,   K05,   K06,   K07   }, \ +    { K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \ +    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \ +    { K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \ +    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \ +    { K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F   }, \ +    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \ +    { K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F   }, \ +    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \ +    { K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F   }, \ +    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \ +    { K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F   }, \ +    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67   }, \ +    { K68,   K69,   K6A,   K6B,   K6C,   K6D,   K6E,   K6F   }, \ +    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77   }, \ +    { K78,   K79,   K7A,   K7B,   K7C,   K7D,   K7E,   KC_NO }, \ +    { KC_NO, KC_NO, KC_NO, K83,   K84,   KC_NO, KC_NO, KC_NO,}, \ +} + +/* + * IBM Terminal keyboard 1399625, 101-key + */ +#define KEYMAP_101( \ +    K08,    K07,K0F,K17,K1F,K27,K2F,K37,K3F,K47,K4F,K56,K5E,  K57,K5F,K62,                   \ +                                                                                             \ +    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66,  K67,K6E,K6F,  K76,K77,K7E,K84, \ +    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5C,  K64,K65,K6D,  K6C,K75,K7D,     \ +    K14,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K5A,                K6B,K73,K74,K7C, \ +    K12,    K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K59,      K63,      K69,K72,K7A,     \ +    K11,    K19,            K29,                K39,    K58,  K61,K60,K6A,  K70,    K71,K79  \ +) { \ +    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K07   }, \ +    { K08,   KC_NO, KC_NO, KC_NO, KC_NO, K0D,   K0E,   K0F   }, \ +    { KC_NO, K11,   K12,   KC_NO, K14,   K15,   K16,   K17   }, \ +    { KC_NO, K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \ +    { KC_NO, K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \ +    { KC_NO, K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F   }, \ +    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \ +    { KC_NO, K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F   }, \ +    { KC_NO, K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \ +    { KC_NO, K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F   }, \ +    { KC_NO, KC_NO, K52,   KC_NO, K54,   K55,   K56,   K57   }, \ +    { K58,   K59,   K5A,   K5B,   K5C,   KC_NO, K5E,   K5F   }, \ +    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67   }, \ +    { KC_NO, K69,   K6A,   K6B,   K6C,   K6D,   K6E,   K6F   }, \ +    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77   }, \ +    { KC_NO, K79,   K7A,   KC_NO, K7C,   K7D,   K7E,   KC_NO }, \ +    { KC_NO, KC_NO, KC_NO, KC_NO, K84,   KC_NO, KC_NO, KC_NO,}, \ +} + +#endif
\ No newline at end of file diff --git a/keyboards/converter/ibm_terminal/keymaps/default/Makefile b/keyboards/converter/ibm_terminal/keymaps/default/Makefile new file mode 100644 index 0000000000..9ec2464943 --- /dev/null +++ b/keyboards/converter/ibm_terminal/keymaps/default/Makefile @@ -0,0 +1,27 @@ +# Build Options +#   change to "no" to disable the options, or define them in the Makefile in  +#   the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE ?= no       # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes        # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450) +CONSOLE_ENABLE ?= no         # Console for debug(+400) +COMMAND_ENABLE ?= no         # Commands for debug and configuration +NKRO_ENABLE ?= yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE ?= no       # Enable keyboard backlight functionality +MIDI_ENABLE ?= no            # MIDI controls +AUDIO_ENABLE ?= no           # Audio output on port C6 +UNICODE_ENABLE ?= no         # Unicode +UNICODEMAP_ENABLE ?= yes +BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE ?= no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time. +PS2_USE_USART ?= yes +API_SYSEX_ENABLE ?= no + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no    # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR +	include ../../../../../Makefile +endif + diff --git a/keyboards/converter/ibm_terminal/keymaps/default/config.h b/keyboards/converter/ibm_terminal/keymaps/default/config.h new file mode 100644 index 0000000000..7fa3bf328e --- /dev/null +++ b/keyboards/converter/ibm_terminal/keymaps/default/config.h @@ -0,0 +1,6 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +#endif diff --git a/keyboards/converter/ibm_terminal/keymaps/default/keymap.c b/keyboards/converter/ibm_terminal/keymaps/default/keymap.c new file mode 100644 index 0000000000..2beb51106e --- /dev/null +++ b/keyboards/converter/ibm_terminal/keymaps/default/keymap.c @@ -0,0 +1,69 @@ +/* +Copyright 2012 Jun Wako <[email protected]> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program.  If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <stdint.h> +#include <stdbool.h> +#include "keycode.h" +#include "print.h" +#include "debug.h" +#include "util.h" +#include "ibm_terminal.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +    // Layer 0 + +    KEYMAP( +                        KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, +                        KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, + +    KC_PSCR,KC_ESC,     KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_NO,  KC_BSPC,    KC_INS, KC_HOME,KC_PGUP,    KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, +    KC_SLCK,KC_INT4,    KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,        KC_NO,      KC_DEL, KC_END, KC_PGDN,    KC_P7,  KC_P8,  KC_P9,  KC_PPLS, +    KC_PAUS,KC_INT5,    KC_LCTL,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_BSLS,KC_ENT,             KC_UP,              KC_P4,  KC_P5,  KC_P6,  KC_PCMM, +    KC_APP, KC_INT6,    KC_LSFT,KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,        KC_NO,  KC_RSFT,    KC_LEFT,KC_INT2,KC_RGHT,    KC_P1,  KC_P2,  KC_P3,  KC_PENT, +    KC_RGUI,KC_LGUI,    KC_LCTL,        KC_LALT,                        KC_SPC,                                         KC_LGUI,        KC_GRV,             KC_DOWN,            KC_NO,  KC_P0,  KC_PDOT,KC_NO +    ), + +/* 101-key keymaps + */ +    /* 0: default +     * ,---.   ,---------------. ,---------------. ,---------------. ,-----------. +     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| +     * `---'   `---------------' `---------------' `---------------' `-----------' +     * ,-----------------------------------------------------------. ,-----------. ,---------------. +     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backspa| |Ins|Hom|PgU| |NmL|  /|  *|  -| +     * |-----------------------------------------------------------| |-----------| |---------------| +     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |Del|End|PgD| |  7|  8|  9|   | +     * |-----------------------------------------------------------| `-----------' |-----------|  +| +     * |CapsLo|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |               |  4|  5|  6|   | +     * |-----------------------------------------------------------|     ,---.     |---------------| +     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     |Up |     |  1|  2|  3|   | +     * |-----------------------------------------------------------| ,-----------. |-----------|Ent| +     * |Ctrl|    |Alt |          Space              |Alt |    |Ctrl| |Lef|Dow|Rig| |      0|  .|   | +     * `----'    `---------------------------------------'    `----' `-----------' `---------------' +     */ +/* +    KEYMAP_101( +     KC_ESC,       KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,        KC_PSCR,KC_SLCK, KC_BRK, + +     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,KC_BSPC,      KC_INS,KC_HOME,KC_PGUP,     KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, +     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC,KC_RBRC,KC_BSLS,      KC_DEL, KC_END,KC_PGDN,       KC_P7,  KC_P8,  KC_P9, +    KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT,         KC_ENT,                                    KC_P4,  KC_P5,  KC_P6,KC_PPLS, +    KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,               KC_UP,               KC_P1,  KC_P2,  KC_P3, +    KC_LCTL,     KC_LALT,                         KC_SPC,                                   KC_RALT,        KC_RCTL,     KC_LEFT,KC_DOWN,KC_RGHT,       KC_P0,        KC_PDOT,KC_PENT +    ), +*/ +}; diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/Makefile b/keyboards/converter/ibm_terminal/keymaps/priyadi/Makefile new file mode 100644 index 0000000000..9ec2464943 --- /dev/null +++ b/keyboards/converter/ibm_terminal/keymaps/priyadi/Makefile @@ -0,0 +1,27 @@ +# Build Options +#   change to "no" to disable the options, or define them in the Makefile in  +#   the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE ?= no       # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes        # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450) +CONSOLE_ENABLE ?= no         # Console for debug(+400) +COMMAND_ENABLE ?= no         # Commands for debug and configuration +NKRO_ENABLE ?= yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE ?= no       # Enable keyboard backlight functionality +MIDI_ENABLE ?= no            # MIDI controls +AUDIO_ENABLE ?= no           # Audio output on port C6 +UNICODE_ENABLE ?= no         # Unicode +UNICODEMAP_ENABLE ?= yes +BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE ?= no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time. +PS2_USE_USART ?= yes +API_SYSEX_ENABLE ?= no + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no    # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR +	include ../../../../../Makefile +endif + diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/config.h b/keyboards/converter/ibm_terminal/keymaps/priyadi/config.h new file mode 100644 index 0000000000..7fa3bf328e --- /dev/null +++ b/keyboards/converter/ibm_terminal/keymaps/priyadi/config.h @@ -0,0 +1,6 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +#endif diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c new file mode 100644 index 0000000000..592f7654ba --- /dev/null +++ b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c @@ -0,0 +1,312 @@ +/* +Copyright 2016 Priyadi Iman Nurcahyo <[email protected]> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program.  If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "keycode.h" +#include "print.h" +#include "debug.h" +#include "util.h" +#include "ibm_terminal.h" +#include "action_layer.h" + +// Fillers to make layering clearer + +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +enum layers { +  QWE, // qwerty +  COL, // colemak +  WOR, // workman +  DVO, // dvorak + +  MOU, // mouse keys +  EMO, // emoji +  SYS, // system +}; + +enum keycodes { +  // default layout switcher +  LAY_QWE = SAFE_RANGE, +  LAY_COL, +  LAY_WOR, +  LAY_DVO, + +  // layer switchers +  LYR_SYS, +  LYR_EMO, + +  // os switchers +  OS_LIN, +  OS_WIN, +  OS_MAC, +}; + +// unicode map + +enum unicode_name { +  GRIN, // grinning face 😊 +  TJOY, // tears of joy 😂 +  SMILE, // grining face with smiling eyes 😁 +  HEART, // heart ❤ +  EYERT, // smiling face with heart shaped eyes 😍 +  CRY, // crying face 😭 +  SMEYE, // smiling face with smiling eyes 😊 +  UNAMU, // unamused 😒 +  KISS, // kiss 😘 +  HART2, // two hearts 💕 +  WEARY, // weary 😩 +  OKHND, // ok hand sign 👌 +  PENSV, // pensive 😔 +  SMIRK, // smirk 😏 +  RECYC, // recycle ♻ +  WINK, // wink 😉 +  THMUP, // thumb up 👍 +  THMDN, // thumb down 👎 +  PRAY, // pray 🙏 +  PHEW, // relieved 😌 +  MUSIC, // musical notes +  FLUSH, // flushed 😳 +  CELEB, // celebration 🙌 +  CRY2, // crying face 😢 +  COOL, // smile with sunglasses 😎 +  NOEVS, // see no evil +  NOEVH, // hear no evil +  NOEVK, // speak no evil +  POO, // pile of poo +  EYES, // eyes +  VIC, // victory hand +  BHART, // broken heart +  SLEEP, // sleeping face +  SMIL2, // smiling face with open mouth & sweat +  HUNRD, // 100 +  CONFU, // confused +  TONGU, // face with tongue & winking eye +  DISAP, // disappointed +  YUMMY, // face savoring delicious food +  CLAP, // hand clapping +  FEAR, // face screaming in fear +  HORNS, // smiling face with horns +  HALO, // smiling face with halo +  BYE, // waving hand +  SUN, // sun +  MOON, // moon +  SKULL, // skull +}; + +const uint32_t PROGMEM unicode_map[] = { +  [GRIN] = 0x1F600, +  [TJOY] = 0x1F602, +  [SMILE] = 0x1F601, +  [HEART] = 0x2764, +  [EYERT] = 0x1f60d, +  [CRY] = 0x1f62d, +  [SMEYE] = 0x1F60A, +  [UNAMU] = 0x1F612, +  [KISS] = 0x1F618, +  [HART2] = 0x1F495, +  [WEARY] = 0x1F629, +  [OKHND] = 0x1F44C, +  [PENSV] = 0x1F614, +  [SMIRK] = 0x1F60F, +  [RECYC] = 0x267B, +  [WINK] = 0x1F609, +  [THMUP] = 0x1F44D, +  [THMDN] = 0x1F44E, +  [PRAY] = 0x1F64F, +  [PHEW] = 0x1F60C, +  [MUSIC] = 0x1F3B6, +  [FLUSH] = 0x1F633, +  [CELEB] = 0x1F64C, +  [CRY2] = 0x1F622, +  [COOL] = 0x1F60E, +  [NOEVS] = 0x1F648, +  [NOEVH] = 0x1F649, +  [NOEVK] = 0x1F64A, +  [POO] = 0x1F4A9, +  [EYES] = 0x1F440, +  [VIC] = 0x270C, +  [BHART] = 0x1F494, +  [SLEEP] = 0x1F634, +  [SMIL2] = 0x1F605, +  [HUNRD] = 0x1F4AF, +  [CONFU] = 0x1F615, +  [TONGU] = 0x1F61C, +  [DISAP] = 0x1F61E, +  [YUMMY] = 0x1F60B, +  [CLAP] = 0x1F44F, +  [FEAR] = 0x1F631, +  [HORNS] = 0x1F608, +  [HALO] = 0x1F607, +  [BYE] = 0x1F44B, +  [SUN] = 0x2600, +  [MOON] = 0x1F314, +  [SKULL] = 0x1F480, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +    /* qwerty */ +    [QWE] = KEYMAP( +                                   KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_PSCR, KC_SLCK, KC_PAUS, +                                   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, + +    MO(EMO), MO(SYS),     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, +    KC_MNXT, KC_VOLU,     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          XXXXXXX,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS, +    KC_MPLY, KC_MUTE,     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_BSLS, KC_ENT,               KC_UP,                KC_P4,   KC_P5,   KC_P6,   KC_PCMM, +    KC_MPRV, KC_VOLD,     KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          XXXXXXX, KC_RSFT,     KC_LEFT, TG(MOU), KC_RGHT,     KC_P1,   KC_P2,   KC_P3,   KC_PENT, +    KC_LGUI, KC_APP,      KC_LCTL,          KC_LALT,                            KC_SPC,                                               KC_RALT,          KC_RCTL,              KC_DOWN,              XXXXXXX, KC_P0,   KC_PDOT, XXXXXXX +    ), + +    /* colemak */ +    [COL] = KEYMAP( +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + +    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC,          _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,          _______, _______,              _______,              _______, _______, _______, _______, +    _______, _______,     _______, _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______ +    ), + +    /* workman */ +    [WOR] = KEYMAP( +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + +    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC,          _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT,          _______, _______,              _______,              _______, _______, _______, _______, +    _______, _______,     _______, _______, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH,          _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______ +    ), + +    /* dvorak */ +    [DVO] = KEYMAP( +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + +    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,           _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          _______, _______,              _______,              _______, _______, _______, _______, +    _______, _______,     _______, _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,             _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______ +    ), + +    /* system */ +    [SYS] = KEYMAP( +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + +    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, LAY_QWE, OS_WIN,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, _______, _______, LAY_DVO, _______, _______, _______, _______, LAY_WOR, OS_LIN,  _______, _______,          _______, _______,              _______,              _______, _______, _______, _______, +    _______, _______,     _______, _______, _______, _______, LAY_COL, _______, _______, _______, OS_MAC,  _______, _______, _______,          _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______ +    ), + +    /* mouse keys */ +    [MOU] = KEYMAP( +                                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +                                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + +    XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +    XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +    XXXXXXX, KC_BTN4,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,              KC_MS_U,              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +    XXXXXXX, KC_BTN5,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,     KC_MS_L, _______, KC_MS_R,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +    KC_BTN1, KC_BTN3,     KC_BTN2,          XXXXXXX,                            XXXXXXX,                                              XXXXXXX,          XXXXXXX,              KC_MS_D,              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX +    ), + +    /* emoji */ +    [EMO] = KEYMAP( +                                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +                                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + +    XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +    XXXXXXX, XXXXXXX,     XXXXXXX, X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY), X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV),XXXXXXX, XXXXXXX,          XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +    XXXXXXX, XXXXXXX,     XXXXXXX, X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN), X(HEART),X(BYE),  X(KISS), X(CELEB),X(COOL), XXXXXXX,          XXXXXXX, XXXXXXX,              XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +    XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX,X(SLEEP),X(CLAP), X(CRY),   X(VIC),  X(BHART),X(SUN),  X(SMEYE),X(WINK), X(MOON), X(CONFU),         XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +    XXXXXXX, XXXXXXX,     XXXXXXX,          XXXXXXX,                            XXXXXXX,                                              XXXXXXX,          XXXXXXX,              XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX +    ), + +    /* +    [XXX] = KEYMAP( +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +                                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + +    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,              _______,              _______, _______, _______, _______, +    _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,     _______, _______, _______,     _______, _______, _______, _______, +    _______, _______,     _______,          _______,                            _______,                                              _______,          _______,              _______,              _______, _______, _______, _______ +    ), +    */ +}; + +void persistant_default_layer_set(uint16_t default_layer) { +  eeconfig_update_default_layer(default_layer); +  default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +  switch (keycode) { +    /* layout switcher */ +    case LAY_QWE: +      if (record->event.pressed) { +        persistant_default_layer_set(1UL<<QWE); +      } +      return false; +      break; +    case LAY_COL: +      if (record->event.pressed) { +        persistant_default_layer_set(1UL<<COL); +      } +      return false; +      break; +    case LAY_WOR: +      if (record->event.pressed) { +        persistant_default_layer_set(1UL<<WOR); +      } +      return false; +      break; +    case LAY_DVO: +      if (record->event.pressed) { +        persistant_default_layer_set(1UL<<DVO); +      } +      return false; +      break; + +    /* os switcher */ +    case OS_LIN: +      set_unicode_input_mode(UC_LNX); +      return false; +      break; +    case OS_WIN: +      set_unicode_input_mode(UC_WINC); +      return false; +      break; +    case OS_MAC: +      set_unicode_input_mode(UC_OSX); +      return false; +      break; + +  } +  return true; +} + +void matrix_init_user() { +  set_unicode_input_mode(UC_LNX); +} diff --git a/keyboards/converter/ibm_terminal/led.c b/keyboards/converter/ibm_terminal/led.c new file mode 100644 index 0000000000..e448e84ec7 --- /dev/null +++ b/keyboards/converter/ibm_terminal/led.c @@ -0,0 +1,33 @@ +/* +Copyright 2011 Jun Wako <[email protected]> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program.  If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "stdint.h" +#include "ps2.h" +#include "led.h" + + +void led_set(uint8_t usb_led) +{ +    uint8_t ps2_led = 0; +    if (usb_led &  (1<<USB_LED_SCROLL_LOCK)) +        ps2_led |= (1<<PS2_LED_SCROLL_LOCK); +    if (usb_led &  (1<<USB_LED_NUM_LOCK)) +        ps2_led |= (1<<PS2_LED_NUM_LOCK); +    if (usb_led &  (1<<USB_LED_CAPS_LOCK)) +        ps2_led |= (1<<PS2_LED_CAPS_LOCK); +    ps2_host_set_led(ps2_led); +} diff --git a/keyboards/converter/ibm_terminal/matrix.c b/keyboards/converter/ibm_terminal/matrix.c new file mode 100644 index 0000000000..9d717b61f5 --- /dev/null +++ b/keyboards/converter/ibm_terminal/matrix.c @@ -0,0 +1,237 @@ +/* +Copyright 2011 Jun Wako <[email protected]> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program.  If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <stdint.h> +#include <stdbool.h> +#include <avr/io.h> +#include <util/delay.h> +#include "print.h" +#include "util.h" +#include "debug.h" +#include "ps2.h" +#include "matrix.h" + +#define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row)) +#define print_matrix_header()  print("\nr/c 01234567\n") +#define matrix_bitpop(i)       bitpop(matrix[i]) +#define ROW_SHIFTER ((uint8_t)1) + + +static void matrix_make(uint8_t code); +static void matrix_break(uint8_t code); + + +/* + * Matrix Array usage: + * 'Scan Code Set 3' is assigned into 17x8 cell matrix. + * + *    8bit wide + *   +---------+ + *  0|         | + *  :|         | 0x00-0x87 + *  ;|         | + * 17|         | + *   +---------+ + */ +static uint8_t matrix[MATRIX_ROWS]; +#define ROW(code)      (code>>3) +#define COL(code)      (code&0x07) + + +__attribute__ ((weak)) +void matrix_init_user(void) { +} + +void matrix_init(void) +{ +    debug_enable = true; +    //debug_matrix = true; +    //debug_keyboard = true; +    //debug_mouse = false; + +    ps2_host_init(); + +    // initialize matrix state: all keys off +    for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00; + +    matrix_init_user(); +    return; +} + +uint8_t matrix_scan(void) +{ + +    // scan code reading states +    static enum { +        RESET, +        RESET_RESPONSE, +        KBD_ID0, +        KBD_ID1, +        CONFIG, +        READY, +        F0, +    } state = RESET; + +    uint8_t code; +    if ((code = ps2_host_recv())) { +        debug("r"); debug_hex(code); debug(" "); +    } + +    switch (state) { +        case RESET: +            debug("wFF "); +            if (ps2_host_send(0xFF) == 0xFA) { +                debug("[ack]\nRESET_RESPONSE: "); +                state = RESET_RESPONSE; +            } +            break; +        case RESET_RESPONSE: +            if (code == 0xAA) { +                debug("[ok]\nKBD_ID: "); +                state = KBD_ID0; +            } else if (code) { +                debug("err\nRESET: "); +                state = RESET; +            } +            break; +        // after reset receive keyboad ID(2 bytes) +        case KBD_ID0: +            if (code) { +                state = KBD_ID1; +            } +            break; +        case KBD_ID1: +            if (code) { +                debug("\nCONFIG: "); +                state = CONFIG; +            } +            break; +        case CONFIG: +            debug("wF8 "); +            if (ps2_host_send(0xF8) == 0xFA) { +                debug("[ack]\nREADY\n"); +                state = READY; +            } +            break; +        case READY: +            switch (code) { +                case 0x00: +                    break; +                case 0xF0: +                    state = F0; +                    debug(" "); +                    break; +                default:    // normal key make +                    if (code < 0x88) { +                        matrix_make(code); +                    } else { +                        debug("unexpected scan code at READY: "); debug_hex(code); debug("\n"); +                    } +                    state = READY; +                    debug("\n"); +            } +            break; +        case F0:    // Break code +            switch (code) { +                case 0x00: +                    break; +                default: +                    if (code < 0x88) { +                        matrix_break(code); +                    } else { +                        debug("unexpected scan code at F0: "); debug_hex(code); debug("\n"); +                    } +                    state = READY; +                    debug("\n"); +            } +            break; +    } +    return 1; +} + +inline +uint8_t matrix_get_row(uint8_t row) +{ +    return matrix[row]; +} + +inline +static void matrix_make(uint8_t code) +{ +    if (!matrix_is_on(ROW(code), COL(code))) { +        matrix[ROW(code)] |= 1<<COL(code); +    } +} + +inline +static void matrix_break(uint8_t code) +{ +    if (matrix_is_on(ROW(code), COL(code))) { +        matrix[ROW(code)] &= ~(1<<COL(code)); +    } +} + +bool matrix_is_on(uint8_t row, uint8_t col) +{ +    return (matrix_get_row(row) & (1<<col)); +} + +void matrix_print(void) +{ +#if (MATRIX_COLS <= 8) +    print("r/c 01234567\n"); +#elif (MATRIX_COLS <= 16) +    print("r/c 0123456789ABCDEF\n"); +#elif (MATRIX_COLS <= 32) +    print("r/c 0123456789ABCDEF0123456789ABCDEF\n"); +#endif + +    for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + +#if (MATRIX_COLS <= 8) +        xprintf("%02X: %08b%s\n", row, bitrev(matrix_get_row(row)), +#elif (MATRIX_COLS <= 16) +        xprintf("%02X: %016b%s\n", row, bitrev16(matrix_get_row(row)), +#elif (MATRIX_COLS <= 32) +        xprintf("%02X: %032b%s\n", row, bitrev32(matrix_get_row(row)), +#endif +#ifdef MATRIX_HAS_GHOST +        matrix_has_ghost_in_row(row) ?  " <ghost" : "" +#else +        "" +#endif +        ); +    } +} + +#ifdef MATRIX_HAS_GHOST +__attribute__ ((weak)) +bool matrix_has_ghost_in_row(uint8_t row) +{ +    matrix_row_t matrix_row = matrix_get_row(row); +    // No ghost exists when less than 2 keys are down on the row +    if (((matrix_row - 1) & matrix_row) == 0) +        return false; + +    // Ghost occurs when the row shares column line with other row +    for (uint8_t i=0; i < MATRIX_ROWS; i++) { +        if (i != row && (matrix_get_row(i) & matrix_row)) +            return true; +    } +    return false; +} +#endif diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk new file mode 100644 index 0000000000..944d1bcecb --- /dev/null +++ b/keyboards/converter/ibm_terminal/rules.mk @@ -0,0 +1,72 @@ +# MCU name +MCU = atmega32u4 + +# Processor frequency. +#     This will define a symbol, F_CPU, in all source code files equal to the +#     processor frequency in Hz. You can then use this symbol in your source code to +#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done +#     automatically to create a 32-bit value in your source code. +# +#     This will be an integer division of F_USB below, as it is sourced by +#     F_USB after it has run through any CPU prescalers. Note that this value +#     does not *change* the processor frequency - it should merely be updated to +#     reflect the processor speed set externally so that the code can use accurate +#     software delays. +F_CPU = 16000000 + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +#     This will define a symbol, F_USB, in all source code files equal to the +#     input clock frequency (before any prescaling is performed) in Hz. This value may +#     differ from F_CPU if prescaling is used on the latter, and is required as the +#     raw input clock is fed directly to the PLL sections of the AVR for high speed +#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +#     at the end, this will be done automatically to create a 32-bit value in your +#     source code. +# +#     If no clock division is performed on the input clock inside the AVR (via the +#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +#   Teensy halfKay   512 +#   Teensy++ halfKay 1024 +#   Atmel DFU loader 4096 +#   LUFA bootloader  4096 +#   USBaspLoader     2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + +# Build Options +#   change to "no" to disable the options, or define them in the Makefile in  +#   the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE ?= no       # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes        # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450) +CONSOLE_ENABLE ?= no         # Console for debug(+400) +COMMAND_ENABLE ?= no         # Commands for debug and configuration +NKRO_ENABLE ?= yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE ?= no       # Enable keyboard backlight functionality +MIDI_ENABLE ?= no            # MIDI controls +AUDIO_ENABLE ?= no           # Audio output on port C6 +UNICODE_ENABLE ?= no         # Unicode +UNICODEMAP_ENABLE ?= yes +BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE ?= no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time. +PS2_USE_USART ?= yes +API_SYSEX_ENABLE ?= n +CUSTOM_MATRIX = yes + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no    # Breathing sleep LED during USB suspend + +SRC = matrix.c led.c
\ No newline at end of file diff --git a/keyboards/converter/rules.mk b/keyboards/converter/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/converter/rules.mk diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h index c2750a321f..a3dc5bf152 100644 --- a/keyboards/ergodox/ez/config.h +++ b/keyboards/ergodox/ez/config.h @@ -56,6 +56,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  /* Set 0 if debouncing isn't needed */  #define DEBOUNCE    5 +#define USB_MAX_POWER_CONSUMPTION 50 +  /*   * Feature disable options   *  These options are also useful to firmware size reduction. diff --git a/keyboards/ergodox/keymaps/pvinis/keymap.c b/keyboards/ergodox/keymaps/pvinis/keymap.c index df906201a8..87ad70c919 100644 --- a/keyboards/ergodox/keymaps/pvinis/keymap.c +++ b/keyboards/ergodox/keymaps/pvinis/keymap.c @@ -13,20 +13,16 @@ enum {    QWERTY,    CARPALX,    SYSCTL, +  MOUSE,  };  // extra keys  enum {    NONE = 0, -  // mouse -  MS_UL, // up   left -  MS_UR, // up   right -  MS_DL, // down left -  MS_DR, // down right -    // tap dance    TD_FLSH, // flash keyboard +  TD_LAYR, // SYSCTL and MOUSE layer switch  };  // application selection @@ -52,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   *   |      |      |      |      |      |                                       |      |      |      |      |      |   *   `----------------------------------'                                       `----------------------------------'   *                                        ,-------------.       ,-------------. - *                                        |BEGIN |QWERTY|       |SYSCTL|      | + *                                        |BEGIN |QWERTY|       |      |      |   *                                 ,------|------|------|       |------+--------+------.   *                                 |      |      |CARPAL|       |Slack |        |      |   *                                 |Backsp|LShift|------|       |------| Enter  |Space | @@ -66,9 +62,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  ,KC_NO          ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO  ,KC_NO          ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO -                                                          ,TG(BEGIN)  ,TG(QWERTY) -                                                                      ,TG(CARPALX) -                                                  ,KC_BSPC  ,KC_LSFT  ,TG(SYSCTL) +                                                          ,TG(BEGIN)  ,TD(TD_LAYR) +                                                                      ,TG(MOUSE) +                                                  ,KC_BSPC  ,KC_LSFT  ,TD(TD_LAYR)                  ,KC_NO    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO                  ,KC_NO    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO @@ -85,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * a beginner's keymap i currently use.   *   * ,--------------------------------------------------.           ,--------------------------------------------------. - * |        |   1  |   2  |   3  |   4  |   5  |   6  |           |   6  |   7  |   8  |   9  |   0  |   -  |   =    | + * |        |   1  |   2  |   3  |   4  |   5  | opt  |           |   6  |   7  |   8  |   9  |   0  |   -  |   =    |   * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|   * |  Tab   |   Q  |   W  |   E  |   R  |   T  |   [  |           |   ]  |   Y  |   U  |   I  |   O  |   P  |   \    |   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| @@ -104,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   *                                 `--------------------'       `----------------------'   */  [BEGIN] = KEYMAP( - KC_TRNS          ,KC_1    ,KC_2     ,KC_3     ,KC_4      ,KC_5    ,KC_6 + KC_TRNS          ,KC_1    ,KC_2     ,KC_3     ,KC_4      ,KC_5    ,KC_LALT  ,KC_TAB           ,KC_Q    ,KC_W     ,KC_E     ,KC_R      ,KC_T    ,KC_LBRC  ,CTL_T(KC_ESC)    ,KC_A    ,KC_S     ,KC_D     ,KC_F      ,KC_G  ,KC_LSFT          ,KC_Z    ,KC_X     ,KC_C     ,KC_V      ,KC_B    ,KC_LPRN @@ -213,30 +209,73 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {        ,KC_TRNS  ,KC_TRNS  ,KC_TRNS  ), -  /* SYSCTL   * a keymap to control my system.   * + * ,--------------------------------------------------.           ,------------------------------------------------------. + * |   ^    |      |      |      |      |      |      |           |      |      |      |          |      |      |        | + * |--------+------+------+------+------+-------------|           |------+------+------+----------+------+------+--------| + * |        |      |      |      |      |      |      |           |      | Mute | Home |    Up    | End  |      |        | + * |--------+------+------+------+------+------|      |           |      |------+------+----------+------+------+--------| + * |        |      |      |      |      |      |------|           |------|VolUp | Left |   Down   |Right |      | Lock   | + * |--------+------+------+------+------+------|      |           |      |------+------+----------+------+------+--------| + * |        |      |      |      |      |      |      |           |      |VolDn | Prev |Play/Pause| Next |      | Sleep  | + * `--------+------+------+------+------+-------------'           `-------------+------+----------+------+------+--------' + *   |      |      |      |      |      |                                       |      |          |      |      | Power| + *   `----------------------------------'                                       `--------------------------------------' + *                                        ,-------------.       ,-------------. + *                                        |      |      |       |      |      | + *                                 ,------|------|------|       |------+------+------. + *                                 |      |      |      |       |      |      |      | + *                                 |      |      |------|       |------|      |      | + *                                 |      |      |  ^   |       |      |      |      | + *                                 `--------------------'       `--------------------' + */ +[SYSCTL] = KEYMAP( + KC_TRNS    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO +,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO +,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO +,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO +,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO + +                                                      ,KC_NO  ,KC_NO +                                                              ,KC_NO +                                              ,KC_NO  ,KC_NO  ,KC_TRNS + + /*,KC_POP ///  */,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO + /* /// ,KC_PTRN*/,KC_NO    ,KC_MUTE  ,KC_HOME  ,KC_UP    ,KC_END   ,KC_NO    ,KC_NO +                            ,KC_VOLU  ,KC_LEFT  ,KC_DOWN  ,KC_RGHT  ,KC_NO    ,LCTL(LSFT(KC_PWR)) +                  ,KC_NO    ,KC_VOLD  ,KC_MPRV  ,KC_MPLY  ,KC_MNXT  ,KC_NO    ,KC_SLEP +                                      ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO    ,KC_PWR + +          ,KC_NO  ,KC_NO +          ,KC_NO +          ,KC_NO  ,KC_NO  ,KC_NO +), + +/* MOUSE + * a keymap to control my system. + *   * ,--------------------------------------------------.           ,--------------------------------------------------. - * |        |      |      |      |      |      |      |           |      |      |      | Mute |VolDn |VolUp |        | + * |   ^    |      |      |      |      |      |      |           |      |      |      |      |      |      |        |   * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------| - * |        |      |      |      |      |      |      |           |      |      |MsUpL | MsUp |MsUpR |      |        | + * |        |      |      |      |      |      |      |           |      |      |      | MsUp |      |      |        |   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |      |      |      |      |      |------|           |------|      |MsLeft| MsDn |MsRght|      | Lock   | + * |        |      |      |      |      |      |------|           |------|      |MsLeft| MsDn |MsRght|      |        |   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |      |      |      |      |      |      |           |      |      |MsDnL | MsDn |      |      | Sleep  | + * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |   * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------' - *   |      |      |      |      |      |                                       |      |      |      |      | Power| + *   |      |      |      |      |      |                                       |      |      |      |      |      |   *   `----------------------------------'                                       `----------------------------------'   *                                        ,-------------.       ,-------------.   *                                        |      |      |       |      |MidClk|   *                                 ,------|------|------|       |------+------+------.   *                                 |      |      |      |       |      |Left  |Right |   *                                 |      |      |------|       |------| Click| Click| - *                                 |      |      |      |       |      |      |      | + *                                 |      |      |  ^   |       |      |      |      |   *                                 `--------------------'       `--------------------'   */ -[SYSCTL] = KEYMAP( +[MOUSE] = KEYMAP(   KC_TRNS    ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO  ,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO  ,KC_NO      ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO @@ -245,13 +284,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                                        ,KC_NO  ,KC_NO                                                                ,KC_NO -                                              ,KC_NO  ,KC_NO  ,KC_NO +                                              ,KC_NO  ,KC_NO  ,KC_TRNS -       /*,KC_POP*/,KC_NO    ,KC_NO  ,KC_NO  ,KC_MUTE  ,KC_VOLD  ,KC_VOLU    ,KC_NO -      /*,KC_PTRN*/,KC_NO    ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO    ,KC_NO      ,KC_NO -                            ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO    ,KC_NO      ,LCTL(LSFT(KC_PWR)) -                  ,KC_NO    ,KC_NO  ,KC_NO  ,KC_NO    ,KC_NO    ,KC_NO      ,KC_SLEP -                                    ,KC_NO  ,KC_NO    ,KC_NO    ,KC_NO      ,KC_PWR +                  ,KC_NO    ,KC_NO  ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO +                  ,KC_NO    ,KC_NO  ,KC_NO    ,KC_MS_U  ,KC_NO    ,KC_NO    ,KC_NO +                            ,KC_NO  ,KC_MS_L  ,KC_MS_D  ,KC_MS_R  ,KC_NO    ,KC_NO +                  ,KC_NO    ,KC_NO  ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO +                                    ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO    ,KC_NO            ,KC_NO  ,KC_NO            ,KC_NO @@ -341,48 +380,29 @@ void matrix_init_user() {    ergodox_led_all_off();  } -// extra keys -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { -  switch (id) { +// light up leds based on the layer +void matrix_scan_user(void) { +  uint8_t layer = biton32(layer_state); -    // mouse -  case MS_UL: -    if (record->event.pressed) { -      mousekey_on(KC_MS_UP); -      mousekey_on(KC_MS_LEFT); -    } else { -      mousekey_off(KC_MS_UP); -      mousekey_off(KC_MS_LEFT); -    } -    break; -  case MS_UR: -    if (record->event.pressed) { -      mousekey_on(KC_MS_UP); -      mousekey_on(KC_MS_RIGHT); -    } else { -      mousekey_off(KC_MS_UP); -      mousekey_off(KC_MS_RIGHT); -    } +  switch(layer) { +  case SYSCTL: +    ergodox_right_led_3_on();      break; -  case MS_DL: -    if (record->event.pressed) { -      mousekey_on(KC_MS_DOWN); -      mousekey_on(KC_MS_LEFT); -    } else { -      mousekey_off(KC_MS_DOWN); -      mousekey_off(KC_MS_LEFT); -    } +  case MOUSE: +    ergodox_right_led_2_on();      break; -  case MS_DR: -    if (record->event.pressed) { -      mousekey_on(KC_MS_DOWN); -      mousekey_on(KC_MS_RIGHT); -    } else { -      mousekey_off(KC_MS_DOWN); -      mousekey_off(KC_MS_RIGHT); -    } +  default: +    ergodox_right_led_1_off(); +    ergodox_right_led_2_off(); +    ergodox_right_led_3_off();      break;    } +} + +// extra keys +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { +  switch (id) { +  }    return MACRO_NONE;  } @@ -425,6 +445,31 @@ void flash_dance_reset(qk_tap_dance_state_t *state, void *user_data) {    ergodox_right_led_3_off();  } +// SYSCTL on first tap, MOUSE ON second tap +void layers_dance_finished(qk_tap_dance_state_t *state, void *user_data) { +  uint8_t layer = biton32(layer_state); + +  switch(state->count) { +  case 1: +    switch(layer) { +    case SYSCTL: +      layer_off(SYSCTL); +      break; +    case MOUSE: +      layer_off(MOUSE); +      break; +    default: +      layer_on(SYSCTL); +      break; +    } +    break; +  case 2: +    layer_on(MOUSE); +    break; +  } +} +  qk_tap_dance_action_t tap_dance_actions[] = {    [TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED( flash_each_tap, flash_dance_finished, flash_dance_reset ), +  [TD_LAYR] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, layers_dance_finished, NULL ),  }; diff --git a/tmk_core/protocol/lufa/descriptor.c b/tmk_core/protocol/lufa/descriptor.c index bf47787d29..14d99b50bd 100644 --- a/tmk_core/protocol/lufa/descriptor.c +++ b/tmk_core/protocol/lufa/descriptor.c @@ -40,6 +40,9 @@  #include "report.h"  #include "descriptor.h" +#ifndef USB_MAX_POWER_CONSUMPTION +#define USB_MAX_POWER_CONSUMPTION 500 +#endif  /*******************************************************************************   * HID Report Descriptors @@ -294,7 +297,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =              .ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_REMOTEWAKEUP), -            .MaxPowerConsumption    = USB_CONFIG_POWER_MA(500) +            .MaxPowerConsumption    = USB_CONFIG_POWER_MA(USB_MAX_POWER_CONSUMPTION)          },      /* | 
