Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
This commit is contained in:
commit
6e0f994950
22 changed files with 1415 additions and 56 deletions
|
@ -77,53 +77,7 @@
|
|||
} while(0)
|
||||
# else
|
||||
# error "USART configuration is needed."
|
||||
#endif
|
||||
|
||||
// I'm fairly sure these aren't needed, but oh well - Jack
|
||||
|
||||
/*
|
||||
* 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
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
62
quantum/keymap_extras/keymap_jp.h
Normal file
62
quantum/keymap_extras/keymap_jp.h
Normal file
|
@ -0,0 +1,62 @@
|
|||
/* JP106-layout (Japanese Standard)
|
||||
*
|
||||
* For more information, see
|
||||
* http://www2d.biglobe.ne.jp/~msyk/keyboard/layout/usbkeycode.html
|
||||
* note: This website is written in Japanese.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef KEYMAP_JP_H
|
||||
#define KEYMAP_JP_H
|
||||
|
||||
|
||||
#include "keymap.h"
|
||||
|
||||
|
||||
#define JP_ZHTG KC_GRV // hankaku/zenkaku|kanzi
|
||||
#define JP_YEN KC_INT3 // yen, |
|
||||
#define JP_CIRC KC_EQL // ^, ~
|
||||
#define JP_AT KC_LBRC // @, `
|
||||
#define JP_LBRC KC_RBRC // [, {
|
||||
#define JP_COLN KC_QUOT // :, *
|
||||
#define JP_RBRC KC_NUHS // ], }
|
||||
#define JP_BSLS KC_INT1 // \, _
|
||||
#define JP_MHEN KC_INT5 // muhenkan
|
||||
#define JP_HENK KC_INT4 // henkan
|
||||
#define JP_KANA KC_INT2 // katakana/hiragana|ro-mazi
|
||||
|
||||
|
||||
//Aliases for shifted symbols
|
||||
#define JP_DQT LSFT(KC_2) // "
|
||||
#define JP_AMPR LSFT(KC_6) // &
|
||||
#define JP_QUOT LSFT(KC_7) // '
|
||||
#define JP_LPRN LSFT(KC_8) // (
|
||||
#define JP_RPRN LSFT(KC_9) // )
|
||||
#define JP_EQL LSFT(KC_MINS) // =
|
||||
#define JP_TILD LSFT(JP_CIRC) // ~
|
||||
#define JP_PIPE LSFT(JP_YEN) // |
|
||||
#define JP_GRV LSFT(JP_AT) // `
|
||||
#define JP_LCBR LSFT(JP_LBRC) // {
|
||||
#define JP_PLUS LSFT(KC_SCLN) // +
|
||||
#define JP_ASTR LSFT(JP_COLN) // *
|
||||
#define JP_RCBR LSFT(JP_RBRC) // }
|
||||
#define JP_UNDS LSFT(JP_BSLS) // _
|
||||
|
||||
|
||||
// These symbols are correspond to US101-layout.
|
||||
#define JP_MINS KC_MINS // -
|
||||
#define JP_SCLN KC_SCLN // ;
|
||||
#define JP_COMM KC_COMM // ,
|
||||
#define JP_DOT KC_DOT // .
|
||||
#define JP_SLSH KC_SLSH // /
|
||||
// shifted
|
||||
#define JP_EXLM KC_EXLM // !
|
||||
#define JP_HASH KC_HASH // #
|
||||
#define JP_DLR KC_DLR // $
|
||||
#define JP_PERC KC_PERC // %
|
||||
#define JP_LT KC_LT // <
|
||||
#define JP_GT KC_GT // >
|
||||
#define JP_QUES KC_QUES // ?
|
||||
|
||||
|
||||
#endif
|
|
@ -22,6 +22,7 @@ void register_hex(uint16_t hex);
|
|||
bool process_unicode(uint16_t keycode, keyrecord_t *record);
|
||||
|
||||
#ifdef UNICODEMAP_ENABLE
|
||||
void unicode_map_input_error(void);
|
||||
bool process_unicode_map(uint16_t keycode, keyrecord_t *record);
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue