diff --git a/keyboards/handwired/dactyl/dactyl.h b/keyboards/handwired/dactyl/dactyl.h index 575fcf7c01..34e63f981b 100644 --- a/keyboards/handwired/dactyl/dactyl.h +++ b/keyboards/handwired/dactyl/dactyl.h @@ -23,3 +23,39 @@ extern bool i2c_initialized; void init_dactyl(void); void init_expander(void); + +/* + * LEFT HAND: LINES 38-45 + * RIGHT HAND: LINES 47-54 + */ +#define LAYOUT_dactyl( \ + \ + k00,k01,k02,k03,k04,k05, \ + k10,k11,k12,k13,k14,k15, \ + k20,k21,k22,k23,k24,k25, \ + k30,k31,k32,k33,k34,k35, \ + k42,k43,k44,k45, \ + k52,k53, \ + k54,k55, \ + \ + k06,k07,k08,k09,k0A,k0B, \ + k16,k17,k18,k19,k1A,k1B, \ + k26,k27,k28,k29,k2A,k2B, \ + k36,k37,k38,k39,k3A,k3B, \ + k47,k48,k49,k4A,k4B, \ + k5B,k56, \ + k57, \ + k5A,k59,k58 ) \ + \ + /* matrix positions */ \ + { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \ + {KC_NO,KC_NO,k42, k43, k44, k45, KC_NO, k47, k48, k49, k4A, k4B }, \ + {KC_NO,KC_NO,k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B }, \ + } + + +#endif diff --git a/keyboards/handwired/daktil/daktil.h b/keyboards/handwired/daktil/daktil.h index ffcd3a3cd8..b9088ef7c8 100644 --- a/keyboards/handwired/daktil/daktil.h +++ b/keyboards/handwired/daktil/daktil.h @@ -35,36 +35,34 @@ uint8_t init_mcp23018(void); k10,k11,k12,k13,k14,k15, \ k20,k21,k22,k23,k24,k25, \ k30,k31,k32,k33,k34,k35, \ - k40,k41,k42,k43,k44, \ - k55,k50, \ - k54, \ - k53,k52,k51, \ + k42,k43,k44,k45, \ + k52,k53, \ + k54,k55, \ \ /* right hand, spatial positions */ \ k06,k07,k08,k09,k0A,k0B, \ k16,k17,k18,k19,k1A,k1B, \ k26,k27,k28,k29,k2A,k2B, \ k36,k37,k38,k39,k3A,k3B, \ - k47,k48,k49,k4A,k4B, \ - k5B,k56, \ - k57, \ - k5A,k59,k58 ) \ + k46,k47,k48,k49, \ + k56,k57, \ + k58,k59 ) \ \ /* matrix positions */ \ { \ - { k00, k10, k20, k30, k40, k50 }, \ - { k01, k11, k21, k31, k41, k51 }, \ + { k00, k10, k20, k30, KC_NO, KC_NO }, \ + { k01, k11, k21, k31, KC_NO, KC_NO }, \ { k02, k12, k22, k32, k42, k52 }, \ { k03, k13, k23, k33, k43, k53 }, \ { k04, k14, k24, k34, k44, k54 }, \ - { k05, k15, k25, k35, KC_NO, k55 }, \ + { k05, k15, k25, k35, k45, k55 }, \ \ - { k06, k16, k26, k36, KC_NO, k56 }, \ + { k06, k16, k26, k36, k46, k56 }, \ { k07, k17, k27, k37, k47, k57 }, \ { k08, k18, k28, k38, k48, k58 }, \ { k09, k19, k29, k39, k49, k59 }, \ - { k0A, k1A, k2A, k3A, k4A, k5A }, \ - { k0B, k1B, k2B, k3B, k4B, k5B } \ + { k0A, k1A, k2A, k3A, KC_NO, KC_NO }, \ + { k0B, k1B, k2B, k3B, KC_NO, KC_NO } \ } diff --git a/keyboards/handwired/daktil/keymaps/default/keymap.c b/keyboards/handwired/daktil/keymaps/default/keymap.c index abeb11dc11..629fccad9f 100644 --- a/keyboards/handwired/daktil/keymaps/default/keymap.c +++ b/keyboards/handwired/daktil/keymaps/default/keymap.c @@ -36,31 +36,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [BASE] = LAYOUT_dactyl( // layer 0 : default // left hand - KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, - KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, - KC_LSPO, KC_A, KC_S, KC_D, KC_F, KC_G, - LT(SYMB,KC_GRV), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, - KC_TRNS, KC_TRNS, LALT(KC_LSFT), KC_INS, KC_TRNS, - - KC_BSPC, - KC_SPC, - LGUI_T(KC_ESC), - KC_HOME, - KC_END, - ALT_T(KC_APP), + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, + KC_LSPO, KC_A, KC_S, KC_D, KC_F, KC_G, + LT(SYMB,KC_GRV), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, + LALT(KC_LSFT), KC_INS, KC_SPC,KC_BSPC, + ALT_T(KC_APP), LGUI_T(KC_ESC), + KC_END, KC_HOME, // right hand KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), KC_RSPC, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH),LT(SYMB,KC_QUOT), - KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, + KC_TAB, KC_ENT, KC_LBRC, KC_RBRC, - KC_ENT, - KC_TAB, - LGUI_T(KC_ESC), - KC_RALT, - KC_PGDN, - KC_PGUP + LGUI_T(KC_ESC),KC_RALT, + KC_PGDN,KC_PGUP ), /* Keymap 1: Symbol Layer * @@ -90,19 +81,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { VRSN, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, - RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, // right hand KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_AMPR, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, KC_CIRC, KC_4, KC_5, KC_6, KC_PLUS, KC_EQL, KC_UNDS, KC_1, KC_2, KC_3, KC_MINS, KC_TRNS, - KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_DOT, KC_0, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS ), /* Keymap 2: Media and mouse keys * ,-----------------------------------------. ,-----------------------------------------. @@ -131,19 +120,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RESET, KC_TRNS, KC_WH_U, KC_MS_U, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_BTN2, KC_BTN1, - KC_BTN3, - KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_BTN2, KC_BTN1, + KC_BTN3, KC_TRNS, // right hand KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, - KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_WBAK + KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS ), }; diff --git a/lib/lufa b/lib/lufa deleted file mode 160000 index 549b97320d..0000000000 --- a/lib/lufa +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 549b97320d515bfca2f95c145a67bd13be968faa