Compare commits

..
2 Commits
Author SHA1 Message Date
MechMerlin bef554d18b Bug: Users had to be in the /util directory to run the script (#4228) 2018-10-24 08:57:08 -07:00
Callum Oakley 9ed0c2d57b Keymap update (#4223)
* change window focus shortcuts

* hangul

* macos goodness

* re-arrange tab keys

* remove tab switching keys

* left hand func

* glorious macro pad

* workspace rotation keys

* tabbing hotkeys

* left hand tab change keys

* SEND_STRING("!") on KC_EXLM

* use SEND_STRING for all shifted symbols

* SEND_STRING even for non shifted symbols so they play nicely with the shifted ones
2018-10-23 16:28:40 -07:00
2 changed files with 67 additions and 9 deletions

No files matched your search

+66 -8
View File
@@ -172,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
* |Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |VolDn| * |Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |VolDn|
* |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
* | | F21 | F22 | F23 | F24 | | | | |Clmak|Qwrty| | * | | | |TabL |TabR | | | | |Clmak|Qwrty| |
* |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----| * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
* | | | | |Prev |Mute |Play |Next | | | | | * | | | | |Prev |Mute |Play |Next | | | | |
* `-----------------------------------------------------------------------' * `-----------------------------------------------------------------------'
@@ -189,8 +189,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_F18, KC_F19, KC_F20, KC_VOLD KC_F18, KC_F19, KC_F20, KC_VOLD
}, },
{ {
_______, KC_F21, KC_F22, KC_F23, _______, XXXXXXX, XXXXXXX, SC(KC_TAB),
KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, C(KC_TAB), XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, COLEMAK, QWERTY, _______ XXXXXXX, COLEMAK, QWERTY, _______
}, },
{ {
@@ -229,13 +229,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
set_colemak(); set_colemak();
} }
return false; return false;
break;
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
set_qwerty(); set_qwerty();
} }
return false; return false;
break;
case SYMB: case SYMB:
if (record->event.pressed) { if (record->event.pressed) {
layer_on(_SYMB); layer_on(_SYMB);
@@ -243,7 +241,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
layer_off(_SYMB); layer_off(_SYMB);
} }
return false; return false;
break;
case MOVE: case MOVE:
if (record->event.pressed) { if (record->event.pressed) {
layer_on(_MOVE); layer_on(_MOVE);
@@ -251,7 +248,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
layer_off(_MOVE); layer_off(_MOVE);
} }
return false; return false;
break;
case FUNC: case FUNC:
if (record->event.pressed) { if (record->event.pressed) {
layer_on(_FUNC); layer_on(_FUNC);
@@ -259,7 +255,69 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
layer_off(_FUNC); layer_off(_FUNC);
} }
return false; return false;
break;
// Override the defualt auto shifted symbols to use SEND_STRING
// See https://github.com/qmk/qmk_firmware/issues/4072
case KC_EXLM:
if (record->event.pressed) { SEND_STRING("!"); }
return false;
case KC_AT:
if (record->event.pressed) { SEND_STRING("@"); }
return false;
case KC_HASH:
if (record->event.pressed) { SEND_STRING("#"); }
return false;
case KC_DLR:
if (record->event.pressed) { SEND_STRING("$"); }
return false;
case KC_PERC:
if (record->event.pressed) { SEND_STRING("%"); }
return false;
case KC_CIRC:
if (record->event.pressed) { SEND_STRING("^"); }
return false;
case KC_AMPR:
if (record->event.pressed) { SEND_STRING("&"); }
return false;
case KC_ASTR:
if (record->event.pressed) { SEND_STRING("*"); }
return false;
case KC_LPRN:
if (record->event.pressed) { SEND_STRING("("); }
return false;
case KC_RPRN:
if (record->event.pressed) { SEND_STRING(")"); }
return false;
case KC_TILD:
if (record->event.pressed) { SEND_STRING("~"); }
return false;
case KC_GRV:
if (record->event.pressed) { SEND_STRING("`"); }
return false;
case KC_PLUS:
if (record->event.pressed) { SEND_STRING("+"); }
return false;
case KC_EQL:
if (record->event.pressed) { SEND_STRING("="); }
return false;
case KC_PIPE:
if (record->event.pressed) { SEND_STRING("|"); }
return false;
case KC_BSLS:
if (record->event.pressed) { SEND_STRING("\\"); }
return false;
case KC_LBRC:
if (record->event.pressed) { SEND_STRING("["); }
return false;
case KC_RBRC:
if (record->event.pressed) { SEND_STRING("]"); }
return false;
case KC_LCBR:
if (record->event.pressed) { SEND_STRING("{"); }
return false;
case KC_RCBR:
if (record->event.pressed) { SEND_STRING("}"); }
return false;
} }
return true; return true;
} }
+1 -1
View File
@@ -18,7 +18,7 @@ if [ -z "$USERNAME" ]; then
exit 1 exit 1
fi fi
cd .. cd "$(dirname "$0")/.."
if [ ! -d "keyboards/$KB_PATH" ]; then if [ ! -d "keyboards/$KB_PATH" ]; then
printf "Error! keyboards/%s does not exist!\n" "$KB_PATH" printf "Error! keyboards/%s does not exist!\n" "$KB_PATH"