max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'tmk/master'

Browse source
This commit is contained in:
Mark Sikora 2016-02-07 16:30:46 -05:00
commit 62c9e3af63
75 changed files with 1239 additions and 2780 deletions
Download patch file Download diff file Expand all files Collapse all files

4
keyboard/alps64/Makefile.keymap_editor Normal file
View file

@ -0,0 +1,4 @@
# build firmware for keymap editor
#
KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
include Makefile

59
keyboard/alps64/keymap_plain.c
View file

@ -1,7 +1,23 @@
#include "keymap_common.h"
const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* 0: qwerty */
#ifdef KEYMAP_SECTION_ENABLE
const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = {
#else
const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
#endif
/* 0: qwerty
* ,-----------------------------------------------------------.
* |` | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| #|Bsp|
* |-----------------------------------------------------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ |
* |-----------------------------------------------------------|
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Enter |
* |-----------------------------------------------------------|
* |Shft| \| Z| X| C| V| B| N| M| ,| .| /|Shift |Esc|
* |-----------------------------------------------------------'
* |Ctrl|Gui |Alt | Space |App |Alt |Gui |Ctrl |
* `-----------------------------------------------------------'
*/
KEYMAP( \
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, NUHS, BSPC, \
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, \
@ -9,4 +25,41 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT,ESC, \
LCTL,LGUI,LALT, SPC, APP, RALT,RGUI,RCTL),
};
const uint16_t PROGMEM fn_actions[] = {};
#ifdef KEYMAP_SECTION_ENABLE
const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
[0] = ACTION_LAYER_MOMENTARY(1),
[1] = ACTION_LAYER_MOMENTARY(2),
[2] = ACTION_LAYER_MOMENTARY(3),
[3] = ACTION_LAYER_MOMENTARY(4),
[4] = ACTION_LAYER_MOMENTARY(5),
[5] = ACTION_LAYER_MOMENTARY(6),
[6] = ACTION_LAYER_MOMENTARY(7),
[7] = ACTION_LAYER_TOGGLE(1),
[8] = ACTION_LAYER_TOGGLE(2),
[9] = ACTION_LAYER_TOGGLE(3),
[10] = ACTION_LAYER_TAP_TOGGLE(1),
[11] = ACTION_LAYER_TAP_TOGGLE(2),
[12] = ACTION_LAYER_TAP_TOGGLE(3),
[13] = ACTION_LAYER_TAP_KEY(1, KC_BSLASH),
[14] = ACTION_LAYER_TAP_KEY(2, KC_TAB),
[15] = ACTION_LAYER_TAP_KEY(3, KC_ENTER),
[16] = ACTION_LAYER_TAP_KEY(4, KC_SPACE),
[17] = ACTION_LAYER_TAP_KEY(5, KC_SCOLON),
[18] = ACTION_LAYER_TAP_KEY(6, KC_QUOTE),
[19] = ACTION_LAYER_TAP_KEY(7, KC_SLASH),
[20] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_SPACE),
[21] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_SPACE),
[22] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_QUOTE),
[23] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENTER),
[24] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_ESC),
[25] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_BSPACE),
[26] = ACTION_MODS_ONESHOT(MOD_LCTL),
[27] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_ESC),
[28] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPACE),
[29] = ACTION_MODS_ONESHOT(MOD_LSFT),
[30] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_GRAVE),
[31] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_BSLASH),
};
#else
const uint16_t fn_actions[] PROGMEM = {};
#endif

2
keyboard/alps64/matrix.c
View file

@ -157,7 +157,7 @@ static void unselect_rows(void)
DDRD &= ~0b01111111;
PORTD &= ~0b01111111;
DDRC &= ~0b00000100;
PORTD &= ~0b00000100;
PORTC &= ~0b00000100;
}
static void select_row(uint8_t row)

5
keyboard/hhkb/Makefile.keymap_editor Normal file
View file

@ -0,0 +1,5 @@
# build firmware for keymap editor
#
KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
include Makefile

4
keyboard/hhkb/Makefile.rn42
View file

@ -108,12 +108,12 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
#NKRO_ENABLE = yes # USB Nkey Rollover
NKRO_ENABLE = yes # USB Nkey Rollover
#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
#HHKB_JP = yes # HHKB JP support

5
keyboard/hhkb/Makefile.rn42.keymap_editor Normal file
View file

@ -0,0 +1,5 @@
# build firmware for keymap editor
#
KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
include Makefile.rn42

2
keyboard/hhkb/config_rn42.h
View file

@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ONESHOT_TIMEOUT 300
/* Boot Magic salt key: Space */
#define BOOTMAGIC_KEY_SALT KC_FN6
#define BOOTMAGIC_KEY_SALT KC_SPACE
/* power control of key switch board */
#define HHKB_POWER_SAVING

69
keyboard/hhkb/doc/HHKB_keycodes.txt Normal file
View file

@ -0,0 +1,69 @@
HHKB keycodes
=============
2015/10/03
Looked into unclear keycodes(usages) of Fn-chording-key on HHKB.
Followings are usages of Keyboard/Keypad Page(0x07) that HHKB spits out when Fn key is down.
## HHK mode(Off-Off)
Key Usage
------------------------
⌘ / ◇ 0x78 Stop
## Lite Ext. mode(On-Off)
## Mac mode(Off-On)
Key Usage
------------------------
Esc 0x66 Power
A 0x81 Volume Down
S 0x80 Volume Up
D 0x7F Mute
F 0x6F F20
Delete 0x53 Num Lock and Clear
## Secret mode(On-On)
Key Usage
------------------------
Esc 0x66 Power
Q 0x78 Stop
W 0x7E Find
E 0x74 Execute
R 0x77 Select
T 0x76 Menu
Y 0x75 Help
Z 0x7A Undo
X 0x7B Cut
C 0x7C Copy
V 0x7D Paste
B 0x79 Again
## Matrix Key-Mode
Mode
-------------------------------
Key HHK Lite Mac Secret Desc
---------------------------------------------------------------------------------------
⌘ / ◇ 0x78 - - - Stop
Esc - - 0x66 0x66 Power
A - - 0x81 - Volume Down
S - - 0x80 - Volume Up
D - - 0x7F - Mute
F - - 0x6F - F20
Delete 0x2A 0x2A 0x53 0x2A Num Lock and Clear(0x53)/Backspace(0x2A)
Q - - - 0x78 Stop
W - - - 0x7E Find
E - - - 0x74 Execute
R - - - 0x77 Select
T - - - 0x76 Menu
Y - - - 0x75 Help
Z - - - 0x7A Undo
X - - - 0x7B Cut
C - - - 0x7C Copy
V - - - 0x7D Paste
B - - - 0x79 Again
EOF

10
keyboard/hhkb/keymap_hhkb.c
View file

@ -68,9 +68,9 @@ const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
[10] = ACTION_LAYER_TAP_TOGGLE(1),
[11] = ACTION_LAYER_TAP_TOGGLE(2),
[12] = ACTION_LAYER_TAP_TOGGLE(3),
[13] = ACTION_LAYER_TAP_KEY(1, KC_A),
[14] = ACTION_LAYER_TAP_KEY(2, KC_F),
[15] = ACTION_LAYER_TAP_KEY(3, KC_J),
[13] = ACTION_LAYER_TAP_KEY(1, KC_BSLASH),
[14] = ACTION_LAYER_TAP_KEY(2, KC_TAB),
[15] = ACTION_LAYER_TAP_KEY(3, KC_ENTER),
[16] = ACTION_LAYER_TAP_KEY(4, KC_SPACE),
[17] = ACTION_LAYER_TAP_KEY(5, KC_SCOLON),
[18] = ACTION_LAYER_TAP_KEY(6, KC_QUOTE),
@ -85,8 +85,8 @@ const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
[27] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_ESC),
[28] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPACE),
[29] = ACTION_MODS_ONESHOT(MOD_LSFT),
[30] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ESC),
[31] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_BSPACE),
[30] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_GRAVE),
[31] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_BSLASH),
};
#else
const uint16_t fn_actions[] PROGMEM = {

7
keyboard/hhkb/rn42/MEMO.txt
View file

@ -2,6 +2,13 @@ Memo of deveopment
==================
just memo, NOT WORTH READING
2015/11/24
JP Bluetooth:
RN-42 cannot send Japanese keys like; henkan, mu-henkan and kana, JPY and RO.
It seems HID usage more than 0x65 cannot be send with the module.
http://shiki.esrille.com/2014/07/bluetoothnisse.html
Bug:
- Factory Reset PIO4 doesn't work
- the reason is unclear - 12/08 NOT LOOK INTO ANY MORE

26
keyboard/hhkb/rn42/rn42.c
View file

@ -184,20 +184,20 @@ static void send_system(uint16_t data)
static uint16_t usage2bits(uint16_t usage)
{
switch (usage) {
case AC_HOME: return 0x01;
case AL_EMAIL: return 0x02;
case AC_SEARCH: return 0x04;
case AC_HOME: return 0x01;
case AL_EMAIL: return 0x02;
case AC_SEARCH: return 0x04;
//case AL_KBD_LAYOUT: return 0x08; // Apple virtual keybaord toggle
case AUDIO_VOL_UP: return 0x10;
case AUDIO_VOL_DOWN: return 0x20;
case AUDIO_MUTE: return 0x40;
case TRANSPORT_PLAY_PAUSE: return 0x80;
case TRANSPORT_NEXT_TRACK: return 0x100;
case TRANSPORT_PREV_TRACK: return 0x200;
case TRANSPORT_STOP: return 0x400;
case TRANSPORT_STOP_EJECT: return 0x800;
//case return 0x1000; // Fast forward
//case return 0x2000; // Rewind
case AUDIO_VOL_UP: return 0x10;
case AUDIO_VOL_DOWN: return 0x20;
case AUDIO_MUTE: return 0x40;
case TRANSPORT_PLAY_PAUSE: return 0x80;
case TRANSPORT_NEXT_TRACK: return 0x100;
case TRANSPORT_PREV_TRACK: return 0x200;
case TRANSPORT_STOP: return 0x400;
case TRANSPORT_STOP_EJECT: return 0x800;
case TRANSPORT_FAST_FORWARD: return 0x1000;
case TRANSPORT_REWIND: return 0x2000;
//case return 0x4000; // Stop/eject
//case return 0x8000; // Internet browser
};