diff options
author | Jack Humbert <jack.humb@gmail.com> | 2018-06-12 10:59:35 -0400 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-06-12 10:59:35 -0400 |
commit | 998ddbb122c9d3e2a77bd4e88c881b225ca0d569 (patch) | |
tree | ca91ff7ad3c4866555d1e623fe9ea05276397e1c /keyboards/christmas_tree/keymaps/default | |
parent | c0095710a7c7e9bd94aa9f4dd814dc28d718c731 (diff) | |
parent | 06487daaddf923d635e8a528d1eb644b875a73f6 (diff) | |
download | firmware-998ddbb122c9d3e2a77bd4e88c881b225ca0d569.tar.gz firmware-998ddbb122c9d3e2a77bd4e88c881b225ca0d569.tar.bz2 firmware-998ddbb122c9d3e2a77bd4e88c881b225ca0d569.zip |
Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox
Diffstat (limited to 'keyboards/christmas_tree/keymaps/default')
-rw-r--r-- | keyboards/christmas_tree/keymaps/default/keymap.c | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/keyboards/christmas_tree/keymaps/default/keymap.c b/keyboards/christmas_tree/keymaps/default/keymap.c index 38da32628..7880fd625 100644 --- a/keyboards/christmas_tree/keymaps/default/keymap.c +++ b/keyboards/christmas_tree/keymaps/default/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "christmas_tree.h" +#include QMK_KEYBOARD_H extern keymap_config_t keymap_config; @@ -32,27 +32,35 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Base - * ,------. - * | 1 | - * ,------+------. - * | 2 | 3 | - * ,------+------+------. - * | 4 | FUNC | 6 | - * `--------------------' - */ -[_BASE] = KEYMAP(KC_1, KC_2, KC_3, KC_4, MO(_FUNC), KC_6), + /* Base + * ,------. + * | 1 | + * ,------+------. + * | 2 | 3 | + * ,------+------+------. + * | 4 | FUNC | 6 | + * `--------------------' + */ + [_BASE] = LAYOUT( + KC_1, + KC_2, KC_3, + KC_4, MO(_FUNC), KC_6 + ), -/* Func - * ,------. - * |BCKLIT| - * ,------+------. - * | 8 | 9 | - * ,------+------+------. - * | 0 | FUNC | RESET| - * `--------------------' - */ -[_FUNC] = KEYMAP(BACKLIT, KC_8, KC_9, KC_0, _______, RESET) + /* Func + * ,------. + * |BCKLIT| + * ,------+------. + * | 8 | 9 | + * ,------+------+------. + * | 0 | FUNC | RESET| + * `--------------------' + */ + [_FUNC] = LAYOUT( + BACKLIT, + KC_8, KC_9, + KC_0, _______, RESET + ) }; |