diff options
| author | Kaleb Elwert <belak@coded.io> | 2017-06-15 12:46:25 -0700 |
|---|---|---|
| committer | Kaleb Elwert <belak@coded.io> | 2017-06-15 12:46:25 -0700 |
| commit | b56a9a98990e5b28c5e5054b89c9b5f45a5290f8 (patch) | |
| tree | 8d131ea87deeee458c3a858779e4361b02c8e7c1 | |
| parent | e32e7dc0f52e1f62a61e3cf81e4a4c23fad2dbc3 (diff) | |
| download | qmk_firmware-b56a9a98990e5b28c5e5054b89c9b5f45a5290f8.tar.gz qmk_firmware-b56a9a98990e5b28c5e5054b89c9b5f45a5290f8.zip | |
tv44: update jeebak keymap to use new macros and remove custom ones
| -rw-r--r-- | keyboards/tv44/keymaps/jeebak/config.h | 21 | ||||
| -rw-r--r-- | keyboards/tv44/keymaps/jeebak/keymap.c | 18 |
2 files changed, 9 insertions, 30 deletions
diff --git a/keyboards/tv44/keymaps/jeebak/config.h b/keyboards/tv44/keymaps/jeebak/config.h deleted file mode 100644 index a59ef2b70..000000000 --- a/keyboards/tv44/keymaps/jeebak/config.h +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | #ifndef CONFIG_USER_H | ||
| 2 | #define CONFIG_USER_H | ||
| 3 | |||
| 4 | #include "../../config.h" | ||
| 5 | |||
| 6 | /** | ||
| 7 | *TV44 keymap definition macro | ||
| 8 | */ | ||
| 9 | #define KEYMAP_TV44( \ | ||
| 10 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, \ | ||
| 11 | K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, \ | ||
| 12 | K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, \ | ||
| 13 | K37, K38, K39, K40, K41, K42, K43, K44 \ | ||
| 14 | ) { \ | ||
| 15 | { K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, }, \ | ||
| 16 | { K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, }, \ | ||
| 17 | { K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, }, \ | ||
| 18 | { K37, K38, K39, K40, KC_NO, KC_NO, KC_NO, K41, K42, K43, KC_NO, K44 } \ | ||
| 19 | } | ||
| 20 | |||
| 21 | #endif | ||
diff --git a/keyboards/tv44/keymaps/jeebak/keymap.c b/keyboards/tv44/keymaps/jeebak/keymap.c index 0d0c07164..6cfa695ce 100644 --- a/keyboards/tv44/keymaps/jeebak/keymap.c +++ b/keyboards/tv44/keymaps/jeebak/keymap.c | |||
| @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 91 | * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | | 91 | * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | |
| 92 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' | 92 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' |
| 93 | */ | 93 | */ |
| 94 | [_QWERTY] = KEYMAP_TV44( | 94 | [_QWERTY] = KEYMAP( |
| 95 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ | 95 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ |
| 96 | HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC , | 96 | HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC , |
| 97 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ | 97 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ |
| @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 113 | * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | | 113 | * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | |
| 114 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' | 114 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' |
| 115 | */ | 115 | */ |
| 116 | [_COLEMAK] = KEYMAP_TV44( | 116 | [_COLEMAK] = KEYMAP( |
| 117 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ | 117 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ |
| 118 | HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC , | 118 | HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC , |
| 119 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ | 119 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ |
| @@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 135 | * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | | 135 | * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | |
| 136 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' | 136 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' |
| 137 | */ | 137 | */ |
| 138 | [_DVORAK] = KEYMAP_TV44( | 138 | [_DVORAK] = KEYMAP( |
| 139 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ | 139 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ |
| 140 | HPR_TAB,KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC , | 140 | HPR_TAB,KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC , |
| 141 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ | 141 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ |
| @@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 157 | * | Brite | | | | | | Vol- | Mute | | 157 | * | Brite | | | | | | Vol- | Mute | |
| 158 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' | 158 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' |
| 159 | */ | 159 | */ |
| 160 | [_LOWER] = KEYMAP_TV44( | 160 | [_LOWER] = KEYMAP( |
| 161 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ | 161 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ |
| 162 | KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC , | 162 | KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC , |
| 163 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ | 163 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ |
| @@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 179 | * | Brite | | | | | | Vol- | Mute | | 179 | * | Brite | | | | | | Vol- | Mute | |
| 180 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' | 180 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' |
| 181 | */ | 181 | */ |
| 182 | [_RAISE] = KEYMAP_TV44( | 182 | [_RAISE] = KEYMAP( |
| 183 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ | 183 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ |
| 184 | KC_0 , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC , | 184 | KC_0 , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC , |
| 185 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ | 185 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ |
| @@ -205,7 +205,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 205 | * seem to work on Mac. Presumably they'll work under Windows. | 205 | * seem to work on Mac. Presumably they'll work under Windows. |
| 206 | */ | 206 | */ |
| 207 | 207 | ||
| 208 | [_TOUCHCURSOR] = KEYMAP_TV44( | 208 | [_TOUCHCURSOR] = KEYMAP( |
| 209 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ | 209 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ |
| 210 | ALT_TAB,CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD, KC_INS, KC_HOME, KC_UP, KC_END, KC_BSPC, _______ , | 210 | ALT_TAB,CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD, KC_INS, KC_HOME, KC_UP, KC_END, KC_BSPC, _______ , |
| 211 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ | 211 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ |
| @@ -228,7 +228,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 228 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' | 228 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' |
| 229 | */ | 229 | */ |
| 230 | 230 | ||
| 231 | [_MOUSECURSOR] = KEYMAP_TV44( | 231 | [_MOUSECURSOR] = KEYMAP( |
| 232 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ | 232 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ |
| 233 | _______,_______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______ , | 233 | _______,_______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______ , |
| 234 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ | 234 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ |
| @@ -251,7 +251,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 251 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' | 251 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' |
| 252 | */ | 252 | */ |
| 253 | 253 | ||
| 254 | [_PLOVER] = KEYMAP_TV44( | 254 | [_PLOVER] = KEYMAP( |
| 255 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ | 255 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ |
| 256 | KC_1 , KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , | 256 | KC_1 , KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , |
| 257 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ | 257 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ |
| @@ -273,7 +273,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 273 | * | | | | | | | | Reset | | 273 | * | | | | | | | | Reset | |
| 274 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' | 274 | * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' |
| 275 | */ | 275 | */ |
| 276 | [_ADJUST] = KEYMAP_TV44( | 276 | [_ADJUST] = KEYMAP( |
| 277 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ | 277 | /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ |
| 278 | _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , | 278 | _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , |
| 279 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ | 279 | /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ |
