From a342b9c3cbd24704497dfff917c25a0c09f3616e Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 11:24:49 +0300 Subject: [PATCH 01/11] VIA keymap for Pierce split keyboard. VIA keymap for Pierce split keyboard. keymap.c and rules.mk files. --- keyboards/pierce/keymaps/via/keymap.c | 37 +++++++++++++++++++++++++++ keyboards/pierce/keymaps/via/rules.mk | 3 +++ 2 files changed, 40 insertions(+) create mode 100644 keyboards/pierce/keymaps/via/keymap.c create mode 100644 keyboards/pierce/keymaps/via/rules.mk diff --git a/keyboards/pierce/keymaps/via/keymap.c b/keyboards/pierce/keymaps/via/keymap.c new file mode 100644 index 000000000000..22abf6aded78 --- /dev/null +++ b/keyboards/pierce/keymaps/via/keymap.c @@ -0,0 +1,37 @@ +/* Copyright 2022 durken (https://github.com/durken1/) + * + * 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 + +enum layers { + BASE, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT_split_3x5_3( + // Base + //,--------------------------------------------, ,--------------------------------------------. + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_ESC, KC_SPC, KC_TAB, KC_ENT, KC_BSPC, KC_DEL + //`--------------------------' '--------------------------' + + ) +}; \ No newline at end of file diff --git a/keyboards/pierce/keymaps/via/rules.mk b/keyboards/pierce/keymaps/via/rules.mk new file mode 100644 index 000000000000..17e5d3eab1a9 --- /dev/null +++ b/keyboards/pierce/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +TRACKPOINT = no +AUTO_BUTTONS = no +VIA_ENABLE = yes \ No newline at end of file From 61a3c99e667700de6961fecc660e7032e5bb1b88 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 11:41:37 +0300 Subject: [PATCH 02/11] Formatting a bit, due to lint error. Formatting a bit, due to lint error. --- keyboards/pierce/keymaps/via/keymap.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/keyboards/pierce/keymaps/via/keymap.c b/keyboards/pierce/keymaps/via/keymap.c index 22abf6aded78..93babffd0684 100644 --- a/keyboards/pierce/keymaps/via/keymap.c +++ b/keyboards/pierce/keymaps/via/keymap.c @@ -17,21 +17,14 @@ #include QMK_KEYBOARD_H enum layers { - BASE, + _BASE, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT_split_3x5_3( - // Base - //,--------------------------------------------, ,--------------------------------------------. - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_ESC, KC_SPC, KC_TAB, KC_ENT, KC_BSPC, KC_DEL - //`--------------------------' '--------------------------' - + [_BASE] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_ESC, KC_SPC, KC_TAB, KC_ENT, KC_BSPC, KC_DEL ) }; \ No newline at end of file From f3da1ce92522af7eeb9df9ff69b11c25645a777b Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 11:49:29 +0300 Subject: [PATCH 03/11] layers has been changed to layer_names. layers has been changed to layer_names. --- keyboards/pierce/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/pierce/keymaps/via/keymap.c b/keyboards/pierce/keymaps/via/keymap.c index 93babffd0684..251336ede2e8 100644 --- a/keyboards/pierce/keymaps/via/keymap.c +++ b/keyboards/pierce/keymaps/via/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H -enum layers { +enum layer_names { _BASE, }; From 8076b06051ca8e5c806d4404aee8b32a8c6577f4 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 11:59:57 +0300 Subject: [PATCH 04/11] Update keymap.c --- keyboards/pierce/keymaps/via/keymap.c | 33 ++++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/keyboards/pierce/keymaps/via/keymap.c b/keyboards/pierce/keymaps/via/keymap.c index 251336ede2e8..0a442927e169 100644 --- a/keyboards/pierce/keymaps/via/keymap.c +++ b/keyboards/pierce/keymaps/via/keymap.c @@ -1,18 +1,19 @@ -/* Copyright 2022 durken (https://github.com/durken1/) - * - * 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 . - */ +/* +Copyright 2022 durken (https://github.com/durken1/) + +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 @@ -27,4 +28,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_SPC, KC_TAB, KC_ENT, KC_BSPC, KC_DEL ) -}; \ No newline at end of file +}; From 86406a1b2e7912df3524e0d58eab86dcdff8dbc2 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 12:02:04 +0300 Subject: [PATCH 05/11] Update rules.mk --- keyboards/pierce/keymaps/via/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/pierce/keymaps/via/rules.mk b/keyboards/pierce/keymaps/via/rules.mk index 17e5d3eab1a9..3803ab88276f 100644 --- a/keyboards/pierce/keymaps/via/rules.mk +++ b/keyboards/pierce/keymaps/via/rules.mk @@ -1,3 +1,3 @@ TRACKPOINT = no AUTO_BUTTONS = no -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes From 4032f521ea85df94b3b7dbaaf192e572d74a0fee Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 13:36:17 +0300 Subject: [PATCH 06/11] Update keymap.c --- keyboards/pierce/keymaps/via/keymap.c | 31 +++++++++++++-------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/keyboards/pierce/keymaps/via/keymap.c b/keyboards/pierce/keymaps/via/keymap.c index 0a442927e169..43e27a8ef88c 100644 --- a/keyboards/pierce/keymaps/via/keymap.c +++ b/keyboards/pierce/keymaps/via/keymap.c @@ -1,19 +1,18 @@ -/* -Copyright 2022 durken (https://github.com/durken1/) - -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 . -*/ +/* Copyright 2021 durken1 (https://github.com/durken1/pierce) + * + * 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 From f361ff9e8cd9083c63ec592e73ec97ef2f9f2cb8 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 14:04:31 +0300 Subject: [PATCH 07/11] Update keymap.c --- keyboards/pierce/keymaps/via/keymap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/pierce/keymaps/via/keymap.c b/keyboards/pierce/keymaps/via/keymap.c index 43e27a8ef88c..afdd81c8d974 100644 --- a/keyboards/pierce/keymaps/via/keymap.c +++ b/keyboards/pierce/keymaps/via/keymap.c @@ -16,12 +16,8 @@ #include QMK_KEYBOARD_H -enum layer_names { - _BASE, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_split_3x5_3( + [0] = LAYOUT( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, From a21be58a02c3b359a97ac628195230c1ebb2ea27 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 14:09:31 +0300 Subject: [PATCH 08/11] Update keymap.c --- keyboards/pierce/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/pierce/keymaps/via/keymap.c b/keyboards/pierce/keymaps/via/keymap.c index afdd81c8d974..1a65b1cdf247 100644 --- a/keyboards/pierce/keymaps/via/keymap.c +++ b/keyboards/pierce/keymaps/via/keymap.c @@ -22,5 +22,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_SPC, KC_TAB, KC_ENT, KC_BSPC, KC_DEL - ) + ), }; From bd27eb4c6d19f1b14fe78dc4cada439a632507bb Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 14:17:24 +0300 Subject: [PATCH 09/11] Update keymap.c --- keyboards/pierce/keymaps/via/keymap.c | 43 ++++++++++++++------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/keyboards/pierce/keymaps/via/keymap.c b/keyboards/pierce/keymaps/via/keymap.c index 1a65b1cdf247..fb49d4b0397c 100644 --- a/keyboards/pierce/keymaps/via/keymap.c +++ b/keyboards/pierce/keymaps/via/keymap.c @@ -1,26 +1,27 @@ -/* Copyright 2021 durken1 (https://github.com/durken1/pierce) - * - * 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 . - */ +// Copyright 2023 durken +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_ESC, KC_SPC, KC_TAB, KC_ENT, KC_BSPC, KC_DEL - ), + /* + * ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ + * │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ + * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤ + * │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ + * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤ + * │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │ + * └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ + * ┌───┐ ┌───┐ + * │GUI├───┐ ┌───┤Alt│ + * └───┤Bsp├───┐ ┌───┤Ent├───┘ + * └───┤ │ │ ├───┘ + * └───┘ └───┘ + */ + [0] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT + ) }; From c09aba6fc49f67126d661059fdb9e0185ad3130d Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 7 Mar 2023 15:46:29 +0300 Subject: [PATCH 10/11] Add files via upload --- keyboards/pierce/keymaps/via/keymap.c | 54 +++++++++++++-------------- keyboards/pierce/keymaps/via/rules.mk | 6 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/keyboards/pierce/keymaps/via/keymap.c b/keyboards/pierce/keymaps/via/keymap.c index fb49d4b0397c..2a65a8b04a07 100644 --- a/keyboards/pierce/keymaps/via/keymap.c +++ b/keyboards/pierce/keymaps/via/keymap.c @@ -1,27 +1,27 @@ -// Copyright 2023 durken -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ - * │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ - * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤ - * │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ - * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤ - * │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │ - * └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ - * ┌───┐ ┌───┐ - * │GUI├───┐ ┌───┤Alt│ - * └───┤Bsp├───┐ ┌───┤Ent├───┘ - * └───┤ │ │ ├───┘ - * └───┘ └───┘ - */ - [0] = LAYOUT_split_3x5_3( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT - ) -}; +// Copyright 2023 durken +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ + * │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ + * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤ + * │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ + * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤ + * │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │ + * └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ + * ┌───┐ ┌───┐ + * │GUI├───┐ ┌───┤Alt│ + * └───┤Bsp├───┐ ┌───┤Ent├───┘ + * └───┤ │ │ ├───┘ + * └───┘ └───┘ + */ + [0] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT + ) +}; diff --git a/keyboards/pierce/keymaps/via/rules.mk b/keyboards/pierce/keymaps/via/rules.mk index 3803ab88276f..19953fb02725 100644 --- a/keyboards/pierce/keymaps/via/rules.mk +++ b/keyboards/pierce/keymaps/via/rules.mk @@ -1,3 +1,3 @@ -TRACKPOINT = no -AUTO_BUTTONS = no -VIA_ENABLE = yes +TRACKPOINT = no +AUTO_BUTTONS = no +VIA_ENABLE = yes \ No newline at end of file From 52f31604ec99da9824fe0d50fa67a4886bc27d03 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Fri, 10 Mar 2023 16:05:24 +0300 Subject: [PATCH 11/11] Update rules.mk Were removed. TRACKPOINT = no AUTO_BUTTONS = no --- keyboards/pierce/keymaps/via/rules.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/pierce/keymaps/via/rules.mk b/keyboards/pierce/keymaps/via/rules.mk index 19953fb02725..1e5b99807cb7 100644 --- a/keyboards/pierce/keymaps/via/rules.mk +++ b/keyboards/pierce/keymaps/via/rules.mk @@ -1,3 +1 @@ -TRACKPOINT = no -AUTO_BUTTONS = no -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes