diff options
| author | QMK Bot <[email protected]> | 2021-05-16 22:20:57 +0000 | 
|---|---|---|
| committer | QMK Bot <[email protected]> | 2021-05-16 22:20:57 +0000 | 
| commit | fef78c41cdebd0292e88c3360deaeba157028bcd (patch) | |
| tree | 50824862bc6fe8f8ce5d5ce0ff1b01c029b570d1 | |
| parent | de5c30a9bab0b1ebf97578931fad4ffe2ee00197 (diff) | |
| parent | 526fbf0faf5530fa0b62173273e7974dda4e6e79 (diff) | |
| download | qmk_firmware-fef78c41cdebd0292e88c3360deaeba157028bcd.tar.gz qmk_firmware-fef78c41cdebd0292e88c3360deaeba157028bcd.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/bastardkb/scylla/config.h | 39 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/info.json | 71 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/keymaps/default/keymap.c | 60 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c | 90 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/keymaps/german_gaming/readme.md | 24 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/keymaps/german_gaming/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/keymaps/xyverz/config.h | 33 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c | 100 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/readme.md | 22 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/rules.mk | 23 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/scylla.c | 18 | ||||
| -rw-r--r-- | keyboards/bastardkb/scylla/scylla.h | 42 | 
12 files changed, 523 insertions, 0 deletions
| diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h new file mode 100644 index 0000000000..b00e781df2 --- /dev/null +++ b/keyboards/bastardkb/scylla/config.h @@ -0,0 +1,39 @@ +/*  + * Copyright 2021 Quentin LEBASTARD <[email protected]> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#pragma once +#include "config_common.h" +#define VENDOR_ID 0xA8F8 +#define PRODUCT_ID 0x1829 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Bastard Keyboards +#define PRODUCT Scylla + +#define MATRIX_ROWS 10 +#define MATRIX_COLS 6 +#define DIODE_DIRECTION ROW2COL +#define MATRIX_ROW_PINS { D7, B5, F7, F6, B6 } +#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 } + +#define RGB_DI_PIN D2 +#define RGBLED_NUM 58 +#define RGBLED_SPLIT { 29, 29 } +#define RGBLIGHT_LIMIT_VAL 120 +#define RGBLIGHT_ANIMATIONS +#define DEBOUNCE 5 +#define SOFT_SERIAL_PIN D0 +#define MASTER_RIGHT diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json new file mode 100644 index 0000000000..a598b03999 --- /dev/null +++ b/keyboards/bastardkb/scylla/info.json @@ -0,0 +1,71 @@ +{ +    "keyboard_name": "The Bastard Keyboard", +    "url": "https://bastardkb.com/", +    "maintainer": "Quentin Lebastard", +    "width": 17, +    "height": 8, +    "layouts": { +        "LAYOUT_split_4x6_5": { +            "layout": [ +                {"label":"L00", "x":0, "y":0}, +                {"label":"L01", "x":1, "y":0}, +                {"label":"L02", "x":2, "y":0}, +                {"label":"L03", "x":3, "y":0}, +                {"label":"L04", "x":4, "y":0}, +                {"label":"L05", "x":5, "y":0}, +                {"label":"R00", "x":11, "y":0}, +                {"label":"R01", "x":12, "y":0}, +                {"label":"R02", "x":13, "y":0}, +                {"label":"R03", "x":14, "y":0}, +                {"label":"R04", "x":15, "y":0}, +                {"label":"R05", "x":16, "y":0}, +                {"label":"L10", "x":0, "y":1}, +                {"label":"L11", "x":1, "y":1}, +                {"label":"L12", "x":2, "y":1}, +                {"label":"L13", "x":3, "y":1}, +                {"label":"L14", "x":4, "y":1}, +                {"label":"L15", "x":5, "y":1}, +                {"label":"R10", "x":11, "y":1}, +                {"label":"R11", "x":12, "y":1}, +                {"label":"R12", "x":13, "y":1}, +                {"label":"R13", "x":14, "y":1}, +                {"label":"R14", "x":15, "y":1}, +                {"label":"R15", "x":16, "y":1}, +                {"label":"L20", "x":0, "y":2}, +                {"label":"L21", "x":1, "y":2}, +                {"label":"L22", "x":2, "y":2}, +                {"label":"L23", "x":3, "y":2}, +                {"label":"L24", "x":4, "y":2}, +                {"label":"L25", "x":5, "y":2}, +                {"label":"R20", "x":11, "y":2}, +                {"label":"R21", "x":12, "y":2}, +                {"label":"R22", "x":13, "y":2}, +                {"label":"R23", "x":14, "y":2}, +                {"label":"R24", "x":15, "y":2}, +                {"label":"R25", "x":16, "y":2}, +                {"label":"L30", "x":0, "y":3}, +                {"label":"L31", "x":1, "y":3}, +                {"label":"L32", "x":2, "y":3}, +                {"label":"L33", "x":3, "y":3}, +                {"label":"L34", "x":4, "y":3}, +                {"label":"L35", "x":5, "y":3}, +                {"label":"R30", "x":11, "y":3}, +                {"label":"R31", "x":12, "y":3}, +                {"label":"R32", "x":13, "y":3}, +                {"label":"R33", "x":14, "y":3}, +                {"label":"R34", "x":15, "y":3}, +                {"label":"R35", "x":16, "y":3}, +                {"label":"L43", "x":5, "y":4}, +                {"label":"L44", "x":6, "y":4}, +                {"label":"L45", "x":7, "y":4}, +                {"label":"R40", "x":9, "y":4}, +                {"label":"R41", "x":10, "y":4}, +                {"label":"R40", "x":11, "y":4}, +                {"label":"L52", "x":6, "y":5}, +                {"label":"L53", "x":7, "y":5}, +                {"label":"R52", "x":9, "y":5}, +                {"label":"R53", "x":10, "y":5} +            ] +        } +    } +} diff --git a/keyboards/bastardkb/scylla/keymaps/default/keymap.c b/keyboards/bastardkb/scylla/keymaps/default/keymap.c new file mode 100644 index 0000000000..49be09b689 --- /dev/null +++ b/keyboards/bastardkb/scylla/keymaps/default/keymap.c @@ -0,0 +1,60 @@ +/*  + * Copyright 2021 Quentin LEBASTARD <[email protected]> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +  [0] = LAYOUT_split_4x6_5( +    KC_ESC,  KC_1, KC_2, KC_3, KC_4, KC_5,			            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_Y, KC_U, KC_I,    KC_O,   KC_P,     KC_MINS, +//-------------------------------------------------//-----------------------------------------------------------// +    KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G,	                KC_H, KC_J, KC_K,    KC_L,   KC_SCLN,  KC_QUOT, +//-------------------------------------------------//-----------------------------------------------------------// +    KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B,                  KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,  KC_BSLS, +//-------------------------------------------------//-----------------------------------------------------------// +                        KC_LCTL, KC_SPC, MO(1),		     MO(2),  KC_ENT, KC_RGUI, +                                 KC_HOME,  KC_BSPC,      KC_DEL, KC_RALT +  ), + +  [1] = LAYOUT_split_4x6_5( +    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,			  KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_DEL, +//---------------------------------------------------------//-----------------------------------------------------------// +    RESET,   _______, _______, _______, _______, KC_LBRC,			  KC_RBRC, KC_P7,   KC_P8,   KC_P9,   _______,  KC_PLUS, +//---------------------------------------------------------//-----------------------------------------------------------// +    _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_LPRN,	      KC_RPRN, KC_P4,   KC_P5,   KC_P6,   KC_MINS,  KC_PIPE, +//---------------------------------------------------------//-----------------------------------------------------------// +    _______, _______, _______, _______, _______, _______,       _______, KC_P1,   KC_P2,   KC_P3,   KC_EQL,   KC_UNDS, +//---------------------------------------------------------//-----------------------------------------------------------// +                               KC_LCTL, KC_HOME, KC_TRNS,		    KC_TRNS, KC_RALT, KC_RGUI, +                                        KC_SPC,  KC_BSPC,       KC_RCTL, KC_ENT +  ), + +  [2] = LAYOUT_split_4x6_5( +    KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,			    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11, +//---------------------------------------------------------//--------------------------------------------------------------// +    _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC,			  KC_RBRC, _______, KC_NLCK, KC_INS,  KC_SLCK,  KC_MUTE, +//---------------------------------------------------------//--------------------------------------------------------------// +    _______, KC_LEFT, KC_UP,    KC_DOWN, KC_RGHT, KC_LPRN,	      KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______,  KC_VOLU, +//---------------------------------------------------------//--------------------------------------------------------------// +    _______, _______, _______,  _______, _______, _______,        _______, _______, _______, _______, _______,  KC_VOLD, +//---------------------------------------------------------//--------------------------------------------------------------// +                               KC_LCTL, KC_HOME, KC_TRNS,		    KC_TRNS, KC_RALT, RESET, +                                        KC_SPC,  KC_BSPC,       KC_RCTL, KC_ENT +  ), +}; diff --git a/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c b/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c new file mode 100644 index 0000000000..94dd182c69 --- /dev/null +++ b/keyboards/bastardkb/scylla/keymaps/german_gaming/keymap.c @@ -0,0 +1,90 @@ +/* + * Copyright 2021 Joschua Gandert + * + * 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 <http://www.gnu.org/licenses/>. + */ + + +#include QMK_KEYBOARD_H +#include "keymap_german.h" + + +enum layer_names { +    _BASE, +    _GAME, /* WASD shifted right once  */ +    _LOWER, +    _RAISE, +    _ADJUST /* when both LOWER and RAISE pressed */ +}; + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +  [_BASE] = LAYOUT_split_4x6_5( +    KC_ESC , KC_1  ,  KC_2  ,  KC_3  , KC_4  , KC_5  ,              KC_6  , KC_7  , KC_8   , KC_9  , KC_0   , DE_SS  , +    KC_TAB , KC_Q  ,  KC_W  ,  KC_E  , KC_R  , KC_T  ,              DE_Z  , KC_U  , KC_I   , KC_O  , KC_P   , DE_UDIA, +    KC_LSFT, KC_A  ,  KC_S  ,  KC_D  , KC_F  , KC_G  ,              KC_H  , KC_J  , KC_K   , KC_L  , DE_ODIA, DE_ADIA, +    KC_LCTL, DE_Y  ,  KC_X  ,  KC_C  , KC_V  , KC_B  ,              KC_N  , KC_M  , KC_COMM, KC_DOT, DE_MINS, DE_PLUS, + +                                  RAISE,  KC_SPC,   KC_LCTL,    KC_RALT,  KC_BSPC,  LOWER, +                                          KC_ENT,   KC_LALT,    KC_LGUI,  KC_RSFT +  ), + +  [_GAME] = LAYOUT_split_4x6_5( +    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, +    KC_T   , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   ,           _______, _______, KC_UP,   _______, _______, _______, +    KC_G   , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   ,           _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, +    KC_B   , KC_LCTL, DE_Y   , KC_X   , KC_C   , KC_V   ,           _______, _______, _______, _______, _______, _______, + +                                  _______, _______, _______,    _______, _______, _______, +                                           _______, _______,    _______, _______ +  ), + +  [_LOWER] = LAYOUT_split_4x6_5( +    KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,           KC_CIRC, KC_AMPR, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL     , +    _______, DE_HASH, DE_CIRC, KC_PGUP, DE_LABK, _______,           _______, KC_P7  , KC_P8  , KC_P9  , KC_PPLS, KC_BSPC    , +    _______, DE_ACUT, KC_HOME, KC_PGDN, KC_END , KC_LPRN,           KC_RPRN, KC_P4  , KC_P5  , KC_P6  , KC_PDOT, _______    , +    _______, KC_PLUS, KC_PIPE, KC_UNDS, _______, _______,           KC_P0  , KC_P1  , KC_P2  , KC_P3  , KC_PENT, KC_KP_EQUAL, + +                                  _______, KC_RGHT, _______,    _______, _______, _______, +                                           KC_LEFT, _______,    RESET  , _______ +  ), + +  [_RAISE] = LAYOUT_split_4x6_5( +    KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 , +    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCREEN, KC_MUTE, +    _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU, +    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SLCK   , KC_VOLD, + +                                  _______, _______, _______,    _______, KC_UP  , _______, +                                           _______, _______,    _______, KC_DOWN +  ), + +  [_ADJUST] = LAYOUT_split_4x6_5( +    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, +    _______, _______, _______, _______, RESET  , _______,           _______, _______, _______, _______, _______, _______, +    _______, _______, _______, _______, _______, DF(_GAME),         _______, _______, _______, _______, _______, _______, +    _______, _______, _______, _______, _______, DF(_BASE),         _______, _______, _______, _______, _______, _______, + +                                   _______, _______, _______,    _______, _______, _______, +                                            _______, _______,    _______, _______ +  ), +}; + + +layer_state_t layer_state_set_user(layer_state_t state) { +  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/bastardkb/scylla/keymaps/german_gaming/readme.md b/keyboards/bastardkb/scylla/keymaps/german_gaming/readme.md new file mode 100644 index 0000000000..14de01ac41 --- /dev/null +++ b/keyboards/bastardkb/scylla/keymaps/german_gaming/readme.md @@ -0,0 +1,24 @@ + + +Despite being less accurate, the columns in the image are shifted up and down to avoid the [Hermann grid illusion](https://en.wikipedia.org/wiki/Grid_illusion). + + +# German Gaming Layout + +This layout was build with gaming in mind for a german user. As a result I added a "game" layer that shifts the keys of the left side (below the number row) one to the right, so that <kbd>WASD</kbd> is on the <kbd>ESDF</kbd> keys. The reason this layer was added is that using <kbd>WASD</kbd> is less comfortable with a contoured Dactyl-style keyboard, where each column is adjusted for the respective fingers. <kbd>ESDF</kbd> also has the upside of allowing one to stay in the home row. Note that the rightmost column of the default layer, so <kbd>TGB</kbd>, ends up in the leftmost position. + +Of course, one could just be forced to reconfigure every game, but that wouldn't be very user-friendly and likely reduce satisfaction with the layout. When in game mode, the right side of keys also features arrow keys on <kbd>IJKL</kbd>. + + +## Raise and Lower layer + +Additionally, via the RAISE layer, it's always possible to access the arrow keys, which are often used in game menues. On the exact same position one can access <kbd>Home</kbd>, <kbd>End</kbd>, <kbd>Page Down</kbd> and <kbd>Page Up</kbd> via the LOWER layer. The left side of the LOWER layer also contains the few characters that would usually have their own key in a traditional german keyboard. + +The right side features various media keys in the RAISE layer, and a numpad in the LOWER layer. + + +## Firmware + +The keyboard can be put into Reset mode (for flashing a keymap) by pressing <kbd>**LOWER**</kbd> + <kbd>Super</kbd> (also known as Windows key), or by pressing <kbd>**LOWER**</kbd> + <kbd>**RAISE**</kbd> + <kbd>R</kbd>. + +`MOUSEKEY_ENABLE` was set to `no` for this keymap, since it wasn't used and the size of the firmware ended up being too large. diff --git a/keyboards/bastardkb/scylla/keymaps/german_gaming/rules.mk b/keyboards/bastardkb/scylla/keymaps/german_gaming/rules.mk new file mode 100644 index 0000000000..0a5b666e85 --- /dev/null +++ b/keyboards/bastardkb/scylla/keymaps/german_gaming/rules.mk @@ -0,0 +1 @@ +MOUSEKEY_ENABLE = no diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h new file mode 100644 index 0000000000..d7baf99376 --- /dev/null +++ b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h @@ -0,0 +1,33 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako <[email protected]> +Copyright 2015 Jack Humbert + +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 <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +/* Select hand configuration */ +// #define MASTER_LEFT +// #define MASTER_RIGHT +#define EE_HANDS + +#define TAPPING_FORCE_HOLD +#define TAPPING_TERM 300 +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT +#define LEADER_PER_KEY_TIMING +#define LEADER_TIMEOUT 300
\ No newline at end of file diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c b/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c new file mode 100644 index 0000000000..b8f70bdc9b --- /dev/null +++ b/keyboards/bastardkb/scylla/keymaps/xyverz/keymap.c @@ -0,0 +1,100 @@ +/*  + * Copyright 2021 Ian Sterling <xyverz on Github.com> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#include QMK_KEYBOARD_H + +enum layer_names { _WINDOWS, _MAC, _LOWER, _RAISE, _ADJUST }; + +enum custom_keycodes { WINDOWS = SAFE_RANGE, MAC, ADJUST }; + +// Aliases to keep the keymap tidy +#define GUIBSPC GUI_T(KC_BSPC)  // GUI when held, BSPC when tapped. +#define RGB_SWR RGB_M_SW        // Swirl Animation alias +#define RGB_SNK RGB_M_SN        // Snake Animation alias +#define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook! +#define WINLOCK LGUI(KC_L)      // Lock my PC! +#define DELGUI GUI_T(KC_DEL) +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) + + +#define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook! + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[_WINDOWS] = LAYOUT_split_4x6_5( +  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, +  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,        KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, +  KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,        KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, +  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,        KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, +                             LOWER,   KC_BSPC, KC_DEL,      KC_ENT,  KC_SPC,  RAISE, +                                      KC_LCTL, KC_LALT,     KC_RGUI, KC_RCTL +  ), + +[_MAC] = LAYOUT_split_4x6_5( +  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, +  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,        KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, +  KC_GRV,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,        KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, +  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,        KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, +                             LOWER,   KC_BSPC, DELGUI,      KC_ENT,  KC_SPC,  RAISE, +                                      KC_LCTL, KC_LALT,     KC_RGUI, KC_RCTL +  ), + +[_LOWER] = LAYOUT_split_4x6_5( +  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  +  RESET,   _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, +  KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______, +  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, +                             _______, KC_DEL,  _______,     _______, _______, _______, +                                      MACLOCK, _______,     _______, WINLOCK +  ), + +[_RAISE] = LAYOUT_split_4x6_5( +  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  +  _______, _______, _______, KC_UP,   _______, _______,     _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, RESET, +  KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME,     KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC, _______, +  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_END,      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, +                             _______, KC_DEL,  _______,     _______, _______, _______, +                                      MACLOCK, _______,     _______, WINLOCK +  ), + +[_ADJUST] = LAYOUT_split_4x6_5( +  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, +  _______, RESET,   _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, +  _______, _______, _______, _______, _______, _______,     _______, WINDOWS, MAC,     _______, _______, _______, +  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, +                             _______, _______, _______,     _______, _______, _______, +                                      _______, _______,     _______, _______ +  ), + +}; + +layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); }; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +    if (record->event.pressed) { +        switch (keycode) { +            case WINDOWS: +                set_single_persistent_default_layer(_WINDOWS); +                return false; +            case MAC: +                set_single_persistent_default_layer(_MAC); +                return false; +        } +    } +    return true; +} diff --git a/keyboards/bastardkb/scylla/readme.md b/keyboards/bastardkb/scylla/readme.md new file mode 100644 index 0000000000..70df5cfbb9 --- /dev/null +++ b/keyboards/bastardkb/scylla/readme.md @@ -0,0 +1,22 @@ +# Scylla + +A modern, low-profile split ergonomic keyboard + +* Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/) +* Hardware Supported: elite-C V4 +* Hardware Availability: [Bastard Keyboards](https://bastardkb.com/) + +Make example for this keyboard (after setting up your build environment): + +    make bastardkb/scylla:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +See the [keyboard build instructions](https://docs.bastardkb.com) + + +## Important information regarding the reset + +If you modify this firmware, make sure to always have a RESET key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up. + +Otherwise if you're stuck, open the case and reset manually by shorting Gnd and Rst, or pressing the RST button. diff --git a/keyboards/bastardkb/scylla/rules.mk b/keyboards/bastardkb/scylla/rules.mk new file mode 100644 index 0000000000..cc88208e33 --- /dev/null +++ b/keyboards/bastardkb/scylla/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +#   change yes to no to disable +# +BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes       # Mouse keys +EXTRAKEY_ENABLE = yes       # Audio control and System control +CONSOLE_ENABLE = no         # Console for debug +COMMAND_ENABLE = no         # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no            # USB Nkey Rollover +BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no       # Enable Bluetooth +AUDIO_ENABLE = no           # Audio output +SPLIT_KEYBOARD = yes diff --git a/keyboards/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c new file mode 100644 index 0000000000..f9e7917085 --- /dev/null +++ b/keyboards/bastardkb/scylla/scylla.c @@ -0,0 +1,18 @@ +/*  + * Copyright 2021 Quentin LEBASTARD <[email protected]> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#include "scylla.h" diff --git a/keyboards/bastardkb/scylla/scylla.h b/keyboards/bastardkb/scylla/scylla.h new file mode 100644 index 0000000000..196982952f --- /dev/null +++ b/keyboards/bastardkb/scylla/scylla.h @@ -0,0 +1,42 @@ +/*  + * Copyright 2021 Quentin LEBASTARD <[email protected]> + * + * 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 <http://www.gnu.org/licenses/>. + */ + + +#pragma once +#include "quantum.h" + +// SWITCHED 91 and 95 - check on left ? +#define LAYOUT_split_4x6_5( \ +	k00, k01, k02, k03, k04, k05,			k55, k54, k53, k52, k51, k50, \ +	k10, k11, k12, k13, k14, k15,			k65, k64, k63, k62, k61, k60, \ +	k20, k21, k22, k23, k24, k25,			k75, k74, k73, k72, k71, k70, \ +	k30, k31, k32, k33, k34, k35,			k85, k84, k83, k82, k81, k80, \ +		       k43, k44, k41,		        k91, k94, k93, \ +		            k45, k42,                   k92, k95 \ +)\ +{\ +	{ k00, k01, k02, k03, k04, k05 }, \ +	{ k10, k11, k12, k13, k14, k15 }, \ +	{ k20, k21, k22, k23, k24, k25 }, \ +	{ k30, k31, k32, k33, k34, k35 }, \ +	{ KC_NO, k41, k42, k43, k44, k45 }, \ +	{ k50, k51, k52, k53, k54, k55 }, \ +	{ k60, k61, k62, k63, k64, k65 }, \ +	{ k70, k71, k72, k73, k74, k75 }, \ +	{ k80, k81, k82, k83, k84, k85 }, \ +	{ KC_NO, k91, k92, k93, k94, k95 }, \ +} | 
