summaryrefslogtreecommitdiff
path: root/keyboards/handwired
diff options
context:
space:
mode:
authorDanny Nguyen <danny@80pct.com>2017-03-07 23:08:44 -0500
committerDanny Nguyen <danny@80pct.com>2017-03-07 23:08:44 -0500
commit3d082382b20ab338bb7f41b33329daffc994169a (patch)
tree86c42014053bb9f638d7fba3c0810dea583d6053 /keyboards/handwired
parent7042af702057d4d129f1517712fab7f28e75b2f3 (diff)
downloadqmk_firmware-3d082382b20ab338bb7f41b33329daffc994169a.tar.gz
qmk_firmware-3d082382b20ab338bb7f41b33329daffc994169a.zip
Fix function layer actions
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/magicforce68/keymaps/default/keymap.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/keyboards/handwired/magicforce68/keymaps/default/keymap.c b/keyboards/handwired/magicforce68/keymaps/default/keymap.c
index 628249c2d8..22553f714c 100644
--- a/keyboards/handwired/magicforce68/keymaps/default/keymap.c
+++ b/keyboards/handwired/magicforce68/keymaps/default/keymap.c
@@ -4,6 +4,8 @@
#define _FN1 1
#define _FN2 2
#define KC_ KC_TRNS
+#define KC_X0 LT(_FN2, KC_GRV)
+#define KC_X1 MO(_FN1)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = KEYMAP(
@@ -12,11 +14,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*|----`----`----`----`----`----`----`----`----`----`----`----`----`--------| |----`----| */
TAB , Q , W , E , R , T , Y , U , I , O , P ,LBRC,RBRC, BSLS , DEL ,PGDN,
/*|------`----`----`----`----`----`----`----`----`----`----`----`----`------| `----`----' */
- FN0 , A , S , D , F , G , H , J , K , L ,SCLN,QUOT, ENTER ,
+ X0 , A , S , D , F , G , H , J , K , L ,SCLN,QUOT, ENTER ,
/*|-------`----`----`----`----`----`----`----`----`----`----`----`----------| ,----. */
LSFT , Z , X , C , V , B , N , M ,COMM,DOT ,SLSH, RSFT , UP ,
/*|---------`----`----`----`----`----`----`----`----`----`----`-------------.--|----|----. */
- LCTL ,LGUI ,LALT , SPACE , FN1 ,RALT ,RCTL , LEFT,DOWN,RGHT
+ LCTL ,LGUI ,LALT , SPACE , X1 ,RALT ,RCTL , LEFT,DOWN,RGHT
/*`-----+-----+-----+------------------------------+------+-----+-----' `----+----+----' */
),
@@ -49,13 +51,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-const uint16_t PROGMEM fn_actions[] = {
- [0] = LT(KC_FN2, KC_GRV),
- [1] = MO(_FN1),
- [2] = MO(_FN2),
-};
-
-
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
// MACRODOWN only works in this function