[Keymap] Update Miryoku (qmk#18773)

* [miryoku] Revert "[Keymap] manna-harbour_miryoku RESET to QK_BOOT (qmk#18755)" This reverts commit 89dbc18. * [miryoku] Add keyboardio/model01 * [miryoku] Add handwired/dactyl_manuform/4x6 * [miryoku] Update BT keycodes - Update BT keycodes on Media inner index: - Move OUT_AUTO to bottom row - Move RGB_TOG in vi to pinkie column to match other TOG keycodes, and rotate row * [miryoku] Add Extra and Tap layers * [miryoku] Rename config workflow option to custom_config * [miryoku] Update custom_config.h and custom_rules.mk behaviour * [miryoku] Make mapping macro customisable globally and per layer * [miryoku] Add layer lock * [miryoku] Update RGB order in media-l-invertedt * [miryoku] Change mouse button order * [miryoku] Change to X macros for layer list - Supports adding and removing layers from custom_config.h - Add "U_" prefix to layer names - Add layer name strings - Populate keymaps array from X macro - Populate layers enum from X macro - Move layers enum to manna-harbour_miryoku.h - Rename miryoku_alternatives.h to miryoku_layer_alternatives.h - Rename miryoku_layer.h to miryoku_layer_selection.h - Remove miryoku_layer_names.h - Add miryoku_layer_list.h * [miryoku] Reformat split_3x6_3 mapping * [miryoku] Add merge field to workflows * [miryoku] Update thumb combos with new layer names * [miryoku] Update cover image * [miryoku] Add satt/vision * [miryoku] Update Branches and Building docs * [miryoku] Update reset keycode * [miryoku] Add xmk * [miryoku] Add boardsource/lulu * [miryoku] Fix keyboardio/model01
ramonimbao · Nov 28, 2022 · a86b42d · a86b42d
1 parent f0bf15f
commit a86b42d
Show file tree

Hide file tree

Showing 20 changed files with 985 additions and 472 deletions.
diff --git a/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h b/keyboards/boardsource/lulu/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,22 @@
+// 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/>.
+
+#pragma once
+
+#define XXX KC_NO
+
+#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(\
+XXX, XXX, XXX, XXX, XXX, XXX,                XXX, XXX, XXX, XXX, XXX, XXX,\
+XXX, K00, K01, K02, K03, K04,                K05, K06, K07, K08, K09, XXX,\
+XXX, K10, K11, K12, K13, K14,                K15, K16, K17, K18, K19, XXX,\
+XXX, K20, K21, K22, K23, K24, XXX,      XXX, K25, K26, K27, K28, K29, XXX,\
+               XXX, K32, K33, K34,      K35, K36, K37, XXX\
+)
diff --git a/...ryoku/miryoku_babel/miryoku_layer_names.h → ...lu/keymaps/manna-harbour_miryoku/keymap.c b/...ryoku/miryoku_babel/miryoku_layer_names.h → ...lu/keymaps/manna-harbour_miryoku/keymap.c
@@ -1,9 +1,4 @@
 // Copyright 2019 Manna Harbour
 // https://github.com/manna-harbour/miryoku
-// generated -*- buffer-read-only: t -*-
 
 // 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/>.
-
-#if !defined (MIRYOKU_LAYER_NAMES)
-  #define MIRYOKU_LAYER_NAMES BASE, BUTTON, NAV, MOUSE, MEDIA, NUM, SYM, FUN
-#endif
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,24 @@
+// 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
+
+#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( \
+XXX, K00, K01, K02, K03, K04,                         K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14,                         K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24,                         K25, K26, K27, K28, K29, XXX, \
+          XXX, XXX,                                             XXX, XXX, \
+                    K32, K33,                         K36, K37, \
+                              K34, XXX,     XXX, K35, \
+                              XXX, XXX,     XXX, XXX \
+)
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/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/keyboardio/model01/keymaps/manna-harbour_miryoku/config.h b/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,26 @@
+// 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
+
+#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( \
+XXX, XXX, XXX, XXX, XXX, XXX,                     XXX, XXX, XXX, XXX, XXX, XXX, \
+XXX, K00, K01, K02, K03, K04, XXX,           XXX, K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14, XXX,           XXX, K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24, XXX,           XXX, K25, K26, K27, K28, K29, XXX, \
+                         K32,                     K37, \
+                            K33,               K36, \
+                               K34,         K35, \
+                                  XXX,   XXX, \
+                         XXX,                     XXX \
+)
diff --git a/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/keyboardio/model01/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/keyboardio/model01/keymaps/manna-harbour_miryoku/rules.mk b/keyboards/keyboardio/model01/keymaps/manna-harbour_miryoku/rules.mk
@@ -0,0 +1,4 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+CONSOLE_ENABLE = no
diff --git a/keyboards/satt/vision/keymaps/manna-harbour_miryoku/config.h b/keyboards/satt/vision/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,21 @@
+// 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
+
+#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( \
+XXX, XXX, K00, K01, K02, K03, K04,           K05, K06, K07, K08, K09, XXX, XXX, \
+XXX, XXX, K10, K11, K12, K13, K14,           K15, K16, K17, K18, K19, XXX, \
+     XXX, K20, K21, K22, K23, K24,      XXX, K25, K26, K27, K28, K29, XXX,\
+     XXX,           K32, K33, K34,           K35, K36, K37,      XXX \
+)
diff --git a/keyboards/satt/vision/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/satt/vision/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/layouts/community/split_3x6_3/manna-harbour_miryoku/config.h b/layouts/community/split_3x6_3/manna-harbour_miryoku/config.h
@@ -1,19 +1,21 @@
-// Copyright 2019 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/>.
 
 #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_split_3x6_3(\
-KC_NO, K00,   K01,   K02,   K03,   K04,          K05,   K06,   K07,   K08,   K09,   KC_NO,\
-KC_NO, K10,   K11,   K12,   K13,   K14,          K15,   K16,   K17,   K18,   K19,   KC_NO,\
-KC_NO, K20,   K21,   K22,   K23,   K24,          K25,   K26,   K27,   K28,   K29,   KC_NO,\
-                     K32,   K33,   K34,          K35,   K36,   K37\
+#define XXX KC_NO
+
+#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_split_3x6_3( \
+XXX,  K00,  K01,  K02,  K03,  K04,         K05,  K06,  K07,  K08,  K09,  XXX, \
+XXX,  K10,  K11,  K12,  K13,  K14,         K15,  K16,  K17,  K18,  K19,  XXX, \
+XXX,  K20,  K21,  K22,  K23,  K24,         K25,  K26,  K27,  K28,  K29,  XXX , \
+                  K32,  K33,  K34,         K35,  K36,  K37 \
 )
diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "custom_config.h"
+
 // default but used in macros
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
@@ -39,5 +41,3 @@
   #define EXTRA_SHORT_COMBOS
 #endif
 
-#include "custom_config.h"
-
diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.c b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
@@ -1,4 +1,4 @@
-// Copyright 2019 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/>.
@@ -7,24 +7,17 @@
 
 #include "manna-harbour_miryoku.h"
 
-enum layers { MIRYOKU_LAYER_NAMES };
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE]   = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_BASE),
-  [NAV]    = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_NAV),
-  [MOUSE]  = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_MOUSE),
-  [MEDIA]  = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_MEDIA),
-  [NUM]    = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_NUM),
-  [SYM]    = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_SYM),
-  [FUN]    = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_FUN),
-  [BUTTON] = U_MACRO_VA_ARGS(LAYOUT_miryoku, MIRYOKU_LAYER_BUTTON)
+#define MIRYOKU_X(LAYER, STRING) [U_##LAYER] = U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_##LAYER, MIRYOKU_LAYER_##LAYER),
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
 };
 
 #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS)
-const uint16_t PROGMEM thumbcombos_base_right[] = {LT(SYM, KC_ENT), LT(NUM, KC_BSPC), COMBO_END};
-const uint16_t PROGMEM thumbcombos_base_left[] = {LT(NAV, KC_SPC), LT(MOUSE, KC_TAB), COMBO_END};
+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};
 const uint16_t PROGMEM thumbcombos_nav[] = {KC_ENT, KC_BSPC, COMBO_END};
-const uint16_t PROGMEM thumbcombos_mouse[] = {KC_BTN1, KC_BTN3, COMBO_END};
+const uint16_t PROGMEM thumbcombos_mouse[] = {KC_BTN2, KC_BTN1, COMBO_END};
 const uint16_t PROGMEM thumbcombos_media[] = {KC_MSTP, KC_MPLY, COMBO_END};
 const uint16_t PROGMEM thumbcombos_num[] = {KC_0, KC_MINS, COMBO_END};
   #if defined (MIRYOKU_LAYERS_FLIP)
@@ -34,10 +27,10 @@ const uint16_t PROGMEM thumbcombos_sym[] = {KC_RPRN, KC_UNDS, COMBO_END};
   #endif
 const uint16_t PROGMEM thumbcombos_fun[] = {KC_SPC, KC_TAB, COMBO_END};
 combo_t key_combos[COMBO_COUNT] = {
-  COMBO(thumbcombos_base_right, LT(FUN, KC_DEL)),
-  COMBO(thumbcombos_base_left, LT(MEDIA, KC_ESC)),
+  COMBO(thumbcombos_base_right, LT(U_FUN, KC_DEL)),
+  COMBO(thumbcombos_base_left, LT(U_MEDIA, KC_ESC)),
   COMBO(thumbcombos_nav, KC_DEL),
-  COMBO(thumbcombos_mouse, KC_BTN2),
+  COMBO(thumbcombos_mouse, KC_BTN3),
   COMBO(thumbcombos_media, KC_MUTE),
   COMBO(thumbcombos_num, KC_DOT),
   #if defined (MIRYOKU_LAYERS_FLIP)

diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.h b/users/manna-harbour_miryoku/manna-harbour_miryoku.h
@@ -1,15 +1,25 @@
-// Copyright 2019 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/>.
 
 #pragma once
 
-#include "miryoku_babel/miryoku_layer_names.h"
-#include "miryoku_babel/miryoku_layer.h"
+#include "miryoku_babel/miryoku_layer_selection.h"
+#include "miryoku_babel/miryoku_layer_list.h"
+
+enum miryoku_layers {
+#define MIRYOKU_X(LAYER, STRING) U_##LAYER,
+MIRYOKU_LAYER_LIST
+#undef MIRYOKU_X
+};
 
 #define U_MACRO_VA_ARGS(macro, ...) macro(__VA_ARGS__)
 
+#if !defined (MIRYOKU_MAPPING)
+  #define MIRYOKU_MAPPING LAYOUT_miryoku
+#endif
+
 #define U_NP KC_NO // key is not present
 #define U_NA KC_NO // present but not available for use
 #define U_NU KC_NO // available but not used