diff options
author | Jordan Blackbourn <blackbournj@gmail.com> | 2021-12-27 16:44:01 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-27 14:44:01 +1100 |
commit | 4d1ed37bdcb3641e35dc2324592a1f7fa0509bd2 (patch) | |
tree | ba82e59a4393976b9a617be68cf120fe57d4c54a /keyboards/orthocode/keymaps/default/keymap.c | |
parent | e91070401d0eda5e25210e9f4155fa70d0d61912 (diff) | |
download | qmk_firmware-4d1ed37bdcb3641e35dc2324592a1f7fa0509bd2.tar.gz qmk_firmware-4d1ed37bdcb3641e35dc2324592a1f7fa0509bd2.zip |
Orthocode update default keymap, and fix encoder function for keymaps built in configurator (#15161)
* Updated default keymap to match one shipping with the boards
* Fix encoder function so it works for users
of the online configurator
* Updated Info.json to match default keymap
* Changes as per review
Diffstat (limited to 'keyboards/orthocode/keymaps/default/keymap.c')
-rw-r--r-- | keyboards/orthocode/keymaps/default/keymap.c | 139 |
1 files changed, 16 insertions, 123 deletions
diff --git a/keyboards/orthocode/keymaps/default/keymap.c b/keyboards/orthocode/keymaps/default/keymap.c index ea69d01335..800886a63d 100644 --- a/keyboards/orthocode/keymaps/default/keymap.c +++ b/keyboards/orthocode/keymaps/default/keymap.c @@ -17,43 +17,36 @@ enum custom_keycodes { QWERTY = SAFE_RANGE, - SHIFTSPACE, - ILIKEFROG }; -#define KC_SHSP SHIFTSPACE -#define KC_FROG ILIKEFROG - - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Rotary */ KC__MUTE, /* esc 1 2 3 4 5 6 7 8 9 0 - = home */ - TG(2), KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_HOME, + RGB_TOG, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_HOME, /* tab Q W E R T Y U I O P \ delete end */ - RGB_TOG, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_DEL, KC_END, + RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_DEL, KC_END, /* caps A S D F G H J K L ; ' enter */ - RGB_MOD, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + RGB_RMOD, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, /* shift Z X C V B N M , . / up */ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */ - KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_RSFT, KC_ENT, KC_BSPC, KC_SHSP, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_RSFT, KC_ENT, KC_BSPC, KC_SPC, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), [1] = LAYOUT( /* Rotary */ - KC_TRNS, - /* esc 1 2 3 4 5 6 7 8 9 0 - = home */ - TG(3), KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, - /* tab Q W E R T Y U I O P \ delete end */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, - /* caps A S D F G H J K L ; ' enter */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, - /* shift Z X C V B N M , . / up */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, LSFT(KC_EQL), LSFT(KC_9), LSFT(KC_0), KC_TRNS, KC_VOLU, - /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS + TG(2), + /* esc 1 2 3 4 5 6 7 8 9 0 - = home */ + KC_TRNS, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, + /* tab Q W E R T Y U I O P \ delete end */ + RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, + /* caps A S D F G H J K L ; ' enter */ + RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, + /* shift Z X C V B N M , . / up */ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, LSFT(KC_EQL), LSFT(KC_9), LSFT(KC_0), KC_TRNS, KC_VOLU, + /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right*/ + 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_VOLD, KC_TRNS ), [2] = LAYOUT( /* Rotary */ @@ -69,107 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */ KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] = LAYOUT( - /* Rotary */ - KC_FROG, - /* esc 1 2 3 4 5 6 7 8 9 0 - = home */ - TG(3), KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, - /* tab Q W E R T Y U I O P \ delete end */ - KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, - /* caps A S D F G H J K L ; ' enter */ - KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, - /* shift Z X C V B N M , . / up */ - KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, - /* ctrl win alt fn th1 th2 th3 th4 fn alt ctrl left down right */ - KC_FROG, KC_FROG, KC_FROG, MO(1), KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG ) }; - - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - static bool shiftspace_mods = false; - static int frogchar = 0; - switch (keycode) { - case SHIFTSPACE: - if (record->event.pressed) { - if(get_mods() & MOD_BIT(KC_RSFT)) { - register_code(KC_MINS); - shiftspace_mods = true; - } - else { - register_code(KC_SPC); - } - } else { - if (shiftspace_mods) { - unregister_code(KC_MINS); - shiftspace_mods = false; - } else { - unregister_code(KC_SPC); - } - } - return false; - break; - case ILIKEFROG: - if (record->event.pressed) { - switch (frogchar) - { - case 0: - SEND_STRING("I"); - break; - case 1: - SEND_STRING(" "); - break; - case 2: - SEND_STRING("L"); - break; - case 3: - SEND_STRING("i"); - break; - case 4: - SEND_STRING("k"); - break; - case 5: - SEND_STRING("e"); - break; - case 6: - SEND_STRING(" "); - break; - case 7: - SEND_STRING("F"); - break; - case 8: - SEND_STRING("r"); - break; - case 9: - SEND_STRING("o"); - break; - case 10: - SEND_STRING("g"); - break; - case 11: - SEND_STRING(" "); - break; - } - frogchar = (frogchar + 1) % 12; - } - break; - } - return true; - -} - - -#ifdef ENCODER_ENABLE -bool encoder_update_user(uint8_t index, bool clockwise) { - // Volume control - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - return true; -} -#endif |