Merge remote-tracking branch 'origin/master' into develop

2 files changed, 53 insertions, 2 deletions

diff --git a/layouts/community/ergodox/manna-harbour_miryoku/config.h b/layouts/community/ergodox/manna-harbour_miryoku/config.h
index 10c61fdfdc..566701bfc4 100644
--- a/layouts/community/ergodox/manna-harbour_miryoku/config.h
+++ b/layouts/community/ergodox/manna-harbour_miryoku/config.h
@@ -1,6 +1,5 @@
 // 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/>.
 
@@ -8,6 +7,58 @@
 
 #define XXX KC_NO
 
+#if defined (MIRYOKU_MAPPING_SHIFTED_ROWS)
+#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_ergodox_pretty( \
+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,                K25, K26, K27, K28, K29, XXX, \
+XXX, XXX, XXX, K32, K33, K34, XXX,      XXX, K35, K36, K37, XXX, XXX, XXX, \
+XXX, XXX, XXX, XXX, XXX,                          XXX, XXX, XXX, XXX, XXX, \
+                         XXX, XXX,      XXX, XXX, \
+                              XXX,      XXX, \
+                    XXX, XXX, XXX,      XXX, XXX, XXX \
+)
+#elif defined (MIRYOKU_MAPPING_SHIFTED_ROWS_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_ergodox_pretty( \
+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,                K25, K26, K27, K28, K29, XXX, \
+XXX, XXX, XXX, XXX, K32, K33, K34,      K35, K36, K37, XXX, XXX, XXX, XXX, \
+XXX, XXX, XXX, XXX, XXX,                          XXX, XXX, XXX, XXX, XXX, \
+                         XXX, XXX,      XXX, XXX, \
+                              XXX,      XXX, \
+                    XXX, XXX, XXX,      XXX, XXX, XXX \
+)
+#elif defined (MIRYOKU_MAPPING_SHIFTED_ROWS_EXTENDED_THUMBS_PINKIE_STAGGER) || defined (MIRYOKU_MAPPING_PEAK_ERGODOX)
+#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_ergodox_pretty( \
+XXX, XXX, K01, K02, K03, K04, XXX,      XXX, K05, K06, K07, K08, XXX, XXX, \
+XXX, K00, K11, K12, K13, K14, XXX,      XXX, K15, K16, K17, K18, K09, XXX, \
+XXX, K10, K21, K22, K23, K24,                K25, K26, K27, K28, K19, XXX, \
+XXX, K20, XXX, XXX, K32, K33, K34,      K35, K36, K37, XXX, XXX, K29, XXX, \
+XXX, XXX, XXX, XXX, XXX,                          XXX, XXX, XXX, XXX, XXX, \
+                         XXX, XXX,      XXX, XXX, \
+                              XXX,      XXX, \
+                    XXX, XXX, XXX,      XXX, XXX, 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,\
@@ -24,3 +75,4 @@ XXX, XXX, XXX, XXX, K32,                          K37, XXX, XXX, XXX, XXX,\
                               XXX,      XXX,\
                     K33, K34, XXX,      XXX, K35, K36\
 )
+#endif
diff --git a/layouts/community/ergodox/manna-harbour_miryoku/keymap.c b/layouts/community/ergodox/manna-harbour_miryoku/keymap.c
index 7c5717a0fe..dbab7f9820 100644
--- a/layouts/community/ergodox/manna-harbour_miryoku/keymap.c
+++ b/layouts/community/ergodox/manna-harbour_miryoku/keymap.c
@@ -1,5 +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/>.