@@ -1,5 +1,5 @@ | |||
# Target file name (without extension). | |||
TARGET = m0110_pjrc | |||
TARGET = m0110_lufa | |||
# Directory common source filess exist | |||
TMK_DIR = ../../tmk_core | |||
@@ -10,13 +10,14 @@ TARGET_DIR = . | |||
# keyboard dependent files | |||
SRC = matrix.c \ | |||
led.c \ | |||
keymap_common.c \ | |||
m0110.c | |||
# To use own keymap file run make like: make keymap=hasu | |||
ifdef keymap | |||
SRC += keymap_$(keymap).c | |||
ifdef KEYMAP | |||
SRC += keymap_$(KEYMAP).c | |||
else | |||
SRC += keymap.c | |||
SRC += keymap_default.c | |||
endif | |||
CONFIG_H = config.h | |||
@@ -24,10 +25,8 @@ CONFIG_H = config.h | |||
# MCU name, you MUST set this to match the board you are using | |||
# type "make clean" after changing this, so all files will be rebuilt | |||
#MCU = at90usb162 # Teensy 1.0 | |||
MCU = atmega32u4 # Teensy 2.0 | |||
#MCU = at90usb646 # Teensy++ 1.0 | |||
#MCU = at90usb1286 # Teensy++ 2.0 | |||
#MCU = atmega32u2 # TMK converter rev2 | |||
MCU = atmega32u4 # TMK converter rev1 | |||
# Processor frequency. | |||
@@ -38,6 +37,29 @@ MCU = atmega32u4 # Teensy 2.0 | |||
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 | |||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
# Boot Section Size in bytes | |||
# Teensy halfKay 512 | |||
# Atmel DFU loader 4096 | |||
@@ -55,6 +77,7 @@ CONSOLE_ENABLE = yes # Console for debug(+400) | |||
COMMAND_ENABLE = yes # Commands for debug and configuration | |||
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | |||
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA | |||
#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor | |||
@@ -67,7 +90,7 @@ VPATH += $(TARGET_DIR) | |||
VPATH += $(TMK_DIR) | |||
include $(TMK_DIR)/protocol/pjrc.mk | |||
include $(TMK_DIR)/protocol/lufa.mk | |||
include $(TMK_DIR)/protocol.mk | |||
include $(TMK_DIR)/common.mk | |||
include $(TMK_DIR)/rules.mk |
@@ -0,0 +1,96 @@ | |||
# Target file name (without extension). | |||
TARGET = m0110_lufa | |||
# Directory common source filess exist | |||
TMK_DIR = ../../tmk_core | |||
# Directory keyboard dependent files exist | |||
TARGET_DIR = . | |||
# keyboard dependent files | |||
SRC = matrix.c \ | |||
led.c \ | |||
keymap_common.c \ | |||
m0110.c | |||
# To use own keymap file run make like: make keymap=hasu | |||
ifdef KEYMAP | |||
SRC += keymap_$(KEYMAP).c | |||
else | |||
SRC += keymap_default.c | |||
endif | |||
CONFIG_H = config.h | |||
# MCU name, you MUST set this to match the board you are using | |||
# type "make clean" after changing this, so all files will be rebuilt | |||
MCU = atmega32u2 # TMK converter rev2 | |||
#MCU = atmega32u4 # TMK converter rev1 | |||
# Processor frequency. | |||
# Normally the first thing your program should do is set the clock prescaler, | |||
# so your program will run at the correct speed. You should also set this | |||
# variable to same clock speed. The _delay_ms() macro uses this, and many | |||
# examples use this variable to calculate timings. Do not add a "UL" here. | |||
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 | |||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
# Boot Section Size in bytes | |||
# Teensy halfKay 512 | |||
# Atmel DFU loader 4096 | |||
# LUFA bootloader 4096 | |||
OPT_DEFS += -DBOOTLOADER_SIZE=4096 | |||
# Build Options | |||
# *Comment out* to disable the options. | |||
# | |||
#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | |||
MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | |||
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | |||
CONSOLE_ENABLE = yes # Console for debug(+400) | |||
COMMAND_ENABLE = yes # Commands for debug and configuration | |||
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | |||
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA | |||
#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor | |||
#---------------- Programming Options -------------------------- | |||
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex | |||
# Search Path | |||
VPATH += $(TARGET_DIR) | |||
VPATH += $(TMK_DIR) | |||
include $(TMK_DIR)/protocol/lufa.mk | |||
include $(TMK_DIR)/protocol.mk | |||
include $(TMK_DIR)/common.mk | |||
include $(TMK_DIR)/rules.mk |
@@ -59,19 +59,16 @@ To compile firmware you need AVR GCC. You can edit *Makefile* and *config.h* to | |||
$ git clone git://github.com/tmk/tmk_keyboard.git (or download source) | |||
$ cd m0110_usb | |||
$ make -f Makefile clean | |||
$ make -f Makefile [KEYMAP={default|plain|intl|spacefn|hasu}] | |||
$ make -f Makefile.rev2 clean | |||
$ make -f Makefile.rev2 [KEYMAP={default|intl|spacefn|hasu}] | |||
Use `Makefile.teensy` instead for Teensy. | |||
Use `Maefile.tmk_rev1` for TMK converter Rev.1, `Makefile.teensy` for Teensy instead. | |||
Keymap | |||
------ | |||
To create your own keymap copy existent keymap file to `keymap_name.c` and edit it. You can build it like this. | |||
$ make -f Makefile clean | |||
$ make -f Makefile KEYMAP=name | |||
To create your own keymap copy existent keymap file to `keymap_name.c` and edit it. | |||
@@ -1,5 +1,5 @@ | |||
/* | |||
Copyright 2011,2012,2014 Jun Wako <[email protected]> | |||
Copyright 2011,2012,2014,2015 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 | |||
@@ -24,64 +24,49 @@ extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
extern const uint16_t fn_actions[]; | |||
/* | |||
* The keymap works with both M0110 and M0110A keyboards. As you can see, the M0110A is a superset | |||
* of the M0110 keyboard, with only one exception: 'Enter' in M0110 does not exist | |||
* on the M0110A, but since it generates a unique scan code which is not used for some other key in | |||
* the M0110A, they are totally interchangeable. In fact, the M0110A is functionally (almost) | |||
* identical to the combination of the M0110 along with the M0120 keypad. The only difference | |||
* (which is causing some problems as you will read below) is that the M0110+M0120 don't have | |||
* dedicated arrow keys, while the M0110A does. However, the M0120 did have arrow keys, which | |||
* doubled as the [comma], [/], [*] and [+] keys, when used with the [Shift] key. The M0110A has | |||
* substituted the [comma] key with the [=] key, however its scancode is the same. | |||
/* Common layout for M0110 and M0110A | |||
* This keymap works with both keyboards. As you can see, the M0110A is | |||
* a superset of M0110 keyboard, only one exception is 'Enter'(34) of M0110 | |||
* does not exist on the M0110A. | |||
* | |||
* Physical layout: | |||
* M0110A | |||
* ,---------------------------------------------------------. ,---------------. | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Bcksp| |Clr| =| /| *| | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| =| /| *| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -| | |||
* |-----------------------------------------------------' | |---------------| | |||
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| | | |||
* |---------------------------------------------------------' |-----------|Ent| | |||
* |Opt |Mac | Space | \|Lft|Rgt|Dn | | 0| .| | | |||
* |---------------------------------------------------------| |-----------|Ent| | |||
* |Opt |Mac | Space |Ent| \|Lft|Rgt|Dn | | 0| .| | | |||
* `---------------------------------------------------------' `---------------' | |||
* | |||
* M0110 M0120 | |||
* M0110A scan codes | |||
* ,---------------------------------------------------------. ,---------------. | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| -| +| *| | |||
* | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | 47| 68| 6D| 62| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | 7| 8| 9| /| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| ,| | |||
* | 30| 0C| 0D| 0E| 0F| 10| 11| 20| 22| 1F| 23| 21| 1E| | | 59| 5B| 5C| 4E| | |||
* |-----------------------------------------------------' | |---------------| | |||
* | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | 56| 57| 58| 66| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | | 1| 2| 3| | | |||
* `---------------------------------------------------------' |-----------|Ent| | |||
* |Opt|Mac | Space |Ent |Opt| | 0| .| | | |||
* `-----------------------------------------------' `---------------' | |||
* With Shift keys on M0120 work as curosor.(-:Left *:Right /:Up ,:Down) | |||
* | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 38| 4D| | 53| 54| 55| | | |||
* `---------------------------------------------------------' |-----------| 4C| | |||
* | 3A| 37| 31 | 2A| 46| 42| 48| | 52| 41| | | |||
* `---------------------------------------------------------' `---------------' | |||
* | |||
* NOTE: \ is located differently. | |||
* NOTE: Enter on M0110 is different from Enter on keypad(M0120 and M0110A). | |||
* NOTE: Left Shift and right Shift are logically same key. | |||
* NOTE: Left Option and right Option are logically same key. | |||
*/ | |||
/* Keymap definition Macro | |||
* M0110 + M0120 scan codes | |||
* ,---------------------------------------------------------. ,---------------. | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| =| /| *| | |||
* | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | 47| 68| 6D| 62| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -| | |||
* |-----------------------------------------------------' | |---------------| | |||
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +| | |||
* | 30| 0C| 0D| 0E| 0F| 10| 11| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| | | |||
* |---------------------------------------------------------| |-----------|Ent| | |||
* |Opt |Mac | Space |Ent| \|Lft|Rgt|Dn | | 0| .| | | |||
* `---------------------------------------------------------' `---------------' | |||
* NOTE: Ent between Space and \ means Enter on M0110. | |||
* | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | 56| 57| 58| 66| | |||
* |---------------------------------------------------------| |---------------| | |||
* | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 38| | 53| 54| 55| | | |||
* `---------------------------------------------------------' |-----------| 4C| | |||
* | 3A| 37| 31 | 34| 3A| | 52| 41| | | |||
* `------------------------------------------------' `---------------' | |||
* Two right and left keys of 38 and 3A are identical, you cannot discriminate those two. | |||
*/ | |||
#define KEYMAP( \ | |||
K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K47,K68,K6D,K62, \ | |||
@@ -106,25 +91,30 @@ extern const uint16_t fn_actions[]; | |||
{ KC_##K68, KC_NO, KC_NO, KC_NO, KC_NO, KC_##K6D, KC_NO, KC_NO }, \ | |||
} | |||
/* International keyboard | |||
* ,---------------------------------------------------------. | |||
* | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | |||
* |---------------------------------------------------------| | |||
* | 30| 0C| 0D| 0E| 0F| 10| 11| 20| 22| 1F| 23| 21| 1E| 2A| | |||
* |------------------------------------------------------, | | |||
* | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | | |||
* |---------------------------------------------------------| | |||
* | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 0A| 38| | |||
* `---------------------------------------------------------' | |||
* | 3A| 37| 34 | 31| 3A| | |||
* `------------------------------------------------' | |||
/* International keyboard layout for M0110 + M0120 | |||
* https://en.wikipedia.org/wiki/File:Apple_Macintosh_Plus_Keyboard.jpg | |||
* Probably International keyboard layout of M0110A doesn't exist. | |||
* | |||
* M0110 + M0120 scan codes | |||
* ,---------------------------------------------------------. ,---------------. | |||
* | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | 47| 68| 6D| 62| | |||
* |---------------------------------------------------------| |---------------| | |||
* | 30| 0C| 0D| 0E| 0F| 10| 11| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E| | |||
* |------------------------------------------------------, | |---------------| | |||
* | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | | 56| 57| 58| 66| | |||
* |---------------------------------------------------------| |---------------| | |||
* | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 0A| 38| | 53| 54| 55| | | |||
* `---------------------------------------------------------' |-----------| 4C| | |||
* | 3A| 37| 34 | 31| 3A| | 52| 41| | | |||
* `------------------------------------------------' `---------------' | |||
* Two right and left keys of 38 and 3A are identical, you cannot discriminate those two. | |||
*/ | |||
#define KEYMAP_INTL( \ | |||
K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K47,K68,K6D,K62, \ | |||
K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A, K59,K5B,K5C,K4E, \ | |||
K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27,K24, K56,K57,K58,K66, \ | |||
K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C,K0A, K4D, K53,K54,K55,K4C, \ | |||
K3A,K37, K34, K31, K46,K42,K48, K52, K41 \ | |||
K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C,K0A, K53,K54,K55,K4C, \ | |||
K3A,K37, K34, K31, K52, K41 \ | |||
) { \ | |||
{ KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \ | |||
{ KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_##K0F }, \ | |||
@@ -134,8 +124,8 @@ extern const uint16_t fn_actions[]; | |||
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F }, \ | |||
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_NO, KC_NO, KC_##K37 }, \ | |||
{ KC_##K38, KC_##K39, KC_##K3A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | |||
{ KC_NO, KC_##K41, KC_##K42, KC_NO, KC_NO, KC_NO, KC_##K46, KC_##K47 }, \ | |||
{ KC_##K48, KC_NO, KC_NO, KC_NO, KC_##K4C, KC_##K4D, KC_##K4E, KC_NO }, \ | |||
{ KC_NO, KC_##K41, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_##K47 }, \ | |||
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_##K4C, KC_NO, KC_##K4E, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \ | |||
{ KC_##K58, KC_##K59, KC_NO, KC_##K5B, KC_##K5C, KC_NO, KC_NO, KC_NO }, \ | |||
{ KC_NO, KC_NO, KC_##K62, KC_NO, KC_NO, KC_NO, KC_##K66, KC_NO }, \ |
@@ -20,15 +20,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
#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 | |||
/* Default: | |||
* M0110 M0120 | |||
* ,---------------------------------------------------------. ,---------------. | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Nlk| -| +| *| | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Nlk| =| /| *| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | 7| 8| 9| /| | |||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | 7| 8| 9| -| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Ctrl | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| ,| | |||
* |Ctrl | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | | 1| 2| 3| | | |||
* `---------------------------------------------------------' |-----------|Ent| | |||
@@ -52,27 +56,40 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, P7, P8, P9, PMNS, | |||
LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS, | |||
LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, UP, P1, P2, P3, PENT, | |||
LALT,LGUI, SPC, FN0, BSLS,LEFT,RGHT,DOWN, P0, PDOT | |||
LALT,LGUI, SPC, FN0, FN13,LEFT,RGHT,DOWN, P0, PDOT | |||
), | |||
/* Cursor Layer | |||
/* Cursor Layer: | |||
* M0110 M0120 | |||
* ,---------------------------------------------------------. ,---------------. | |||
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk| -| +| *| | |||
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk| =| /| *| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up | |INS| | 7| 8| 9| /| | |||
* |Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up |INS| | | 7| 8| 9| -| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Ctrl |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Return| | 4| 5| 6| ,| | |||
* |Ctrl |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Return| | 4| 5| 6| +| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift |End| |PgD| | | | |End|PgD|Dow|Shift | | 1| 2| 3| | | |||
* `---------------------------------------------------------' |-----------|Ent| | |||
* |Opt|Mac | Space |Fn |Opt| | 0| .| | | |||
* `-----------------------------------------------' `---------------' | |||
* M0110A | |||
* ,---------------------------------------------------------. ,---------------. | |||
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk| =| /| *| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up |INS| | | 7| 8| 9| -| | |||
* |-----------------------------------------------------' | |---------------| | |||
* |Ctrl |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Return| | 4| 5| 6| +| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift |End| |PgD| | | | |End|PgD|Dow|Shft|PgU| | 1| 2| 3| | | |||
* |---------------------------------------------------------| |-----------|Ent| | |||
* |Opt |Mac | Space | \|Hom|End|PgD| | 0| .| | | |||
* `---------------------------------------------------------' `---------------' | |||
*/ | |||
[1] = KEYMAP( | |||
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST, | |||
CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, NO, P7, P8, P9, PMNS, | |||
CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, INS, P7, P8, P9, PMNS, | |||
LCTL,LEFT,DOWN,RGHT,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, ENT, P4, P5, P6, PPLS, | |||
LSFT,END, NO, PGDN,NO, NO, NO, NO, END, PGDN,DOWN, PGUP, P1, P2, P3, PENT, | |||
LALT,LGUI, SPC, FN0, INS, HOME,END, PGDN, P0, PDOT | |||
LALT,LGUI, SPC, FN0, FN13,HOME,END, PGDN, P0, PDOT | |||
), | |||
}; | |||
@@ -80,6 +97,41 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
/* | |||
* Fn action definition | |||
*/ | |||
#ifdef KEYMAP_SECTION_ENABLE | |||
const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
#else | |||
const uint16_t fn_actions[] PROGMEM = { | |||
#endif | |||
[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_RALT, KC_BSLASH), | |||
}; |
@@ -1,118 +0,0 @@ | |||
/* | |||
Copyright 2014 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 "keycode.h" | |||
#include "keymap_common.h" | |||
#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 | |||
/* Default: | |||
* ,---------------------------------------------------------. ,---------------. | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| =| /| *| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -| | |||
* |-----------------------------------------------------' | |---------------| | |||
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Enter | | 4| 5| 6| +| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| | | |||
* |---------------------------------------------------------| |-----------|Ent| | |||
* |Ctl |Gui | Space |Alt| \|Lft|Rgt|Dn | | 0| .| | | |||
* `---------------------------------------------------------' `---------------' | |||
*/ | |||
[0] = KEYMAP( | |||
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, CLR, EQL, PSLS,PAST, | |||
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, P7, P8, P9, PMNS, | |||
LCAP,A, S, D, F, G, H, J, K, L, SCLN,QUOT, FN15, P4, P5, P6, PPLS, | |||
LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, UP, P1, P2, P3, PENT, | |||
LCTL,LGUI, FN16, LALT,FN31,LEFT,RGHT,DOWN, P0, PDOT | |||
), | |||
/* Cursor Layer(WASD, IJKL) | |||
* ,---------------------------------------------------------. ,---------------. | |||
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk| =| /| *| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up |Ins| | | 7| 8| 9| -| | |||
* |-----------------------------------------------------' | |---------------| | |||
* |Caps |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Enter | | 4| 5| 6| +| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift |End| |PgD| | | | |End|PgD|Dow|Shif|PgU| | 1| 2| 3| | | |||
* |---------------------------------------------------------| |-----------|Ent| | |||
* |Ctl |Gui | Space |Alt | \|Hom|End|PgD| | 0| .| | | |||
* `---------------------------------------------------------' `---------------' | |||
*/ | |||
[3] = KEYMAP( | |||
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST, | |||
CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, INS, P7, P8, P9, PMNS, | |||
LCAP,LEFT,DOWN,RGHT,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, FN15, P4, P5, P6, PPLS, | |||
LSFT,END, NO, PGDN,NO, NO, NO, NO, END, PGDN,DOWN, PGUP, P1, P2, P3, PENT, | |||
LCTL,LGUI, FN16, LALT,FN31,HOME,END, PGDN, P0, PDOT | |||
), | |||
[4] = KEYMAP( | |||
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST, | |||
CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, INS, P7, P8, P9, PMNS, | |||
LCAP,LEFT,DOWN,RGHT,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, FN15, P4, P5, P6, PPLS, | |||
LSFT,END, NO, PGDN,NO, NO, NO, NO, END, PGDN,DOWN, PGUP, P1, P2, P3, PENT, | |||
LCTL,LGUI, FN16, LALT,FN31,HOME,END, PGDN, P0, PDOT | |||
), | |||
[7] = {}, | |||
}; | |||
/* | |||
* Fn action definition | |||
*/ | |||
#ifdef KEYMAP_SECTION_ENABLE | |||
const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
#else | |||
const uint16_t fn_actions[] PROGMEM = { | |||
#endif | |||
[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_F), | |||
[14] = ACTION_LAYER_TAP_KEY(2, KC_J), | |||
[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_RALT, KC_BSLASH), | |||
}; |
@@ -30,29 +30,17 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
* |------------------------------------------------------, | |---------------| | |||
* |Ctrl | A| S| D| F| G| H| J| K| L| ;| '| \| | | 4| 5| 6| ,| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shif| <| Z| X| C| V| B| N| M| ,| ,| /|Shift | | 1| 2| 3| | | |||
* |Shif| <| Z| X| C| V| B| N| M| ,| ,| /| | | 1| 2| 3| | | |||
* `---------------------------------------------------------' |-----------|Ent| | |||
* |Opt|Mac | Space |Fn |Opt| | 0| .| | | |||
* |Opt|Mac | Space |Fn | | | 0| .| | | |||
* `-----------------------------------------------' `---------------' | |||
* M0110A(not existent?) | |||
* ,---------------------------------------------------------. ,---------------. | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Nlk| =| /| *| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Ret| | 7| 8| 9| -| | |||
* |------------------------------------------------------, | |---------------| | |||
* |Ctrl | A| S| D| F| G| H| J| K| L| ;| '| \| | | 4| 5| 6| +| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shif| <| Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| | | |||
* |---------------------------------------------------------| |-----------|Ent| | |||
* |Opt |Mac | Space | \|Lft|Rgt|Dn | | 0| .| | | |||
* `---------------------------------------------------------' `---------------' | |||
*/ | |||
[0] = KEYMAP_INTL( | |||
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, NLCK,EQL, PSLS,PAST, | |||
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,ENT, P7, P8, P9, PMNS, | |||
LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,BSLS, P4, P5, P6, PPLS, | |||
LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, UP, P1, P2, P3, PENT, | |||
LALT,LGUI, SPC, FN0, LEFT,RGHT,DOWN, P0, PDOT | |||
LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, P1, P2, P3, PENT, | |||
LALT,LGUI, SPC, FN0, P0, PDOT | |||
), | |||
/* Cursor Layer | |||
* ,---------------------------------------------------------. ,---------------. | |||
@@ -62,17 +50,17 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
* |------------------------------------------------------, | |---------------| | |||
* |Ctrl |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Ins| | | 4| 5| 6| ,| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shif| <|End| |PgD| | | | |End|PgD|Dow|Shift | | 1| 2| 3| | | |||
* |Shif| <|End| |PgD| | | | |End|PgD|Dow| | | 1| 2| 3| | | |||
* `---------------------------------------------------------' |-----------|Ent| | |||
* |Opt|Mac | Space |Fn |Opt| | 0| .| | | |||
* |Opt|Mac | Space |Fn | | | 0| .| | | |||
* `-----------------------------------------------' `---------------' | |||
*/ | |||
[1] = KEYMAP_INTL( | |||
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST, | |||
CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, NO, ENT, P7, P8, P9, PMNS, | |||
LCTL,LEFT,DOWN,RGHT,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT,INS, P4, P5, P6, PPLS, | |||
LSFT,NO, END, NO, PGDN,NO, NO, NO, NO, END, PGDN,DOWN, PGUP, P1, P2, P3, PENT, | |||
LALT,LGUI, SPC, FN0, HOME,END, PGDN, P0, PDOT | |||
LSFT,NO, END, NO, PGDN,NO, NO, NO, NO, END, PGDN,DOWN, P1, P2, P3, PENT, | |||
LALT,LGUI, SPC, FN0, P0, PDOT | |||
), | |||
}; | |||
@@ -1,64 +0,0 @@ | |||
/* | |||
Copyright 2014 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 "keycode.h" | |||
#include "keymap_common.h" | |||
const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
/* Default: | |||
* M0110 M0120 | |||
* ,---------------------------------------------------------. ,---------------. | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Nlk| -| +| *| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | 7| 8| 9| /| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| ,| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | | 1| 2| 3| | | |||
* `---------------------------------------------------------' |-----------|Ent| | |||
* |Opt|Mac | Space |Mac |Opt| | 0| .| | | |||
* `-----------------------------------------------' `---------------' | |||
* M0110A | |||
* ,---------------------------------------------------------. ,---------------. | |||
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Bcksp| |Nlk| =| /| *| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -| | |||
* |-----------------------------------------------------' | |---------------| | |||
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +| | |||
* |---------------------------------------------------------| |---------------| | |||
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| | | |||
* |---------------------------------------------------------' |-----------|Ent| | |||
* |Opt |Mac | Space | \|Lft|Rgt|Dn | | 0| .| | | |||
* `---------------------------------------------------------' `---------------' | |||
*/ | |||
[0] = KEYMAP( | |||
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, NLCK,PEQL,PSLS,PAST, | |||
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, P7, P8, P9, PMNS, | |||
LCAP,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS, | |||
LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, UP, P1, P2, P3, PENT, | |||
LALT,LGUI, SPC, RGUI,BSLS,LEFT,RGHT,DOWN, P0, PDOT | |||
), | |||
}; | |||
/* | |||
* Fn action definition | |||
*/ | |||
const uint16_t fn_actions[] PROGMEM = { | |||
}; | |||