[Keymap] Update Miryoku (#19190)

5 files changed, 44 insertions, 23 deletions

diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h b/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h
deleted file mode 100644
index dbbff11bb6..0000000000
--- a/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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/rules.mk b/keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk
deleted file mode 100644
index ef40279cbc..0000000000
--- a/keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2021 Manna Harbour
-# https://github.com/manna-harbour/miryoku
-
-MIRYOKU_KLUDGE_THUMBCOMBOS=yes
diff --git a/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/config.h b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..b899befbe3
--- /dev/null
+++ b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,40 @@
+// Copyright 2022 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 XXX KC_NO
+
+#if defined (MIRYOKU_MAPPING_EXTENDED_THUMBS)
+
+#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, \
+       XXX,   K32,   K33,   K34,                   K35,   K36,   K37,   XXX \
+)
+
+#else
+
+#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, \
+              K32,   K33,   K34, KC_BTN1, KC_BTN2, K35,   K36,   K37 \
+)
+
+#endif
diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/keymap.c
index dbab7f9820..dbab7f9820 100644
--- a/keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c
+++ b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/rules.mk b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/rules.mk
new file mode 100644
index 0000000000..0488a92d46
--- /dev/null
+++ b/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/rules.mk
@@ -0,0 +1,4 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+LTO_ENABLE = yes