diff options
| author | Erez Zukerman <bulk@ezuk.org> | 2018-05-15 10:50:24 -0400 |
|---|---|---|
| committer | Erez Zukerman <bulk@ezuk.org> | 2018-05-15 10:50:24 -0400 |
| commit | 5272218ac9cff7ce5af8cfda9129dc03b7aafa49 (patch) | |
| tree | 61ad3987770684afd55cbdd12bca48a221d83713 /keyboards/orthodox/keymaps/oscillope/keymap.c | |
| parent | 0592d23b74142a554c9e36d2da7bf525fbe3a4c0 (diff) | |
| parent | e41147da929afd15c1088226893cc02537650284 (diff) | |
| download | firmware-5272218ac9cff7ce5af8cfda9129dc03b7aafa49.tar.gz firmware-5272218ac9cff7ce5af8cfda9129dc03b7aafa49.tar.bz2 firmware-5272218ac9cff7ce5af8cfda9129dc03b7aafa49.zip | |
Merge branch 'master' into hf/shinydox
Diffstat (limited to 'keyboards/orthodox/keymaps/oscillope/keymap.c')
| -rw-r--r-- | keyboards/orthodox/keymaps/oscillope/keymap.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/keyboards/orthodox/keymaps/oscillope/keymap.c b/keyboards/orthodox/keymaps/oscillope/keymap.c index 28fea02c4..ad07b3ed4 100644 --- a/keyboards/orthodox/keymaps/oscillope/keymap.c +++ b/keyboards/orthodox/keymaps/oscillope/keymap.c @@ -19,11 +19,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "orthodox.h" -#include "action_layer.h" -#include "eeconfig.h" +#include QMK_KEYBOARD_H -extern keymap_config_t keymap_config; // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. @@ -53,25 +50,25 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = KEYMAP( \ + [_QWERTY] = LAYOUT( \ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, TT(_RAISE), TT(_LOWER), TT(_LOWER), TT(_RAISE), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ KC_GRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSPC, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_TAP, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT \ ), - [_LOWER] = KEYMAP( \ + [_LOWER] = LAYOUT( \ 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_INS, _______, _______, CC_PRN, CC_BRC, CC_CBR, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, \ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU \ ), - [_RAISE] = KEYMAP( \ + [_RAISE] = LAYOUT( \ KC_CAPS, KC_AMPR, KC_ASTR, KC_UNDS, KC_LPRN, KC_RPRN, KC_7, KC_8, KC_9, KC_EQL, _______, _______, \ _______, KC_DLR, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, _______, \ CC_ARRW, KC_EXLM, KC_AT, KC_HASH, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, KC_DOT, KC_BSLS, KC_PIPE \ ), - [_NAV] = KEYMAP( \ + [_NAV] = LAYOUT( \ _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, \ _______, _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |