From 89e0fba75db52ee37bfae98fbae3e038496b75df Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 19 May 2022 00:48:01 -0700
Subject: [PATCH] Hineybush Ibis Layout Additions and Configurator Rendering
Update (#17132)
* info.json: apply friendly formatting
* info.json: remove dead space from rendering
* info.json: insert line breaks between physical rows in layout data
* info.json: fix overlap in key rendering
Fixes an issue where the ANSI Enter key renders on top of the ISO Hash/Tilde key, visually hiding the latter.
* add LAYOUT_ansi_all macro with associated keymap
Duplicates `LAYOUT_all`, but with the ISO Hash/Tilde and ISO Backslash keys removed.
- ANSI Enter and 2.25u Left Shift
- Backspace, Right Shift, Numpad Plus and Numpad Enter all split
- 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row
* add LAYOUT_iso_all macro with associated keymap
Duplicates `LAYOUT_all`, but with the ANSI Backslash key removed.
- ISO Enter and 1.25u Left Shift
- Backspace, Right Shift, Numpad Plus and Numpad Enter all split
- 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row
---
keyboards/hineybush/ibis/info.json | 1008 +++++------------
.../ibis/keymaps/default_ansi_all/keymap.c | 28 +
.../ibis/keymaps/default_iso_all/keymap.c | 28 +
3 files changed, 340 insertions(+), 724 deletions(-)
create mode 100644 keyboards/hineybush/ibis/keymaps/default_ansi_all/keymap.c
create mode 100644 keyboards/hineybush/ibis/keymaps/default_iso_all/keymap.c
diff --git a/keyboards/hineybush/ibis/info.json b/keyboards/hineybush/ibis/info.json
index 69960e13ab48..7e844f1bf1f4 100644
--- a/keyboards/hineybush/ibis/info.json
+++ b/keyboards/hineybush/ibis/info.json
@@ -52,730 +52,290 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {
- "matrix": [
- 0,
- 0
- ],
- "x": 2.5,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 0
- ],
- "x": 3.5,
- "y": 1.25
- },
- {
- "matrix": [
- 0,
- 1
- ],
- "x": 4.5,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 1
- ],
- "x": 5.5,
- "y": 1.25
- },
- {
- "matrix": [
- 0,
- 2
- ],
- "x": 6.5,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 2
- ],
- "x": 7.5,
- "y": 1.25
- },
- {
- "matrix": [
- 0,
- 3
- ],
- "x": 8.5,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 3
- ],
- "x": 9.5,
- "y": 1.25
- },
- {
- "matrix": [
- 0,
- 4
- ],
- "x": 10.5,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 4
- ],
- "x": 11.5,
- "y": 1.25
- },
- {
- "matrix": [
- 0,
- 5
- ],
- "x": 12.5,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 5
- ],
- "x": 13.5,
- "y": 1.25
- },
- {
- "matrix": [
- 0,
- 6
- ],
- "x": 14.5,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 6
- ],
- "x": 15.5,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 7
- ],
- "x": 16.5,
- "y": 1.25
- },
- {
- "matrix": [
- 3,
- 7
- ],
- "x": 17.75,
- "y": 1.25
- },
- {
- "matrix": [
- 0,
- 8
- ],
- "x": 19,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 8
- ],
- "x": 20,
- "y": 1.25
- },
- {
- "matrix": [
- 0,
- 9
- ],
- "x": 21,
- "y": 1.25
- },
- {
- "matrix": [
- 1,
- 9
- ],
- "x": 22,
- "y": 1.25
- },
- {
- "matrix": [
- 2,
- 0
- ],
- "x": 2.5,
- "y": 2.25,
- "w": 1.5
- },
- {
- "matrix": [
- 3,
- 0
- ],
- "x": 4,
- "y": 2.25
- },
- {
- "matrix": [
- 2,
- 1
- ],
- "x": 5,
- "y": 2.25
- },
- {
- "matrix": [
- 3,
- 1
- ],
- "x": 6,
- "y": 2.25
- },
- {
- "matrix": [
- 2,
- 2
- ],
- "x": 7,
- "y": 2.25
- },
- {
- "matrix": [
- 3,
- 2
- ],
- "x": 8,
- "y": 2.25
- },
- {
- "matrix": [
- 2,
- 3
- ],
- "x": 9,
- "y": 2.25
- },
- {
- "matrix": [
- 3,
- 3
- ],
- "x": 10,
- "y": 2.25
- },
- {
- "matrix": [
- 2,
- 4
- ],
- "x": 11,
- "y": 2.25
- },
- {
- "matrix": [
- 3,
- 4
- ],
- "x": 12,
- "y": 2.25
- },
- {
- "matrix": [
- 2,
- 5
- ],
- "x": 13,
- "y": 2.25
- },
- {
- "matrix": [
- 3,
- 5
- ],
- "x": 14,
- "y": 2.25
- },
- {
- "matrix": [
- 2,
- 6
- ],
- "x": 15,
- "y": 2.25
- },
- {
- "matrix": [
- 3,
- 6
- ],
- "x": 16,
- "y": 2.25,
- "w": 1.5
- },
- {
- "matrix": [
- 5,
- 7
- ],
- "x": 17.75,
- "y": 2.25
- },
- {
- "matrix": [
- 2,
- 8
- ],
- "x": 19,
- "y": 2.25
- },
- {
- "matrix": [
- 3,
- 8
- ],
- "x": 20,
- "y": 2.25
- },
- {
- "matrix": [
- 2,
- 9
- ],
- "x": 21,
- "y": 2.25
- },
- {
- "matrix": [
- 3,
- 9
- ],
- "x": 22,
- "y": 2.25
- },
- {
- "matrix": [
- 4,
- 0
- ],
- "x": 2.5,
- "y": 3.25,
- "w": 1.75
- },
- {
- "matrix": [
- 5,
- 0
- ],
- "x": 4.25,
- "y": 3.25
- },
- {
- "matrix": [
- 4,
- 1
- ],
- "x": 5.25,
- "y": 3.25
- },
- {
- "matrix": [
- 5,
- 1
- ],
- "x": 6.25,
- "y": 3.25
- },
- {
- "matrix": [
- 4,
- 2
- ],
- "x": 7.25,
- "y": 3.25
- },
- {
- "matrix": [
- 5,
- 2
- ],
- "x": 8.25,
- "y": 3.25
- },
- {
- "matrix": [
- 4,
- 3
- ],
- "x": 9.25,
- "y": 3.25
- },
- {
- "matrix": [
- 5,
- 3
- ],
- "x": 10.25,
- "y": 3.25
- },
- {
- "matrix": [
- 4,
- 4
- ],
- "x": 11.25,
- "y": 3.25
- },
- {
- "matrix": [
- 5,
- 4
- ],
- "x": 12.25,
- "y": 3.25
- },
- {
- "matrix": [
- 4,
- 5
- ],
- "x": 13.25,
- "y": 3.25
- },
- {
- "matrix": [
- 5,
- 5
- ],
- "x": 14.25,
- "y": 3.25
- },
- {
- "matrix": [
- 4,
- 6
- ],
- "x": 15.25,
- "y": 3.25
- },
- {
- "matrix": [
- 5,
- 6
- ],
- "x": 15.25,
- "y": 3.25,
- "w": 2.25
- },
- {
- "matrix": [
- 4,
- 8
- ],
- "x": 19,
- "y": 3.25
- },
- {
- "matrix": [
- 5,
- 8
- ],
- "x": 20,
- "y": 3.25
- },
- {
- "matrix": [
- 4,
- 9
- ],
- "x": 21,
- "y": 3.25
- },
- {
- "matrix": [
- 5,
- 9
- ],
- "x": 22,
- "y": 3.25
- },
- {
- "matrix": [
- 6,
- 0
- ],
- "x": 2.5,
- "y": 4.25,
- "w": 1.25
- },
- {
- "matrix": [
- 7,
- 0
- ],
- "x": 3.75,
- "y": 4.25
- },
- {
- "matrix": [
- 6,
- 1
- ],
- "x": 4.75,
- "y": 4.25
- },
- {
- "matrix": [
- 7,
- 1
- ],
- "x": 5.75,
- "y": 4.25
- },
- {
- "matrix": [
- 6,
- 2
- ],
- "x": 6.75,
- "y": 4.25
- },
- {
- "matrix": [
- 7,
- 2
- ],
- "x": 7.75,
- "y": 4.25
- },
- {
- "matrix": [
- 6,
- 3
- ],
- "x": 8.75,
- "y": 4.25
- },
- {
- "matrix": [
- 7,
- 3
- ],
- "x": 9.75,
- "y": 4.25
- },
- {
- "matrix": [
- 6,
- 4
- ],
- "x": 10.75,
- "y": 4.25
- },
- {
- "matrix": [
- 7,
- 4
- ],
- "x": 11.75,
- "y": 4.25
- },
- {
- "matrix": [
- 6,
- 5
- ],
- "x": 12.75,
- "y": 4.25
- },
- {
- "matrix": [
- 7,
- 5
- ],
- "x": 13.75,
- "y": 4.25
- },
- {
- "matrix": [
- 6,
- 6
- ],
- "x": 14.75,
- "y": 4.25,
- "w": 1.75
- },
- {
- "matrix": [
- 7,
- 6
- ],
- "x": 16.5,
- "y": 4.25
- },
- {
- "matrix": [
- 7,
- 7
- ],
- "x": 17.75,
- "y": 4.5
- },
- {
- "matrix": [
- 6,
- 8
- ],
- "x": 19,
- "y": 4.25
- },
- {
- "matrix": [
- 7,
- 8
- ],
- "x": 20,
- "y": 4.25
- },
- {
- "matrix": [
- 6,
- 9
- ],
- "x": 21,
- "y": 4.25
- },
- {
- "matrix": [
- 7,
- 9
- ],
- "x": 22,
- "y": 4.25
- },
- {
- "matrix": [
- 8,
- 0
- ],
- "x": 2.5,
- "y": 5.25,
- "w": 1.5
- },
- {
- "matrix": [
- 9,
- 0
- ],
- "x": 4,
- "y": 5.25
- },
- {
- "matrix": [
- 8,
- 1
- ],
- "x": 5,
- "y": 5.25,
- "w": 1.5
- },
- {
- "matrix": [
- 8,
- 3
- ],
- "x": 6.5,
- "y": 5.25,
- "w": 6.25
- },
- {
- "matrix": [
- 8,
- 5
- ],
- "x": 12.75,
- "y": 5.25,
- "w": 1.25
- },
- {
- "matrix": [
- 9,
- 5
- ],
- "x": 14,
- "y": 5.25,
- "w": 1.25
- },
- {
- "matrix": [
- 8,
- 6
- ],
- "x": 15.25,
- "y": 5.25,
- "w": 1.25
- },
- {
- "matrix": [
- 9,
- 6
- ],
- "x": 16.75,
- "y": 5.5
- },
- {
- "matrix": [
- 9,
- 7
- ],
- "x": 17.75,
- "y": 5.5
- },
- {
- "matrix": [
- 8,
- 8
- ],
- "x": 18.75,
- "y": 5.5
- },
- {
- "matrix": [
- 9,
- 8
- ],
- "x": 20,
- "y": 5.25
- },
- {
- "matrix": [
- 8,
- 9
- ],
- "x": 21,
- "y": 5.25
- },
- {
- "matrix": [
- 9,
- 9
- ],
- "x": 22,
- "y": 5.25
- }
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [1, 0], "x":1, "y":0},
+ {"matrix": [0, 1], "x":2, "y":0},
+ {"matrix": [1, 1], "x":3, "y":0},
+ {"matrix": [0, 2], "x":4, "y":0},
+ {"matrix": [1, 2], "x":5, "y":0},
+ {"matrix": [0, 3], "x":6, "y":0},
+ {"matrix": [1, 3], "x":7, "y":0},
+ {"matrix": [0, 4], "x":8, "y":0},
+ {"matrix": [1, 4], "x":9, "y":0},
+ {"matrix": [0, 5], "x":10, "y":0},
+ {"matrix": [1, 5], "x":11, "y":0},
+ {"matrix": [0, 6], "x":12, "y":0},
+ {"matrix": [1, 6], "x":13, "y":0},
+ {"matrix": [1, 7], "x":14, "y":0},
+ {"matrix": [3, 7], "x":15.25, "y":0},
+ {"matrix": [0, 8], "x":16.5, "y":0},
+ {"matrix": [1, 8], "x":17.5, "y":0},
+ {"matrix": [0, 9], "x":18.5, "y":0},
+ {"matrix": [1, 9], "x":19.5, "y":0},
+
+ {"matrix": [2, 0], "x":0, "y":1, "w":1.5},
+ {"matrix": [3, 0], "x":1.5, "y":1},
+ {"matrix": [2, 1], "x":2.5, "y":1},
+ {"matrix": [3, 1], "x":3.5, "y":1},
+ {"matrix": [2, 2], "x":4.5, "y":1},
+ {"matrix": [3, 2], "x":5.5, "y":1},
+ {"matrix": [2, 3], "x":6.5, "y":1},
+ {"matrix": [3, 3], "x":7.5, "y":1},
+ {"matrix": [2, 4], "x":8.5, "y":1},
+ {"matrix": [3, 4], "x":9.5, "y":1},
+ {"matrix": [2, 5], "x":10.5, "y":1},
+ {"matrix": [3, 5], "x":11.5, "y":1},
+ {"matrix": [2, 6], "x":12.5, "y":1},
+ {"matrix": [3, 6], "x":13.5, "y":1, "w":1.5},
+ {"matrix": [5, 7], "x":15.25, "y":1},
+ {"matrix": [2, 8], "x":16.5, "y":1},
+ {"matrix": [3, 8], "x":17.5, "y":1},
+ {"matrix": [2, 9], "x":18.5, "y":1},
+ {"matrix": [3, 9], "x":19.5, "y":1},
+
+ {"matrix": [4, 0], "x":0, "y":2, "w":1.75},
+ {"matrix": [5, 0], "x":1.75, "y":2},
+ {"matrix": [4, 1], "x":2.75, "y":2},
+ {"matrix": [5, 1], "x":3.75, "y":2},
+ {"matrix": [4, 2], "x":4.75, "y":2},
+ {"matrix": [5, 2], "x":5.75, "y":2},
+ {"matrix": [4, 3], "x":6.75, "y":2},
+ {"matrix": [5, 3], "x":7.75, "y":2},
+ {"matrix": [4, 4], "x":8.75, "y":2},
+ {"matrix": [5, 4], "x":9.75, "y":2},
+ {"matrix": [4, 5], "x":10.75, "y":2},
+ {"matrix": [5, 5], "x":11.75, "y":2},
+ {"matrix": [4, 6], "x":12.75, "y":2},
+ {"matrix": [5, 6], "x":13.75, "y":2, "w":1.25},
+ {"matrix": [4, 8], "x":16.5, "y":2},
+ {"matrix": [5, 8], "x":17.5, "y":2},
+ {"matrix": [4, 9], "x":18.5, "y":2},
+ {"matrix": [5, 9], "x":19.5, "y":2},
+
+ {"matrix": [6, 0], "x":0, "y":3, "w":1.25},
+ {"matrix": [7, 0], "x":1.25, "y":3},
+ {"matrix": [6, 1], "x":2.25, "y":3},
+ {"matrix": [7, 1], "x":3.25, "y":3},
+ {"matrix": [6, 2], "x":4.25, "y":3},
+ {"matrix": [7, 2], "x":5.25, "y":3},
+ {"matrix": [6, 3], "x":6.25, "y":3},
+ {"matrix": [7, 3], "x":7.25, "y":3},
+ {"matrix": [6, 4], "x":8.25, "y":3},
+ {"matrix": [7, 4], "x":9.25, "y":3},
+ {"matrix": [6, 5], "x":10.25, "y":3},
+ {"matrix": [7, 5], "x":11.25, "y":3},
+ {"matrix": [6, 6], "x":12.25, "y":3, "w":1.75},
+ {"matrix": [7, 6], "x":14, "y":3},
+ {"matrix": [7, 7], "x":15.25, "y":3.25},
+ {"matrix": [6, 8], "x":16.5, "y":3},
+ {"matrix": [7, 8], "x":17.5, "y":3},
+ {"matrix": [6, 9], "x":18.5, "y":3},
+ {"matrix": [7, 9], "x":19.5, "y":3},
+
+ {"matrix": [8, 0], "x":0, "y":4, "w":1.5},
+ {"matrix": [9, 0], "x":1.5, "y":4},
+ {"matrix": [8, 1], "x":2.5, "y":4, "w":1.5},
+ {"matrix": [8, 3], "x":4, "y":4, "w":6.25},
+ {"matrix": [8, 5], "x":10.25, "y":4, "w":1.25},
+ {"matrix": [9, 5], "x":11.5, "y":4, "w":1.25},
+ {"matrix": [8, 6], "x":12.75, "y":4, "w":1.25},
+ {"matrix": [9, 6], "x":14.25, "y":4.25},
+ {"matrix": [9, 7], "x":15.25, "y":4.25},
+ {"matrix": [8, 8], "x":16.25, "y":4.25},
+ {"matrix": [9, 8], "x":17.5, "y":4},
+ {"matrix": [8, 9], "x":18.5, "y":4},
+ {"matrix": [9, 9], "x":19.5, "y":4}
+ ]
+ },
+ "LAYOUT_ansi_all": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [1, 0], "x":1, "y":0},
+ {"matrix": [0, 1], "x":2, "y":0},
+ {"matrix": [1, 1], "x":3, "y":0},
+ {"matrix": [0, 2], "x":4, "y":0},
+ {"matrix": [1, 2], "x":5, "y":0},
+ {"matrix": [0, 3], "x":6, "y":0},
+ {"matrix": [1, 3], "x":7, "y":0},
+ {"matrix": [0, 4], "x":8, "y":0},
+ {"matrix": [1, 4], "x":9, "y":0},
+ {"matrix": [0, 5], "x":10, "y":0},
+ {"matrix": [1, 5], "x":11, "y":0},
+ {"matrix": [0, 6], "x":12, "y":0},
+ {"matrix": [1, 6], "x":13, "y":0},
+ {"matrix": [1, 7], "x":14, "y":0},
+ {"matrix": [3, 7], "x":15.25, "y":0},
+ {"matrix": [0, 8], "x":16.5, "y":0},
+ {"matrix": [1, 8], "x":17.5, "y":0},
+ {"matrix": [0, 9], "x":18.5, "y":0},
+ {"matrix": [1, 9], "x":19.5, "y":0},
+
+ {"matrix": [2, 0], "x":0, "y":1, "w":1.5},
+ {"matrix": [3, 0], "x":1.5, "y":1},
+ {"matrix": [2, 1], "x":2.5, "y":1},
+ {"matrix": [3, 1], "x":3.5, "y":1},
+ {"matrix": [2, 2], "x":4.5, "y":1},
+ {"matrix": [3, 2], "x":5.5, "y":1},
+ {"matrix": [2, 3], "x":6.5, "y":1},
+ {"matrix": [3, 3], "x":7.5, "y":1},
+ {"matrix": [2, 4], "x":8.5, "y":1},
+ {"matrix": [3, 4], "x":9.5, "y":1},
+ {"matrix": [2, 5], "x":10.5, "y":1},
+ {"matrix": [3, 5], "x":11.5, "y":1},
+ {"matrix": [2, 6], "x":12.5, "y":1},
+ {"matrix": [3, 6], "x":13.5, "y":1, "w":1.5},
+ {"matrix": [5, 7], "x":15.25, "y":1},
+ {"matrix": [2, 8], "x":16.5, "y":1},
+ {"matrix": [3, 8], "x":17.5, "y":1},
+ {"matrix": [2, 9], "x":18.5, "y":1},
+ {"matrix": [3, 9], "x":19.5, "y":1},
+
+ {"matrix": [4, 0], "x":0, "y":2, "w":1.75},
+ {"matrix": [5, 0], "x":1.75, "y":2},
+ {"matrix": [4, 1], "x":2.75, "y":2},
+ {"matrix": [5, 1], "x":3.75, "y":2},
+ {"matrix": [4, 2], "x":4.75, "y":2},
+ {"matrix": [5, 2], "x":5.75, "y":2},
+ {"matrix": [4, 3], "x":6.75, "y":2},
+ {"matrix": [5, 3], "x":7.75, "y":2},
+ {"matrix": [4, 4], "x":8.75, "y":2},
+ {"matrix": [5, 4], "x":9.75, "y":2},
+ {"matrix": [4, 5], "x":10.75, "y":2},
+ {"matrix": [5, 5], "x":11.75, "y":2},
+ {"matrix": [5, 6], "x":12.75, "y":2, "w":2.25},
+ {"matrix": [4, 8], "x":16.5, "y":2},
+ {"matrix": [5, 8], "x":17.5, "y":2},
+ {"matrix": [4, 9], "x":18.5, "y":2},
+ {"matrix": [5, 9], "x":19.5, "y":2},
+
+ {"matrix": [6, 0], "x":0, "y":3, "w":2.25},
+ {"matrix": [6, 1], "x":2.25, "y":3},
+ {"matrix": [7, 1], "x":3.25, "y":3},
+ {"matrix": [6, 2], "x":4.25, "y":3},
+ {"matrix": [7, 2], "x":5.25, "y":3},
+ {"matrix": [6, 3], "x":6.25, "y":3},
+ {"matrix": [7, 3], "x":7.25, "y":3},
+ {"matrix": [6, 4], "x":8.25, "y":3},
+ {"matrix": [7, 4], "x":9.25, "y":3},
+ {"matrix": [6, 5], "x":10.25, "y":3},
+ {"matrix": [7, 5], "x":11.25, "y":3},
+ {"matrix": [6, 6], "x":12.25, "y":3, "w":1.75},
+ {"matrix": [7, 6], "x":14, "y":3},
+ {"matrix": [7, 7], "x":15.25, "y":3.25},
+ {"matrix": [6, 8], "x":16.5, "y":3},
+ {"matrix": [7, 8], "x":17.5, "y":3},
+ {"matrix": [6, 9], "x":18.5, "y":3},
+ {"matrix": [7, 9], "x":19.5, "y":3},
+
+ {"matrix": [8, 0], "x":0, "y":4, "w":1.5},
+ {"matrix": [9, 0], "x":1.5, "y":4},
+ {"matrix": [8, 1], "x":2.5, "y":4, "w":1.5},
+ {"matrix": [8, 3], "x":4, "y":4, "w":6.25},
+ {"matrix": [8, 5], "x":10.25, "y":4, "w":1.25},
+ {"matrix": [9, 5], "x":11.5, "y":4, "w":1.25},
+ {"matrix": [8, 6], "x":12.75, "y":4, "w":1.25},
+ {"matrix": [9, 6], "x":14.25, "y":4.25},
+ {"matrix": [9, 7], "x":15.25, "y":4.25},
+ {"matrix": [8, 8], "x":16.25, "y":4.25},
+ {"matrix": [9, 8], "x":17.5, "y":4},
+ {"matrix": [8, 9], "x":18.5, "y":4},
+ {"matrix": [9, 9], "x":19.5, "y":4}
+ ]
+ },
+ "LAYOUT_iso_all": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [1, 0], "x":1, "y":0},
+ {"matrix": [0, 1], "x":2, "y":0},
+ {"matrix": [1, 1], "x":3, "y":0},
+ {"matrix": [0, 2], "x":4, "y":0},
+ {"matrix": [1, 2], "x":5, "y":0},
+ {"matrix": [0, 3], "x":6, "y":0},
+ {"matrix": [1, 3], "x":7, "y":0},
+ {"matrix": [0, 4], "x":8, "y":0},
+ {"matrix": [1, 4], "x":9, "y":0},
+ {"matrix": [0, 5], "x":10, "y":0},
+ {"matrix": [1, 5], "x":11, "y":0},
+ {"matrix": [0, 6], "x":12, "y":0},
+ {"matrix": [1, 6], "x":13, "y":0},
+ {"matrix": [1, 7], "x":14, "y":0},
+ {"matrix": [3, 7], "x":15.25, "y":0},
+ {"matrix": [0, 8], "x":16.5, "y":0},
+ {"matrix": [1, 8], "x":17.5, "y":0},
+ {"matrix": [0, 9], "x":18.5, "y":0},
+ {"matrix": [1, 9], "x":19.5, "y":0},
+
+ {"matrix": [2, 0], "x":0, "y":1, "w":1.5},
+ {"matrix": [3, 0], "x":1.5, "y":1},
+ {"matrix": [2, 1], "x":2.5, "y":1},
+ {"matrix": [3, 1], "x":3.5, "y":1},
+ {"matrix": [2, 2], "x":4.5, "y":1},
+ {"matrix": [3, 2], "x":5.5, "y":1},
+ {"matrix": [2, 3], "x":6.5, "y":1},
+ {"matrix": [3, 3], "x":7.5, "y":1},
+ {"matrix": [2, 4], "x":8.5, "y":1},
+ {"matrix": [3, 4], "x":9.5, "y":1},
+ {"matrix": [2, 5], "x":10.5, "y":1},
+ {"matrix": [3, 5], "x":11.5, "y":1},
+ {"matrix": [2, 6], "x":12.5, "y":1},
+ {"matrix": [5, 7], "x":15.25, "y":1},
+ {"matrix": [2, 8], "x":16.5, "y":1},
+ {"matrix": [3, 8], "x":17.5, "y":1},
+ {"matrix": [2, 9], "x":18.5, "y":1},
+ {"matrix": [3, 9], "x":19.5, "y":1},
+
+ {"matrix": [4, 0], "x":0, "y":2, "w":1.75},
+ {"matrix": [5, 0], "x":1.75, "y":2},
+ {"matrix": [4, 1], "x":2.75, "y":2},
+ {"matrix": [5, 1], "x":3.75, "y":2},
+ {"matrix": [4, 2], "x":4.75, "y":2},
+ {"matrix": [5, 2], "x":5.75, "y":2},
+ {"matrix": [4, 3], "x":6.75, "y":2},
+ {"matrix": [5, 3], "x":7.75, "y":2},
+ {"matrix": [4, 4], "x":8.75, "y":2},
+ {"matrix": [5, 4], "x":9.75, "y":2},
+ {"matrix": [4, 5], "x":10.75, "y":2},
+ {"matrix": [5, 5], "x":11.75, "y":2},
+ {"matrix": [4, 6], "x":12.75, "y":2},
+ {"matrix": [5, 6], "x":13.75, "y":1, "w":1.25, "h":2},
+ {"matrix": [4, 8], "x":16.5, "y":2},
+ {"matrix": [5, 8], "x":17.5, "y":2},
+ {"matrix": [4, 9], "x":18.5, "y":2},
+ {"matrix": [5, 9], "x":19.5, "y":2},
+
+ {"matrix": [6, 0], "x":0, "y":3, "w":1.25},
+ {"matrix": [7, 0], "x":1.25, "y":3},
+ {"matrix": [6, 1], "x":2.25, "y":3},
+ {"matrix": [7, 1], "x":3.25, "y":3},
+ {"matrix": [6, 2], "x":4.25, "y":3},
+ {"matrix": [7, 2], "x":5.25, "y":3},
+ {"matrix": [6, 3], "x":6.25, "y":3},
+ {"matrix": [7, 3], "x":7.25, "y":3},
+ {"matrix": [6, 4], "x":8.25, "y":3},
+ {"matrix": [7, 4], "x":9.25, "y":3},
+ {"matrix": [6, 5], "x":10.25, "y":3},
+ {"matrix": [7, 5], "x":11.25, "y":3},
+ {"matrix": [6, 6], "x":12.25, "y":3, "w":1.75},
+ {"matrix": [7, 6], "x":14, "y":3},
+ {"matrix": [7, 7], "x":15.25, "y":3.25},
+ {"matrix": [6, 8], "x":16.5, "y":3},
+ {"matrix": [7, 8], "x":17.5, "y":3},
+ {"matrix": [6, 9], "x":18.5, "y":3},
+ {"matrix": [7, 9], "x":19.5, "y":3},
+
+ {"matrix": [8, 0], "x":0, "y":4, "w":1.5},
+ {"matrix": [9, 0], "x":1.5, "y":4},
+ {"matrix": [8, 1], "x":2.5, "y":4, "w":1.5},
+ {"matrix": [8, 3], "x":4, "y":4, "w":6.25},
+ {"matrix": [8, 5], "x":10.25, "y":4, "w":1.25},
+ {"matrix": [9, 5], "x":11.5, "y":4, "w":1.25},
+ {"matrix": [8, 6], "x":12.75, "y":4, "w":1.25},
+ {"matrix": [9, 6], "x":14.25, "y":4.25},
+ {"matrix": [9, 7], "x":15.25, "y":4.25},
+ {"matrix": [8, 8], "x":16.25, "y":4.25},
+ {"matrix": [9, 8], "x":17.5, "y":4},
+ {"matrix": [8, 9], "x":18.5, "y":4},
+ {"matrix": [9, 9], "x":19.5, "y":4}
]
}
}
diff --git a/keyboards/hineybush/ibis/keymaps/default_ansi_all/keymap.c b/keyboards/hineybush/ibis/keymaps/default_ansi_all/keymap.c
new file mode 100644
index 000000000000..db6e42232105
--- /dev/null
+++ b/keyboards/hineybush/ibis/keymaps/default_ansi_all/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2022 Josh Hinnebusch (@hineybush), QMK / James Young (@noroadsleft)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, k37, k08, k18, k09, k19, \
+ k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k57, k28, k38, k29, k39, \
+ k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k56, k48, k58, k49, k59, \
+ k60, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k77, k68, k78, k69, k79, \
+ k80, k90, k81, k83, k85, k95, k86, k96, k97, k88, k98, k89, k99 \ */
+
+ [0] = LAYOUT_ansi_all(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PMNS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_TRNS, KC_UP, KC_P1, KC_P2, KC_P3, KC_TRNS,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ ),
+ [1] = LAYOUT_ansi_all(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_MPLY, KC_LALT, KC_TRNS, KC_RGUI, KC_MPRV, KC_VOLD, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/hineybush/ibis/keymaps/default_iso_all/keymap.c b/keyboards/hineybush/ibis/keymaps/default_iso_all/keymap.c
new file mode 100644
index 000000000000..bcd5f629afb7
--- /dev/null
+++ b/keyboards/hineybush/ibis/keymaps/default_iso_all/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2022 Josh Hinnebusch (@hineybush), QMK / James Young (@noroadsleft)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, k37, k08, k18, k09, k19, \
+ k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k57, k28, k38, k29, k39, \
+ k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k48, k58, k49, k59, \
+ k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k77, k68, k78, k69, k79, \
+ k80, k90, k81, k83, k85, k95, k86, k96, k97, k88, k98, k89, k99 \ */
+
+ [0] = LAYOUT_iso_all(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PMNS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_TRNS, KC_UP, KC_P1, KC_P2, KC_P3, KC_TRNS,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ ),
+ [1] = LAYOUT_iso_all(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUHS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_MPLY, KC_LALT, KC_TRNS, KC_RGUI, KC_MPRV, KC_VOLD, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};