[Keymap] Update Miryoku (qmk#19190)

obsilab · Nov 30, 2022 · 0b29af1 · 0b29af1
1 parent 5d516ac
commit 0b29af1
Show file tree

Hide file tree

Showing 10 changed files with 203 additions and 71 deletions.
diff --git a/keyboards/takashicompany/minizone/keymaps/manna-harbour_miryoku/config.h 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/...is/keymaps/manna-harbour_miryoku/keymap.c → ...ne/keymaps/manna-harbour_miryoku/keymap.c b/...is/keymaps/manna-harbour_miryoku/keymap.c → ...ne/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
@@ -0,0 +1,4 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+LTO_ENABLE = yes
diff --git a/...is/keymaps/manna-harbour_miryoku/config.h → ...plit_3x5_2/manna-harbour_miryoku/config.h b/...is/keymaps/manna-harbour_miryoku/config.h → ...plit_3x5_2/manna-harbour_miryoku/config.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Manna Harbour
+// 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/>.
@@ -11,7 +11,7 @@ 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( \
+LAYOUT_split_3x5_2( \
 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, \

diff --git a/layouts/community/split_3x5_2/manna-harbour_miryoku/keymap.c b/layouts/community/split_3x5_2/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/...is/keymaps/manna-harbour_miryoku/rules.mk → ...plit_3x5_2/manna-harbour_miryoku/rules.mk b/...is/keymaps/manna-harbour_miryoku/rules.mk → ...plit_3x5_2/manna-harbour_miryoku/rules.mk
diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.c b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
@@ -7,12 +7,60 @@
 
 #include "manna-harbour_miryoku.h"
 
+
+// Additional Features double tap guard
+
+enum {
+    U_TD_BOOT,
+#define MIRYOKU_X(LAYER, STRING) U_TD_U_##LAYER,
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
+};
+
+void u_td_fn_boot(qk_tap_dance_state_t *state, void *user_data) { \
+  if (state->count == 2) {
+    reset_keyboard();
+  }
+}
+
+#define MIRYOKU_X(LAYER, STRING) \
+void u_td_fn_U_##LAYER(qk_tap_dance_state_t *state, void *user_data) { \
+  if (state->count == 2) { \
+    default_layer_set((layer_state_t)1 << U_##LAYER); \
+  } \
+}
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [U_TD_BOOT] = ACTION_TAP_DANCE_FN(u_td_fn_boot),
+#define MIRYOKU_X(LAYER, STRING) [U_TD_U_##LAYER] = ACTION_TAP_DANCE_FN(u_td_fn_U_##LAYER),
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
+};
+
+
+// keymap
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #define MIRYOKU_X(LAYER, STRING) [U_##LAYER] = U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_##LAYER, MIRYOKU_LAYER_##LAYER),
 MIRYOKU_LAYER_LIST
 #undef MIRYOKU_X
 };
 
+
+// shift functions
+
+const key_override_t capsword_key_override = ko_make_basic(MOD_MASK_SHIFT, CW_TOGG, KC_CAPS);
+
+const key_override_t **key_overrides = (const key_override_t *[]){
+    &capsword_key_override,
+    NULL
+};
+
+
+// thumb combos
+
 #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS)
 const uint16_t PROGMEM thumbcombos_base_right[] = {LT(U_SYM, KC_ENT), LT(U_NUM, KC_BSPC), COMBO_END};
 const uint16_t PROGMEM thumbcombos_base_left[] = {LT(U_NAV, KC_SPC), LT(U_MOUSE, KC_TAB), COMBO_END};