From 2344d67f13856636d6b1faf7d1828d95a4119c8a Mon Sep 17 00:00:00 2001 From: eosti Date: Wed, 14 Oct 2020 14:56:27 -0700 Subject: [PATCH 1/4] add split plus layout --- keyboards/keyhive/maypad/info.json | 15 +++++++++------ keyboards/keyhive/maypad/maypad.h | 18 ++++++++++++++++++ keyboards/keyhive/maypad/rules.mk | 2 +- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/keyboards/keyhive/maypad/info.json b/keyboards/keyhive/maypad/info.json index 89367173109d..7e4bd21426a0 100644 --- a/keyboards/keyhive/maypad/info.json +++ b/keyboards/keyhive/maypad/info.json @@ -1,16 +1,19 @@ { - "keyboard_name": "maypad", - "url": "https://keyhive.xyz/shop/may-pad", - "maintainer": "codybender", - "width": 4, - "height": 5, + "keyboard_name": "maypad", + "url": "https://keyhive.xyz/shop/may-pad", + "maintainer": "codybender", + "width": 4, + "height": 5, "layouts": { "LAYOUT_numpad_5x4": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}] }, + "LAYOUT_numpad_5x4_splitPlus": { + "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"=", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"-", "x":3, "y":1}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}] + }, "LAYOUT_ortho_5x4": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"00", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}] } - + } } diff --git a/keyboards/keyhive/maypad/maypad.h b/keyboards/keyhive/maypad/maypad.h index 42c71f416383..6d74fc76aa5e 100644 --- a/keyboards/keyhive/maypad/maypad.h +++ b/keyboards/keyhive/maypad/maypad.h @@ -46,6 +46,20 @@ { KC_NO, k41, k42, k43 } \ } +#define LAYOUT_numpad_5x4_splitPlus( \ + k00, k01, k02, k03, \ + k10, k11, k12, k13, \ + k20, k21, k22, k23, \ + k30, k31, k32, \ + k41, k42, k43 \ +) { \ + { k00, k01, k02, k03 }, \ + { k10, k11, k12, k13 }, \ + { k20, k21, k22, k23 }, \ + { k30, k31, k32, KC_NO }, \ + { KC_NO, k41, k42, k43 } \ +} + #define LAYOUT_ortho_5x4( \ k00, k01, k02, k03, \ k10, k11, k12, k13, \ @@ -59,3 +73,7 @@ { k30, k31, k32, k33 }, \ { k40, k41, k42, k43 } \ } + +#define LAYOUT LAYOUT_ortho_5x4 +#define LAYOUT_numpad LAYOUT_numpad_5x4 +#define LAYOUT_numpad_splitPlus LAYOUT_numpad_5x4_splitPlus diff --git a/keyboards/keyhive/maypad/rules.mk b/keyboards/keyhive/maypad/rules.mk index 1e6415d444c7..901122ab6ac1 100644 --- a/keyboards/keyhive/maypad/rules.mk +++ b/keyboards/keyhive/maypad/rules.mk @@ -32,4 +32,4 @@ AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs -LAYOUTS = ortho_5x4 numpad_5x4 +LAYOUTS = ortho_5x4 numpad_5x4 numpad_5x4_splitPlus From 0e8985f3c8bafcfbddff284d5cf7c6674bafae1f Mon Sep 17 00:00:00 2001 From: eosti Date: Wed, 14 Oct 2020 15:49:18 -0700 Subject: [PATCH 2/4] update README --- keyboards/keyhive/maypad/readme.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keyboards/keyhive/maypad/readme.md b/keyboards/keyhive/maypad/readme.md index 3467827b6d6c..2b554f1f695a 100644 --- a/keyboards/keyhive/maypad/readme.md +++ b/keyboards/keyhive/maypad/readme.md @@ -10,4 +10,9 @@ Make example for this keyboard (after setting up your build environment): make keyhive/maypad:default -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file +There are three layouts, depending on how you assembled your Maypad: +* `LAYOUT`, a 5x4 ortho layout +* `LAYOUT_numpad`, a full numpad layout with 2U 0, Enter, and + keys +* `LAYOUT_numpad_splitPlus`, a full numpad layout with only 2U 0 and Enter keys + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 910f2d383988276621f9cb86066c9667200fc267 Mon Sep 17 00:00:00 2001 From: eosti Date: Wed, 14 Oct 2020 18:19:03 -0700 Subject: [PATCH 3/4] rename splitPlus to split_plus --- keyboards/keyhive/maypad/info.json | 2 +- keyboards/keyhive/maypad/maypad.h | 6 +----- keyboards/keyhive/maypad/readme.md | 5 ----- keyboards/keyhive/maypad/rules.mk | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/keyboards/keyhive/maypad/info.json b/keyboards/keyhive/maypad/info.json index 7e4bd21426a0..df059775b3bc 100644 --- a/keyboards/keyhive/maypad/info.json +++ b/keyboards/keyhive/maypad/info.json @@ -8,7 +8,7 @@ "LAYOUT_numpad_5x4": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}] }, - "LAYOUT_numpad_5x4_splitPlus": { + "LAYOUT_numpad_5x4_split_plus": { "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"=", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"-", "x":3, "y":1}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}] }, "LAYOUT_ortho_5x4": { diff --git a/keyboards/keyhive/maypad/maypad.h b/keyboards/keyhive/maypad/maypad.h index 6d74fc76aa5e..ac576f99ead9 100644 --- a/keyboards/keyhive/maypad/maypad.h +++ b/keyboards/keyhive/maypad/maypad.h @@ -46,7 +46,7 @@ { KC_NO, k41, k42, k43 } \ } -#define LAYOUT_numpad_5x4_splitPlus( \ +#define LAYOUT_numpad_5x4_split_plus( \ k00, k01, k02, k03, \ k10, k11, k12, k13, \ k20, k21, k22, k23, \ @@ -73,7 +73,3 @@ { k30, k31, k32, k33 }, \ { k40, k41, k42, k43 } \ } - -#define LAYOUT LAYOUT_ortho_5x4 -#define LAYOUT_numpad LAYOUT_numpad_5x4 -#define LAYOUT_numpad_splitPlus LAYOUT_numpad_5x4_splitPlus diff --git a/keyboards/keyhive/maypad/readme.md b/keyboards/keyhive/maypad/readme.md index 2b554f1f695a..62db1a2f4144 100644 --- a/keyboards/keyhive/maypad/readme.md +++ b/keyboards/keyhive/maypad/readme.md @@ -10,9 +10,4 @@ Make example for this keyboard (after setting up your build environment): make keyhive/maypad:default -There are three layouts, depending on how you assembled your Maypad: -* `LAYOUT`, a 5x4 ortho layout -* `LAYOUT_numpad`, a full numpad layout with 2U 0, Enter, and + keys -* `LAYOUT_numpad_splitPlus`, a full numpad layout with only 2U 0 and Enter keys - See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/keyhive/maypad/rules.mk b/keyboards/keyhive/maypad/rules.mk index 901122ab6ac1..b33d27d5034b 100644 --- a/keyboards/keyhive/maypad/rules.mk +++ b/keyboards/keyhive/maypad/rules.mk @@ -32,4 +32,4 @@ AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs -LAYOUTS = ortho_5x4 numpad_5x4 numpad_5x4_splitPlus +LAYOUTS = ortho_5x4 numpad_5x4 numpad_5x4_split_plus From fe4ab8f112ea4d7dc023b5ea5bb0b0e502d348f7 Mon Sep 17 00:00:00 2001 From: Reid Sox-Harris Date: Wed, 14 Oct 2020 19:05:50 -0700 Subject: [PATCH 4/4] Update keyboards/keyhive/maypad/rules.mk Co-authored-by: Joel Challis --- keyboards/keyhive/maypad/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keyhive/maypad/rules.mk b/keyboards/keyhive/maypad/rules.mk index b33d27d5034b..1e6415d444c7 100644 --- a/keyboards/keyhive/maypad/rules.mk +++ b/keyboards/keyhive/maypad/rules.mk @@ -32,4 +32,4 @@ AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs -LAYOUTS = ortho_5x4 numpad_5x4 numpad_5x4_split_plus +LAYOUTS = ortho_5x4 numpad_5x4