diff options
Diffstat (limited to 'keyboards/studiokestra')
26 files changed, 365 insertions, 72 deletions
diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h index afb8bb858f..07ac871795 100644 --- a/keyboards/studiokestra/bourgeau/config.h +++ b/keyboards/studiokestra/bourgeau/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7C10 -#define PRODUCT_ID 0x7501 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Studio Kestra -#define PRODUCT Bourgeau - #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json index a2170cabf6..6b9169ba0a 100644 --- a/keyboards/studiokestra/bourgeau/info.json +++ b/keyboards/studiokestra/bourgeau/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Bourgeau", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/bourgeau/", "maintainer": "studiokestra", + "usb": { + "vid": "0x7C10", + "pid": "0x7501", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_75_ansi_rwkl" }, diff --git a/keyboards/studiokestra/bourgeau/readme.md b/keyboards/studiokestra/bourgeau/readme.md index 16f87618e0..b0a0bb2a89 100644 --- a/keyboards/studiokestra/bourgeau/readme.md +++ b/keyboards/studiokestra/bourgeau/readme.md @@ -11,7 +11,7 @@ Compact 75% universal hotswap PCB with USB-C that supports a fixed 6.25U bottom There are 3 ways to put the board in bootloader mode: - Hold the top-left key (typically `Esc`) while plugging in the USB cable, OR -- While the PCB is plugged into the PC, press the physical `RESET` button on the back of the board, OR +- While the PCB is plugged into the PC, press the physical `QK_BOOT` button on the back of the board, OR - With the default layout, toggle Layer 1 and press the `ESC` key. ## Compiling Firmware diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h index 1ef4c21e50..beb88e69ab 100644 --- a/keyboards/studiokestra/cascade/config.h +++ b/keyboards/studiokestra/cascade/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7C10 -#define PRODUCT_ID 0x6001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Studio Kestra -#define PRODUCT Cascade - #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json index 5bbc25f1e5..eb5e9b5ffb 100644 --- a/keyboards/studiokestra/cascade/info.json +++ b/keyboards/studiokestra/cascade/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Cascade", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/cascade/", "maintainer": "Studio Kestra", + "usb": { + "vid": "0x7C10", + "pid": "0x6001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/cascade/readme.md b/keyboards/studiokestra/cascade/readme.md index db55844ed1..e217b3edea 100644 --- a/keyboards/studiokestra/cascade/readme.md +++ b/keyboards/studiokestra/cascade/readme.md @@ -11,7 +11,7 @@ There are 3 ways to put the board in bootloader mode: - Hold the top-left key (typically `Esc`) while plugging in the USB cable, OR -- While the PCB is plugged into the PC, press the physical `RESET` button on the back of the board, OR +- While the PCB is plugged into the PC, press the physical `QK_BOOT` button on the back of the board, OR - With the default layout, toggle Layer 1 and press the `ESC` key. ## Compiling Firmware diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h index accc0d2b43..2e598b1d95 100644 --- a/keyboards/studiokestra/galatea/config.h +++ b/keyboards/studiokestra/galatea/config.h @@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7C10 -#define MANUFACTURER Studio Kestra -#define PRODUCT Galatea - #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/studiokestra/galatea/readme.md b/keyboards/studiokestra/galatea/readme.md index 1268c596bf..08a6eae011 100644 --- a/keyboards/studiokestra/galatea/readme.md +++ b/keyboards/studiokestra/galatea/readme.md @@ -13,7 +13,7 @@ TKL H87/88c compatible PCB with support for the most common layouts. There are 3 ways to put the board in bootloader mode: - Hold the top-left key (typically `Esc`) while plugging in the USB cable, OR -- While the PCB is plugged into the PC, press the physical `RESET` button on the back of the board, OR +- While the PCB is plugged into the PC, press the physical `QK_BOOT` button on the back of the board, OR - With the default layout, toggle Layer 1 and press the `R` key. ## Compiling Firmware diff --git a/keyboards/studiokestra/galatea/rev1/config.h b/keyboards/studiokestra/galatea/rev1/config.h deleted file mode 100644 index 9f8fb44f9a..0000000000 --- a/keyboards/studiokestra/galatea/rev1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -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 - -#define PRODUCT_ID 0x8801 -#define DEVICE_VER 0x0001 diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json index e3f31198fe..2b832d7fc7 100644 --- a/keyboards/studiokestra/galatea/rev1/info.json +++ b/keyboards/studiokestra/galatea/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Galatea", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/galatea", "maintainer": "studiokestra", + "usb": { + "vid": "0x7C10", + "pid": "0x8801", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/galatea/rev2/config.h b/keyboards/studiokestra/galatea/rev2/config.h deleted file mode 100644 index 4e0170a0f9..0000000000 --- a/keyboards/studiokestra/galatea/rev2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -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 - -#define PRODUCT_ID 0x8802 -#define DEVICE_VER 0x0002 diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json index e3f31198fe..9954a96274 100644 --- a/keyboards/studiokestra/galatea/rev2/info.json +++ b/keyboards/studiokestra/galatea/rev2/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Galatea", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/galatea", "maintainer": "studiokestra", + "usb": { + "vid": "0x7C10", + "pid": "0x8802", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/nascent/config.h b/keyboards/studiokestra/nascent/config.h new file mode 100644 index 0000000000..a88a42348c --- /dev/null +++ b/keyboards/studiokestra/nascent/config.h @@ -0,0 +1,42 @@ +/* +Copyright 2022 Studio Kestra + +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 MATRIX_ROWS 10 +#define MATRIX_COLS 8 + +#define MATRIX_COL_PINS { D2, D3, D7, D6, D4, D5, B0, E6 } +#define MATRIX_ROW_PINS { F5, F4, F7, F6, C6, C7, B4, B5, D0, D1 } +#define DIODE_DIRECTION COL2ROW + +#define LED_CAPS_LOCK_PIN B6 +#define LED_PIN_ON_STATE 0 + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/studiokestra/nascent/info.json b/keyboards/studiokestra/nascent/info.json new file mode 100644 index 0000000000..0d3f12eba5 --- /dev/null +++ b/keyboards/studiokestra/nascent/info.json @@ -0,0 +1,86 @@ +{ + "keyboard_name": "Nascent", + "manufacturer": "Studio Kestra", + "url": "https://studiokestra.ca/", + "maintainer": "Studio Kestra", + "usb": { + "vid": "0x7C10", + "pid": "0x0165", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label":"~", "x":0, "y":0}, + {"label":"!", "x":1, "y":0}, + {"label":"@", "x":2, "y":0}, + {"label":"#", "x":3, "y":0}, + {"label":"$", "x":4, "y":0}, + {"label":"%", "x":5, "y":0}, + {"label":"^", "x":6, "y":0}, + {"label":"&", "x":7, "y":0}, + {"label":"*", "x":8, "y":0}, + {"label":"(", "x":9, "y":0}, + {"label":")", "x":10, "y":0}, + {"label":"_", "x":11, "y":0}, + {"label":"+", "x":12, "y":0}, + {"label":"Bksp", "x":13, "y":0}, + {"label":"Bksp", "x":14, "y":0}, + {"label":"Delete", "x":15, "y":0}, + {"label":"Tab", "x":0, "y":1, "w":1.5}, + {"label":"Q", "x":1.5, "y":1}, + {"label":"W", "x":2.5, "y":1}, + {"label":"E", "x":3.5, "y":1}, + {"label":"R", "x":4.5, "y":1}, + {"label":"T", "x":5.5, "y":1}, + {"label":"Y", "x":6.5, "y":1}, + {"label":"U", "x":7.5, "y":1}, + {"label":"I", "x":8.5, "y":1}, + {"label":"O", "x":9.5, "y":1}, + {"label":"P", "x":10.5, "y":1}, + {"label":"{", "x":11.5, "y":1}, + {"label":"}", "x":12.5, "y":1}, + {"label":"|", "x":13.5, "y":1, "w":1.5}, + {"label":"Home", "x":15, "y":1}, + {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, + {"label":"A", "x":1.75, "y":2}, + {"label":"S", "x":2.75, "y":2}, + {"label":"D", "x":3.75, "y":2}, + {"label":"F", "x":4.75, "y":2}, + {"label":"G", "x":5.75, "y":2}, + {"label":"H", "x":6.75, "y":2}, + {"label":"J", "x":7.75, "y":2}, + {"label":"K", "x":8.75, "y":2}, + {"label":"L", "x":9.75, "y":2}, + {"label":":", "x":10.75, "y":2}, + {"label":"\"", "x":11.75, "y":2}, + {"label":"Enter", "x":12.75, "y":2, "w":2.25}, + {"label":"PgUp", "x":15, "y":2}, + {"label":"Shift", "x":0, "y":3, "w":2.25}, + {"label":"Z", "x":2.25, "y":3}, + {"label":"X", "x":3.25, "y":3}, + {"label":"C", "x":4.25, "y":3}, + {"label":"V", "x":5.25, "y":3}, + {"label":"B", "x":6.25, "y":3}, + {"label":"N", "x":7.25, "y":3}, + {"label":"M", "x":8.25, "y":3}, + {"label":"<", "x":9.25, "y":3}, + {"label":">", "x":10.25, "y":3}, + {"label":"?", "x":11.25, "y":3}, + {"label":"Shift", "x":12.25, "y":3, "w":1.75}, + {"label":"\u2191", "x":14, "y":3}, + {"label":"PgDn", "x":15, "y":3}, + {"label":"Ctrl", "x":0, "y":4, "w":1.5}, + {"label":"Win", "x":1.5, "y":4}, + {"label":"Alt", "x":2.5, "y":4, "w":1.5}, + {"x":4, "y":4, "w":3}, + {"x":7, "y":4}, + {"x":8, "y":4, "w":3}, + {"label":"Ctrl", "x":11, "y":4, "w":1.5}, + {"label":"\u2190", "x":13, "y":4}, + {"label":"\u2193", "x":14, "y":4}, + {"label":"\u2192", "x":15, "y":4} + ] + } + } +}
\ No newline at end of file diff --git a/keyboards/studiokestra/nascent/keymaps/default/keymap.c b/keyboards/studiokestra/nascent/keymaps/default/keymap.c new file mode 100644 index 0000000000..c3c71e7494 --- /dev/null +++ b/keyboards/studiokestra/nascent/keymaps/default/keymap.c @@ -0,0 +1,41 @@ + /* Copyright 2022 Studio Kestra + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + + [_BASE] = LAYOUT_all( + KC_ESC, 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_BSPC, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + 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, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [_FN] = LAYOUT_all( + 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +};
\ No newline at end of file diff --git a/keyboards/studiokestra/nascent/keymaps/default/readme.md b/keyboards/studiokestra/nascent/keymaps/default/readme.md new file mode 100644 index 0000000000..afd4f9a69d --- /dev/null +++ b/keyboards/studiokestra/nascent/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for Nascent diff --git a/keyboards/studiokestra/nascent/keymaps/via/keymap.c b/keyboards/studiokestra/nascent/keymaps/via/keymap.c new file mode 100644 index 0000000000..3339561d9a --- /dev/null +++ b/keyboards/studiokestra/nascent/keymaps/via/keymap.c @@ -0,0 +1,53 @@ + /* Copyright 2022 Studio Kestra + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN1, + _FN2, + _FN3 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_BASE] = LAYOUT_all( + KC_ESC, 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_BSPC, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + 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, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [_FN1] = LAYOUT_all( + 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + [_FN2] = LAYOUT_all( + 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + [_FN3] = LAYOUT_all( + 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; diff --git a/keyboards/studiokestra/nascent/keymaps/via/readme.md b/keyboards/studiokestra/nascent/keymaps/via/readme.md new file mode 100644 index 0000000000..206240488f --- /dev/null +++ b/keyboards/studiokestra/nascent/keymaps/via/readme.md @@ -0,0 +1 @@ +# Studio Kestra's Nascent keymap for VIA diff --git a/keyboards/studiokestra/nascent/keymaps/via/rules.mk b/keyboards/studiokestra/nascent/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/studiokestra/nascent/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/studiokestra/nascent/nascent.c b/keyboards/studiokestra/nascent/nascent.c new file mode 100644 index 0000000000..d7458be127 --- /dev/null +++ b/keyboards/studiokestra/nascent/nascent.c @@ -0,0 +1,17 @@ +/* Copyright 2022 Studio Kestra + * + * 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 "nascent.h" diff --git a/keyboards/studiokestra/nascent/nascent.h b/keyboards/studiokestra/nascent/nascent.h new file mode 100644 index 0000000000..5013ff9c0f --- /dev/null +++ b/keyboards/studiokestra/nascent/nascent.h @@ -0,0 +1,46 @@ +/* Copyright 2022 Studio Kestra + * + * 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" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT_all(\ + k000, k100, k001, k101, k002, k102, k003, k103, k004, k104, k005, k105, k006, k106, k007, k107, \ + k200, k300, k201, k301, k202, k302, k203, k303, k204, k304, k205, k305, k206, k207, k307, \ + k400, k500, k401, k501, k402, k502, k403, k503, k404, k504, k405, k505, k407, k507, \ + k600, k601, k701, k602, k702, k603, k703, k604, k704, k605, k705, k606, k607, k707, \ + k800, k900, k801, k802, k803, k804, k805, k806, k807, k907 \ +) { \ + { k000, k001, k002, k003, k004, k005, k006, k007 }, \ + { k100, k101, k102, k103, k104, k105, k106, k107 }, \ + { k200, k201, k202, k203, k204, k205, k206, k207 }, \ + { k300, k301, k302, k303, k304, k305, KC_NO, k307 }, \ + { k400, k401, k402, k403, k404, k405, KC_NO, k407 }, \ + { k500, k501, k502, k503, k504, k505, KC_NO, k507 }, \ + { k600, k601, k602, k603, k604, k605, k606, k607 }, \ + { KC_NO, k701, k702, k703, k704, k705, KC_NO, k707 }, \ + { k800, k801, k802, k803, k804, k805, k806, k807 }, \ + { k900, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k907 } \ +} diff --git a/keyboards/studiokestra/nascent/readme.md b/keyboards/studiokestra/nascent/readme.md new file mode 100644 index 0000000000..09e0aaa7f0 --- /dev/null +++ b/keyboards/studiokestra/nascent/readme.md @@ -0,0 +1,25 @@ +# Nascent + +65% PCB with leaf-spring mounting tabs designed for the Nascent keyboard. + +* Keyboard Maintainer: [Studio Kestra](https://github.com/studiokestra/) +* Hardware Supported: [store.studiokestra.ca](https://store.studiokestra.ca/) +* Hardware Availability: Group-Buy (Q1 2022) + +Make example for this keyboard (after setting up your build environment): + + make studiokestra/nascent:default + +Flashing example for this keyboard: + + make studiokestra/nascent:default:flash + +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). + +## Bootload Sequence + +There are 3 ways to put the board in bootloader mode: + +- Hold the top-left key (typically `Esc`) while plugging in the USB cable, OR +- While the PCB is plugged into the PC, press the physical `RESET` button on the back of the board, OR +- With the default layout, toggle Layer 1 and press the `R` key.
\ No newline at end of file diff --git a/keyboards/studiokestra/nascent/rules.mk b/keyboards/studiokestra/nascent/rules.mk new file mode 100644 index 0000000000..30e86c0190 --- /dev/null +++ b/keyboards/studiokestra/nascent/rules.mk @@ -0,0 +1,18 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h index dc4aee20aa..1e9f715a6e 100644 --- a/keyboards/studiokestra/nue/config.h +++ b/keyboards/studiokestra/nue/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7C10 -#define PRODUCT_ID 0x0701 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Studio Kestra -#define PRODUCT Nue - #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json index 9abe8f3e5c..874f827546 100644 --- a/keyboards/studiokestra/nue/info.json +++ b/keyboards/studiokestra/nue/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Nue", + "manufacturer": "Studio Kestra", "url": "https://studiokestra.ca/nue", "maintainer": "Studio Kestra", + "usb": { + "vid": "0x7C10", + "pid": "0x0701", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/studiokestra/nue/readme.md b/keyboards/studiokestra/nue/readme.md index 42e72902e4..f29f27be22 100644 --- a/keyboards/studiokestra/nue/readme.md +++ b/keyboards/studiokestra/nue/readme.md @@ -11,7 +11,7 @@ There are 3 ways to put the board in bootloader mode: - Hold the top-left key (typically `Esc`) while plugging in the USB cable, OR -- While the PCB is plugged into the PC, press the physical `RESET` button on the back of the board, OR +- While the PCB is plugged into the PC, press the physical `QK_BOOT` button on the back of the board, OR - With the default layout, toggle Layer 1 and press the `R` key. ## Compiling Firmware |