summaryrefslogtreecommitdiffstats
path: root/keyboards/iris
diff options
context:
space:
mode:
authorepaew <epaew@users.noreply.github.com>2018-11-26 18:50:45 +0100
committerDrashna Jaelre <drashna@live.com>2018-11-26 18:50:45 +0100
commitf3ffd6ad50f0a4bf24f0a0453cc5502b4b88f390 (patch)
treeba63b9851104dfc7916740af4bcee8f2476e50b3 /keyboards/iris
parent0031e461913d23e37a9aebd1da5daf1c93a149ee (diff)
downloadqmk_firmware-f3ffd6ad50f0a4bf24f0a0453cc5502b4b88f390.tar.gz
qmk_firmware-f3ffd6ad50f0a4bf24f0a0453cc5502b4b88f390.tar.xz
Keymap: Refactor edvorakjp user library (#4480)
* Refactor edvorakjp user library * add tap dance support * update keymaps * edvorakjp: add SWAP_SCLN option * fix behavior of SWAP_SCLN
Diffstat (limited to 'keyboards/iris')
-rw-r--r--keyboards/iris/keymaps/edvorakjp/config.h1
-rw-r--r--keyboards/iris/keymaps/edvorakjp/keymap.c7
2 files changed, 3 insertions, 5 deletions
diff --git a/keyboards/iris/keymaps/edvorakjp/config.h b/keyboards/iris/keymaps/edvorakjp/config.h
index cc24ffc31..1610c4b12 100644
--- a/keyboards/iris/keymaps/edvorakjp/config.h
+++ b/keyboards/iris/keymaps/edvorakjp/config.h
@@ -26,5 +26,6 @@
#define MOUSEKEY_WHEEL_TIME_TO_MAX 20
#define TAPPING_TERM 120
+#define SWAP_SCLN
#endif
diff --git a/keyboards/iris/keymaps/edvorakjp/keymap.c b/keyboards/iris/keymaps/edvorakjp/keymap.c
index 74aff9131..f5d305f7f 100644
--- a/keyboards/iris/keymaps/edvorakjp/keymap.c
+++ b/keyboards/iris/keymaps/edvorakjp/keymap.c
@@ -1,7 +1,4 @@
#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
-
#include "edvorakjp.h"
enum custom_keycodes {
@@ -32,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,----+----+----+----+----+----. ,----+----+----+----+----+----.
GRV ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
//|----+----+----+----+----+----| |----+----+----+----+----+----|
- LBRC,RBRC,COMM,DOT , P , Y , F , G , R , W , Q ,BSLS,
+ LBRC,RBRC,COMM,DOT , Y , P , F , G , R , W , Q ,BSLS,
//|----+----+----+----+----+----| |----+----+----+----+----+----|
EQL , A , O , E , I , U , D , T , N , S , M ,MINS,
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
@@ -134,7 +131,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case KC_LOCK:
if (record->event.pressed) {
- if (edvorakjp_config.enable_kc_lang) {
+ if (get_enable_kc_lang()) {
SEND_STRING( SS_LCTRL(SS_LSFT(SS_TAP(X_POWER))) );
} else {
SEND_STRING( SS_LGUI("l") );