From e01e9cf728d31d5f8f87f32d8024965ff4c0e6f4 Mon Sep 17 00:00:00 2001 From: txdyqiang <116930401+txdyqiang@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:28:39 +0800 Subject: [PATCH 1/5] Theone keyboard (#22749) Co-authored-by: Drashna Jaelre Co-authored-by: Joel Challis --- keyboards/theone/keymaps/via/keymap.c | 39 +++++++++++++++++++++++++++ keyboards/theone/keymaps/via/rules.mk | 1 + 2 files changed, 40 insertions(+) create mode 100644 keyboards/theone/keymaps/via/keymap.c create mode 100644 keyboards/theone/keymaps/via/rules.mk diff --git a/keyboards/theone/keymaps/via/keymap.c b/keyboards/theone/keymaps/via/keymap.c new file mode 100644 index 00000000..cd8f8a51 --- /dev/null +++ b/keyboards/theone/keymaps/via/keymap.c @@ -0,0 +1,39 @@ +// Copyright 2023 Persama (@Persama) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +// layer Mac +[0] = LAYOUT( + KC_ESC, KC_BRID, KC_BRIU, KC_F3, KC_F4, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, + KC_GRV, 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_PGUP, + 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_PGDN, + 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_HOME, + 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +// layer Mac Fn +[1] = 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, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +// layer win +[2] = LAYOUT( + KC_ESC, 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_DEL, + KC_GRV, 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_PGUP, + 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_PGDN, + 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_HOME, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +// layer win Fn +[3] = LAYOUT( + _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/theone/keymaps/via/rules.mk b/keyboards/theone/keymaps/via/rules.mk new file mode 100644 index 00000000..1e5b9980 --- /dev/null +++ b/keyboards/theone/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From caea9e682269bd53a5a3d159b5eb5321afa7a7ca Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:46:08 -0800 Subject: [PATCH 2/5] Add Doio KB04 (#22754) Co-authored-by: Joel Challis --- keyboards/doio/kb04/keymaps/via/keymap.c | 48 ++++++++++++++++++++++++ keyboards/doio/kb04/keymaps/via/rules.mk | 2 + 2 files changed, 50 insertions(+) create mode 100644 keyboards/doio/kb04/keymaps/via/keymap.c create mode 100644 keyboards/doio/kb04/keymaps/via/rules.mk diff --git a/keyboards/doio/kb04/keymaps/via/keymap.c b/keyboards/doio/kb04/keymaps/via/keymap.c new file mode 100644 index 00000000..7df80397 --- /dev/null +++ b/keyboards/doio/kb04/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2022 filmstarr + * + * 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 layer_names { + _LAY0, + _LAY1 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* + L0: + ┌───┬───┬───┬───┐ ┌───┐ + │MO1│Prv│Ply│Nxt│ │Mut│ + └───┴───┴───┴───┘ └───┘ + L1: + ┌───┬───┬───┬───┐ ┌───┐ + │ │Hud│Tog│Mod│ │ │ + └───┴───┴───┴───┘ └───┘ +*/ + [_LAY0] = LAYOUT( + MO(_LAY1), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE + ), + [_LAY1] = LAYOUT( + KC_TRNS, RGB_HUD, RGB_TOG, RGB_MOD, KC_TRNS + ) +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_LAY0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif diff --git a/keyboards/doio/kb04/keymaps/via/rules.mk b/keyboards/doio/kb04/keymaps/via/rules.mk new file mode 100644 index 00000000..4253f570 --- /dev/null +++ b/keyboards/doio/kb04/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file From 442667955a0033dd0d8313694bb882c2264373f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Thu, 1 Feb 2024 16:04:59 -0300 Subject: [PATCH 3/5] Add Valhalla v2 PCB support (#22914) Co-authored-by: jack <0x6a73@protonmail.com> --- .../noxary/valhalla_v2/keymaps/via/keymap.c | 34 +++++++++++++++++++ .../noxary/valhalla_v2/keymaps/via/rules.mk | 1 + 2 files changed, 35 insertions(+) create mode 100755 keyboards/noxary/valhalla_v2/keymaps/via/keymap.c create mode 100644 keyboards/noxary/valhalla_v2/keymaps/via/rules.mk diff --git a/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c new file mode 100755 index 00000000..02272b92 --- /dev/null +++ b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c @@ -0,0 +1,34 @@ +/* +Copyright 2023 Gondolindrim + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + QK_GESC, 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_PGUP, + 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_PGDN, + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP, MO(1) , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT , 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_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/noxary/valhalla_v2/keymaps/via/rules.mk b/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk new file mode 100644 index 00000000..1e5b9980 --- /dev/null +++ b/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From a1bf52d5dc032c20b9c9a876d3f8f3aad4cdc10e Mon Sep 17 00:00:00 2001 From: leyew <102467346+itsme-zeix@users.noreply.github.com> Date: Fri, 2 Feb 2024 23:37:03 +0800 Subject: [PATCH 4/5] [Keyboard] Add dnworks numpad (#22882) * add dnworks numpad * Apply suggestions from code review (Added community layouts) Co-authored-by: Drashna Jaelre * fix linting * formatted json --------- Co-authored-by: Drashna Jaelre --- keyboards/dnworks/numpad/keymaps/via/keymap.c | 29 +++++++++++++++++++ keyboards/dnworks/numpad/keymaps/via/rules.mk | 1 + 2 files changed, 30 insertions(+) create mode 100644 keyboards/dnworks/numpad/keymaps/via/keymap.c create mode 100644 keyboards/dnworks/numpad/keymaps/via/rules.mk diff --git a/keyboards/dnworks/numpad/keymaps/via/keymap.c b/keyboards/dnworks/numpad/keymaps/via/keymap.c new file mode 100644 index 00000000..ad8c5887 --- /dev/null +++ b/keyboards/dnworks/numpad/keymaps/via/keymap.c @@ -0,0 +1,29 @@ +/* +Copyright 2023 zeix (@itsme-zeix) + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_ortho_6x4( + KC_ESC, KC_APP, KC_TAB, KC_BSPC, + + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_P0, KC_PDOT, KC_PENT + ), +}; diff --git a/keyboards/dnworks/numpad/keymaps/via/rules.mk b/keyboards/dnworks/numpad/keymaps/via/rules.mk new file mode 100644 index 00000000..1e5b9980 --- /dev/null +++ b/keyboards/dnworks/numpad/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From 27fa8ab946643cd132a0d4acda603150edc76bea Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Fri, 2 Feb 2024 23:01:10 +0700 Subject: [PATCH 5/5] Add GreatPad macropad under gkeyboard (#22696) * Add GreatPad under gkeyboard Add GreatPad macropad * Update keyboards/gkeyboard/greatpad/config.h Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/greatpad.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/info.json Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/info.json Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Add a license header Add a license header to glcdfont.c * Update glcdfont.c * delete file * Revert "delete file" This reverts commit 388e6f03e47bd646df374e37cd82fc3c46330b38. * Update keyboards/gkeyboard/greatpad/mcuconf.h Co-authored-by: jack <0x6a73@protonmail.com> * Update .vscode/settings.json Co-authored-by: Ryan * Update keyboards/gkeyboard/greatpad/readme.md Co-authored-by: Ryan * Enable encoder Enable encoder in file info.json * Update keyboards/gkeyboard/greatpad/greatpad.c Co-authored-by: Drashna Jaelre * Update info.json Run qmk format-json -i file info.json --------- Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan Co-authored-by: Drashna Jaelre --- .../gkeyboard/greatpad/keymaps/via/keymap.c | 21 +++++++++++++++++++ .../gkeyboard/greatpad/keymaps/via/rules.mk | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 keyboards/gkeyboard/greatpad/keymaps/via/keymap.c create mode 100644 keyboards/gkeyboard/greatpad/keymaps/via/rules.mk diff --git a/keyboards/gkeyboard/greatpad/keymaps/via/keymap.c b/keyboards/gkeyboard/greatpad/keymaps/via/keymap.c new file mode 100644 index 00000000..1fd0edc5 --- /dev/null +++ b/keyboards/gkeyboard/greatpad/keymaps/via/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_MUTE, RGB_TOG, + KC_P7, KC_P8, KC_P9, KC_PSLS, KC_NUM, + KC_P4, KC_P5, KC_P6, KC_PAST, KC_PGUP, + KC_P1, KC_P2, KC_P3, KC_PMNS, KC_PGDN, + KC_P0, KC_PDOT, KC_PENT, KC_PPLS, _______ + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) }, +}; +#endif diff --git a/keyboards/gkeyboard/greatpad/keymaps/via/rules.mk b/keyboards/gkeyboard/greatpad/keymaps/via/rules.mk new file mode 100644 index 00000000..f1adcab0 --- /dev/null +++ b/keyboards/gkeyboard/greatpad/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes