aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/dilly/keymaps/delmo/keymap.c
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-06-06 11:12:42 -0700
committerDrashna Jaelre <drashna@live.com>2018-06-06 11:12:42 -0700
commitafa0a8d6f7822e1c0544aed1475ae528262987d8 (patch)
treeb2b485515df714aff587ac4620914a235ba3cfdc /keyboards/dilly/keymaps/delmo/keymap.c
parentd86410103fd48a98c086dd7e5054d7d42905b741 (diff)
downloadfirmware-afa0a8d6f7822e1c0544aed1475ae528262987d8.tar.gz
firmware-afa0a8d6f7822e1c0544aed1475ae528262987d8.tar.bz2
firmware-afa0a8d6f7822e1c0544aed1475ae528262987d8.zip
Dilly: Refactor and Configurator support (#3134)
* Refactor * Configurator support * Add LAYOUT_ortho_3x10 to default QMK layouts * Refactor Dilly to use LAYOUT_ortho_3x10
Diffstat (limited to 'keyboards/dilly/keymaps/delmo/keymap.c')
-rw-r--r--keyboards/dilly/keymaps/delmo/keymap.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/keyboards/dilly/keymaps/delmo/keymap.c b/keyboards/dilly/keymaps/delmo/keymap.c
index c0441ab67..d3e8c5daf 100644
--- a/keyboards/dilly/keymaps/delmo/keymap.c
+++ b/keyboards/dilly/keymaps/delmo/keymap.c
@@ -1,5 +1,4 @@
-#include "dilly.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
extern keymap_config_t keymap_config;
@@ -44,7 +43,7 @@ extern keymap_config_t keymap_config;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = KC_KEYMAP(
+ [_BASE] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----.
Q , W , E , R , T , Y , U , I , O , P ,
//|----+----+----+----+----+----+----+----+----+----|
@@ -54,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----'
),
- [_FN1] = KC_KEYMAP(
+ [_FN1] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----.
1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,
//|----+----+----+----+----+----+----+----+----+----|
@@ -64,17 +63,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----'
),
- [_FN2] = KC_KEYMAP(
+ [_FN2] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----.
EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,
//|----+----+----+----+----+----+----+----+----+----|
F11 ,F12 , , , , , , , ,GRV ,
//|----+----+----+----+----+----+----+----+----+----|
- , , , ,DEL , , , , ,
+ , , , ,DEL , , , , ,
//`----+----+----+----+----+----+----+----+----+----'
),
- [_FN3] = KC_KEYMAP(
+ [_FN3] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----.
ESC , , , , ,MINS,EQL ,LBRC,RBRC,BSLS,
//|----+----+----+----+----+----+----+----+----+----|
@@ -84,23 +83,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`----+----+----+----+----+----+----+----+----+----'
),
- [_FN4] = KC_KEYMAP(
+ [_FN4] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----.
, , , , ,UNDS,PLUS,LCBR,RCBR,PIPE,
//|----+----+----+----+----+----+----+----+----+----|
TAB , , , , , LT , GT ,QUES,COLN,DQUO,
//|----+----+----+----+----+----+----+----+----+----|
- , ,GUIC, ,BSPC, ,HOME,PGDN,PGUP,END
+ , ,GUIC, ,BSPC, ,HOME,PGDN,PGUP,END
//`----+----+----+----+----+----+----+----+----+----'
),
- [_FN5] = KC_KEYMAP(
+ [_FN5] = LAYOUT_kc(
//,----+----+----+----+----+----+----+----+----+----.
RTOG,RMOD, ,RST ,RHUI,RSAI,RVAI, , , ,
//|----+----+----+----+----+----+----+----+----+----|
, ,DBUG, ,RHUD,RSAD,RVAD, , , ,
//|----+----+----+----+----+----+----+----+----+----|
- BL_S, ,GUIC, , , , , , ,
+ BL_S, ,GUIC, , , , , , ,
//`----+----+----+----+----+----+----+----+----+----'
)