From 98624f1e95ab46783adacc98af47e09ec7541709 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Fri, 13 Mar 2020 23:00:32 +0300 Subject: [PATCH 1/5] added olkb_style layout for XD75 --- keyboards/xd75/keymaps/olkb_style/config.h | 19 +++ keyboards/xd75/keymaps/olkb_style/keymap.c | 138 ++++++++++++++++++++ keyboards/xd75/keymaps/olkb_style/readme.md | 1 + 3 files changed, 158 insertions(+) create mode 100644 keyboards/xd75/keymaps/olkb_style/config.h create mode 100644 keyboards/xd75/keymaps/olkb_style/keymap.c create mode 100644 keyboards/xd75/keymaps/olkb_style/readme.md diff --git a/keyboards/xd75/keymaps/olkb_style/config.h b/keyboards/xd75/keymaps/olkb_style/config.h new file mode 100644 index 000000000000..e6975da8a201 --- /dev/null +++ b/keyboards/xd75/keymaps/olkb_style/config.h @@ -0,0 +1,19 @@ +/* Copyright 2017 Benjamin Kesselring + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +// place overrides here diff --git a/keyboards/xd75/keymaps/olkb_style/keymap.c b/keyboards/xd75/keymaps/olkb_style/keymap.c new file mode 100644 index 000000000000..67e4ae55b7d1 --- /dev/null +++ b/keyboards/xd75/keymaps/olkb_style/keymap.c @@ -0,0 +1,138 @@ +/* Copyright 2017 Wunder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +// Layer shorthand +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) +#define SYSTEM MO(_SYSTEM) +#define MPASTE LSFT(KC_INSERT) + +enum xd75_layers { + _QWERTY, + _LOWER, + _RAISE, + _SYSTEM +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* QWERTY + * .--------------------------------------------------------------------------------------------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | - | ` | = | 6 | 7 | 8 | 9 | 0 | BACKSP | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | TAB | Q | W | E | R | T | [ | \ | ] | Y | U | I | O | P | ' | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------| + * | CAP LK | A | S | D | F | G | INSERT | HOME | PG UP | H | J | K | L | ; | ENTER | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------| + * | LSHIFT | Z | X | C | V | B | DEL | END | PG DN | N | M | , | . | / | RSHIFT | + * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------| + * | LCTRL | GUI | MENU | ALT | LOWER | SPACE | SPACE | SPACE | SPACE | SPACE | RAISE | LEFT | DOWN | UP | RIGHT | + * '--------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_QWERTY] = LAYOUT_ortho_5x15( /* QWERTY */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_GRV, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_BSLS, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_INS, KC_HOME, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL, KC_END, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_MENU, KC_LALT, LOWER, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + ), + +/* SYSTEM + * .--------------------------------------------------------------------------------------------------------------------------------------. + * | RESET | DEBUG | | | | | | | | | | | | | | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| + * | | | | | | |RGB_TOG |RGB_VAI |RGB VAD | | | PASTE | PR SCR | SCR LK | PAUSE | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| + * | | | | | | |RGB_MOD |RGB_SAI |RGB_HUI | | | | | | | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| + * | | | | | | | |RGB_SAD |RGB_HUD | | | | | | | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| + * | | | | | | | | | | | | | | | | + * '--------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_SYSTEM] = LAYOUT_ortho_5x15( /* FUNCTION */ + RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, RGB_VAD, _______, _______, MPASTE, KC_PSCR, KC_SLCK, KC_PAUSE, + _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_SAI, RGB_HUI, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + +/* LOWER + * .--------------------------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | ~ | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | ' | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------| + * | DELETE | F1 | F2 | F3 | F4 | F5 | | | | F6 | _ | + | { | } | | | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------| + * | | F7 | F8 | F9 | F10 | F11 | | | | F12 | ISO ~ | ISO | | Home | End | | + * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------| + * | | | | | | | | | | | | Next | Vol- | Vol+ | Play | + * '--------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_LOWER] = LAYOUT_ortho_5x15( /* LOWER */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME,KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ), + +/* RAISE + * .--------------------------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | ` | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | ' | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------| + * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | - | = | [ | ] | \ | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------| + * | | F7 | F8 | F9 | F10 | F11 | | | | F12 | ISO # | ISO / | Pg Up | Pg Dn | | + * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------| + * | | | | | | | | | | | | Next | Vol- | Vol+ | Play | + * '--------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_RAISE] = LAYOUT_ortho_5x15( /* QWERTY */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, KC_F6, KC_MINUS,KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ) +}; + +// SYSTEM layer toggle +uint32_t layer_state_set_user(uint32_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _SYSTEM); +} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/xd75/keymaps/olkb_style/readme.md b/keyboards/xd75/keymaps/olkb_style/readme.md new file mode 100644 index 000000000000..117ecafb799e --- /dev/null +++ b/keyboards/xd75/keymaps/olkb_style/readme.md @@ -0,0 +1 @@ +# A OLKB-like layout for XD75 From 22c77c1e7c876a8a81bdf0e807fea686ae58166b Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Fri, 13 Mar 2020 23:09:58 +0300 Subject: [PATCH 2/5] removed unnecessary config.h --- keyboards/xd75/keymaps/olkb_style/config.h | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 keyboards/xd75/keymaps/olkb_style/config.h diff --git a/keyboards/xd75/keymaps/olkb_style/config.h b/keyboards/xd75/keymaps/olkb_style/config.h deleted file mode 100644 index e6975da8a201..000000000000 --- a/keyboards/xd75/keymaps/olkb_style/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2017 Benjamin Kesselring - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -// place overrides here From bda23f14f1049bb27cb4f44c36a43a35901750f5 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Fri, 13 Mar 2020 23:12:36 +0300 Subject: [PATCH 3/5] cleaned up empty functions --- keyboards/xd75/keymaps/olkb_style/keymap.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/keyboards/xd75/keymaps/olkb_style/keymap.c b/keyboards/xd75/keymaps/olkb_style/keymap.c index 67e4ae55b7d1..284bbec208a1 100644 --- a/keyboards/xd75/keymaps/olkb_style/keymap.c +++ b/keyboards/xd75/keymaps/olkb_style/keymap.c @@ -125,14 +125,3 @@ uint32_t layer_state_set_user(uint32_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _SYSTEM); } -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -void led_set_user(uint8_t usb_led) { - -} From 5bde3fd32bd7bcb00781298cba4e3ae1bc9f12c3 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Fri, 13 Mar 2020 23:18:23 +0300 Subject: [PATCH 4/5] refactored fuction type for clarity --- keyboards/xd75/keymaps/olkb_style/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/xd75/keymaps/olkb_style/keymap.c b/keyboards/xd75/keymaps/olkb_style/keymap.c index 284bbec208a1..7fa04b2c63af 100644 --- a/keyboards/xd75/keymaps/olkb_style/keymap.c +++ b/keyboards/xd75/keymaps/olkb_style/keymap.c @@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // SYSTEM layer toggle -uint32_t layer_state_set_user(uint32_t state) { +layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _SYSTEM); } From b20041f8cc0503348ecee26a394fbc15e11b6ec0 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Sat, 14 Mar 2020 11:23:51 +0300 Subject: [PATCH 5/5] renamed the layout --- keyboards/xd75/keymaps/{olkb_style => neothefox}/keymap.c | 0 keyboards/xd75/keymaps/{olkb_style => neothefox}/readme.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/xd75/keymaps/{olkb_style => neothefox}/keymap.c (100%) rename keyboards/xd75/keymaps/{olkb_style => neothefox}/readme.md (100%) diff --git a/keyboards/xd75/keymaps/olkb_style/keymap.c b/keyboards/xd75/keymaps/neothefox/keymap.c similarity index 100% rename from keyboards/xd75/keymaps/olkb_style/keymap.c rename to keyboards/xd75/keymaps/neothefox/keymap.c diff --git a/keyboards/xd75/keymaps/olkb_style/readme.md b/keyboards/xd75/keymaps/neothefox/readme.md similarity index 100% rename from keyboards/xd75/keymaps/olkb_style/readme.md rename to keyboards/xd75/keymaps/neothefox/readme.md