diff options
author | QMK Bot <hello@qmk.fm> | 2022-07-02 11:26:57 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-07-02 11:26:57 +0000 |
commit | a949d32072e277150508590d048d5dfcba8083bd (patch) | |
tree | a5fbd12a469d2f57b5c6722f1d1cedcd1c940bcc /keyboards/ferris | |
parent | 5d8b6847c7baaa12b76d5fea1eb93bdbf128946e (diff) | |
parent | 3842b15cf136a6edd4e6491abb3b9a85dbd5867f (diff) | |
download | qmk_firmware-a949d32072e277150508590d048d5dfcba8083bd.tar.gz qmk_firmware-a949d32072e277150508590d048d5dfcba8083bd.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/ferris')
3 files changed, 27 insertions, 0 deletions
diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h b/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h new file mode 100644 index 0000000000..dbbff11bb6 --- /dev/null +++ b/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h @@ -0,0 +1,19 @@ +// Copyright 2021 Manna Harbour +// https://github.com/manna-harbour/miryoku + +// 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 LAYOUT_miryoku( \ +K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ +K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ +K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ +N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \ +) \ +LAYOUT( \ +K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ +K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ +K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ + K33, K34, K35, K36 \ +) diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c new file mode 100644 index 0000000000..dbab7f9820 --- /dev/null +++ b/keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c @@ -0,0 +1,4 @@ +// Copyright 2019 Manna Harbour +// https://github.com/manna-harbour/miryoku + +// 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/>. diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk b/keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk new file mode 100644 index 0000000000..ef40279cbc --- /dev/null +++ b/keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk @@ -0,0 +1,4 @@ +# Copyright 2021 Manna Harbour +# https://github.com/manna-harbour/miryoku + +MIRYOKU_KLUDGE_THUMBCOMBOS=yes |