diff options
| -rw-r--r-- | keyboards/mechlovin/hannah60rgb/info.json | 80 | ||||
| -rw-r--r-- | keyboards/mechlovin/hannah60rgb/rev1/info.json | 222 | ||||
| -rw-r--r-- | keyboards/mechlovin/hannah60rgb/rev2/info.json | 81 | ||||
| -rw-r--r-- | keyboards/v60_type_r/v60_type_r.h | 2 |
4 files changed, 304 insertions, 81 deletions
diff --git a/keyboards/mechlovin/hannah60rgb/info.json b/keyboards/mechlovin/hannah60rgb/info.json deleted file mode 100644 index e6d052b49a..0000000000 --- a/keyboards/mechlovin/hannah60rgb/info.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "keyboard_name": "hannah60rgb", - "url": "", - "maintainer": "Team Mechlovin'", - "width": 15, - "height": 5, - "layouts": { - "LAYOUT_all": { - "layout": [ - {"label":"K00 (B0,B5)", "x":2.75, "y":0}, - {"label":"K01 (B0,B6)", "x":3.75, "y":0}, - {"label":"K02 (B0,B7)", "x":4.75, "y":0}, - {"label":"K03 (B0,C0)", "x":5.75, "y":0}, - {"label":"K04 (B0,C1)", "x":6.75, "y":0}, - {"label":"K05 (B0,C2)", "x":7.75, "y":0}, - {"label":"K06 (B0,C3)", "x":8.75, "y":0}, - {"label":"K07 (B0,C4)", "x":9.75, "y":0}, - {"label":"K08 (B0,C5)", "x":10.75, "y":0}, - {"label":"K09 (B0,C6)", "x":11.75, "y":0}, - {"label":"K0A (B0,C7)", "x":12.75, "y":0}, - {"label":"K0B (B0,D0)", "x":13.75, "y":0}, - {"label":"K0C (B0,D1)", "x":14.75, "y":0}, - {"label":"K0D (B0,F5)", "x":15.75, "y":0}, - {"label":"K1D (B1,F5)", "x":16.75, "y":0}, - {"label":"K10 (B1,B5)", "x":2.75, "y":1, "w":1.5}, - {"label":"K11 (B1,B6)", "x":4.25, "y":1}, - {"label":"K12 (B1,B7)", "x":5.25, "y":1}, - {"label":"K13 (B1,C0)", "x":6.25, "y":1}, - {"label":"K14 (B1,C1)", "x":7.25, "y":1}, - {"label":"K15 (B1,C2)", "x":8.25, "y":1}, - {"label":"K16 (B1,C3)", "x":9.25, "y":1}, - {"label":"K17 (B1,C4)", "x":10.25, "y":1}, - {"label":"K18 (B1,C5)", "x":11.25, "y":1}, - {"label":"K19 (B1,C6)", "x":12.25, "y":1}, - {"label":"K1A (B1,C7)", "x":13.25, "y":1}, - {"label":"K1B (B1,D0)", "x":14.25, "y":1}, - {"label":"K1C (B1,D1)", "x":15.25, "y":1}, - {"label":"K2C (B2,D1)", "x":16.25, "y":1, "w":1.5}, - {"label":"K20 (B2,B5)", "x":2.75, "y":2, "w":1.75}, - {"label":"K21 (B2,B6)", "x":4.5, "y":2}, - {"label":"K22 (B2,B7)", "x":5.5, "y":2}, - {"label":"K23 (B2,C0)", "x":6.5, "y":2}, - {"label":"K24 (B2,C1)", "x":7.5, "y":2}, - {"label":"K25 (B2,C2)", "x":8.5, "y":2}, - {"label":"K26 (B2,C3)", "x":9.5, "y":2}, - {"label":"K27 (B2,C4)", "x":10.5, "y":2}, - {"label":"K28 (B2,C5)", "x":11.5, "y":2}, - {"label":"K29 (B2,C6)", "x":12.5, "y":2}, - {"label":"K2A (B2,C7)", "x":13.5, "y":2}, - {"label":"K2B (B2,D0)", "x":14.5, "y":2}, - {"label":"K2D (B2,F5)", "x":15.5, "y":2, "w":2.25}, - {"label":"K30 (B3,B5)", "x":2.75, "y":3, "w":1.25}, - {"label":"K31 (B3,B6)", "x":4, "y":3}, - {"label":"K32 (B3,B7)", "x":5, "y":3}, - {"label":"K33 (B3,C0)", "x":6, "y":3}, - {"label":"K34 (B3,C1)", "x":7, "y":3}, - {"label":"K35 (B3,C2)", "x":8, "y":3}, - {"label":"K36 (B3,C3)", "x":9, "y":3}, - {"label":"K37 (B3,C4)", "x":10, "y":3}, - {"label":"K38 (B3,C5)", "x":11, "y":3}, - {"label":"K39 (B3,C6)", "x":12, "y":3}, - {"label":"K3A (B3,C7)", "x":13, "y":3}, - {"label":"K3B (B3,D0)", "x":14, "y":3}, - {"label":"K3C (B3,D1)", "x":15, "y":3, "w":1.75}, - {"label":"K3D (B3,F5)", "x":16.75, "y":3}, - {"label":"K40 (B4,B5)", "x":2.75, "y":4, "w":1.25}, - {"label":"K41 (B4,B6)", "x":4, "y":4, "w":1.25}, - {"label":"K42 (B4,B7)", "x":5.25, "y":4, "w":1.25}, - {"label":"K44 (B4,C1)", "x":6.5, "y":4, "w":2.75}, - {"label":"K46 (B4,C3)", "x":9.25, "y":4, "w":1.25}, - {"label":"K48 (B4,C5)", "x":10.5, "y":4, "w":2.25}, - {"label":"K4A (B4,C7)", "x":12.75, "y":4, "w":1.25}, - {"label":"K4B (B4,D0)", "x":14, "y":4, "w":1.25}, - {"label":"K4C (B4,D1)", "x":15.25, "y":4, "w":1.25}, - {"label":"K4D (B4,F5)", "x":16.5, "y":4, "w":1.25} - ] - } - } - ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" -} diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json new file mode 100644 index 0000000000..f729ac8f29 --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -0,0 +1,222 @@ +{ + "keyboard_name": "hannah60rgb", + "url": "", + "maintainer": "Team Mechlovin'", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0}, + {"x": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0}, + {"x": 14, "y": 0}, + + {"x": 0, "y": 1, "w": 1.5}, + {"x": 1.5, "y": 1}, + {"x": 2.5, "y": 1}, + {"x": 3.5, "y": 1}, + {"x": 4.5, "y": 1}, + {"x": 5.5, "y": 1}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, + {"x": 8.5, "y": 1}, + {"x": 9.5, "y": 1}, + {"x": 10.5, "y": 1}, + {"x": 11.5, "y": 1}, + {"x": 12.5, "y": 1}, + {"x": 13.5, "y": 1, "w": 1.5}, + + {"x": 0, "y": 2, "w": 1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 5.75, "y": 2}, + {"x": 6.75, "y": 2}, + {"x": 7.75, "y": 2}, + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2, "w": 2.25}, + + {"x": 0, "y": 3, "w": 1.25}, + {"x": 1.25, "y": 3}, + {"x": 2.25, "y": 3}, + {"x": 3.25, "y": 3}, + {"x": 4.25, "y": 3}, + {"x": 5.25, "y": 3}, + {"x": 6.25, "y": 3}, + {"x": 7.25, "y": 3}, + {"x": 8.25, "y": 3}, + {"x": 9.25, "y": 3}, + {"x": 10.25, "y": 3}, + {"x": 11.25, "y": 3}, + {"x": 12.25, "y": 3, "w": 1.75}, + {"x": 14, "y": 3}, + + {"x": 0, "y": 4, "w": 1.25}, + {"x": 1.25, "y": 4, "w": 1.25}, + {"x": 2.5, "y": 4, "w": 1.25}, + {"x": 3.75, "y": 4, "w": 2.75}, + {"x": 6.5, "y": 4, "w": 1.25}, + {"x": 7.75, "y": 4, "w": 2.25}, + {"x": 10, "y": 4, "w": 1.25}, + {"x": 11.25, "y": 4, "w": 1.25}, + {"x": 12.5, "y": 4, "w": 1.25}, + {"x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0}, + {"x": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0, "w": 2}, + + {"x": 0, "y": 1, "w": 1.5}, + {"x": 1.5, "y": 1}, + {"x": 2.5, "y": 1}, + {"x": 3.5, "y": 1}, + {"x": 4.5, "y": 1}, + {"x": 5.5, "y": 1}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, + {"x": 8.5, "y": 1}, + {"x": 9.5, "y": 1}, + {"x": 10.5, "y": 1}, + {"x": 11.5, "y": 1}, + {"x": 12.5, "y": 1}, + {"x": 13.5, "y": 1, "w": 1.5}, + + {"x": 0, "y": 2, "w": 1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 5.75, "y": 2}, + {"x": 6.75, "y": 2}, + {"x": 7.75, "y": 2}, + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2, "w": 2.25}, + + {"x": 0, "y": 3, "w": 2.25}, + {"x": 2.25, "y": 3}, + {"x": 3.25, "y": 3}, + {"x": 4.25, "y": 3}, + {"x": 5.25, "y": 3}, + {"x": 6.25, "y": 3}, + {"x": 7.25, "y": 3}, + {"x": 8.25, "y": 3}, + {"x": 9.25, "y": 3}, + {"x": 10.25, "y": 3}, + {"x": 11.25, "y": 3}, + {"x": 12.25, "y": 3, "w": 2.75}, + + {"x": 0, "y": 4, "w": 1.25}, + {"x": 1.25, "y": 4, "w": 1.25}, + {"x": 2.5, "y": 4, "w": 1.25}, + {"x": 3.75, "y": 4, "w": 6.25}, + {"x": 10, "y": 4, "w": 1.25}, + {"x": 11.25, "y": 4, "w": 1.25}, + {"x": 12.5, "y": 4, "w": 1.25}, + {"x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0}, + {"x": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0, "w": 2}, + + {"x": 0, "y": 1, "w": 1.5}, + {"x": 1.5, "y": 1}, + {"x": 2.5, "y": 1}, + {"x": 3.5, "y": 1}, + {"x": 4.5, "y": 1}, + {"x": 5.5, "y": 1}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, + {"x": 8.5, "y": 1}, + {"x": 9.5, "y": 1}, + {"x": 10.5, "y": 1}, + {"x": 11.5, "y": 1}, + {"x": 12.5, "y": 1}, + + {"x": 0, "y": 2, "w": 1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 5.75, "y": 2}, + {"x": 6.75, "y": 2}, + {"x": 7.75, "y": 2}, + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2}, + {"x":13.75, "y":1, "w":1.25, "h":2}, + + {"x": 0, "y": 3, "w": 1.25}, + {"x": 1.25, "y": 3}, + {"x": 2.25, "y": 3}, + {"x": 3.25, "y": 3}, + {"x": 4.25, "y": 3}, + {"x": 5.25, "y": 3}, + {"x": 6.25, "y": 3}, + {"x": 7.25, "y": 3}, + {"x": 8.25, "y": 3}, + {"x": 9.25, "y": 3}, + {"x": 10.25, "y": 3}, + {"x": 11.25, "y": 3}, + {"x": 12.25, "y": 3, "w": 2.75}, + + {"x": 0, "y": 4, "w": 1.25}, + {"x": 1.25, "y": 4, "w": 1.25}, + {"x": 2.5, "y": 4, "w": 1.25}, + {"x": 3.75, "y": 4, "w": 6.25}, + {"x": 10, "y": 4, "w": 1.25}, + {"x": 11.25, "y": 4, "w": 1.25}, + {"x": 12.5, "y": 4, "w": 1.25}, + {"x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json new file mode 100644 index 0000000000..44e0836727 --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -0,0 +1,81 @@ +{ + "keyboard_name": "hannah60rgb", + "url": "", + "maintainer": "Team Mechlovin'", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0}, + {"x": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0}, + {"x": 14, "y": 0}, + + {"x": 0, "y": 1, "w": 1.5}, + {"x": 1.5, "y": 1}, + {"x": 2.5, "y": 1}, + {"x": 3.5, "y": 1}, + {"x": 4.5, "y": 1}, + {"x": 5.5, "y": 1}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, + {"x": 8.5, "y": 1}, + {"x": 9.5, "y": 1}, + {"x": 10.5, "y": 1}, + {"x": 11.5, "y": 1}, + {"x": 12.5, "y": 1}, + {"x": 13.5, "y": 1, "w": 1.5}, + + {"x": 0, "y": 2, "w": 1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 5.75, "y": 2}, + {"x": 6.75, "y": 2}, + {"x": 7.75, "y": 2}, + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2, "w": 2.25}, + + {"x": 0, "y": 3, "w": 1.25}, + {"x": 1.25, "y": 3}, + {"x": 2.25, "y": 3}, + {"x": 3.25, "y": 3}, + {"x": 4.25, "y": 3}, + {"x": 5.25, "y": 3}, + {"x": 6.25, "y": 3}, + {"x": 7.25, "y": 3}, + {"x": 8.25, "y": 3}, + {"x": 9.25, "y": 3}, + {"x": 10.25, "y": 3}, + {"x": 11.25, "y": 3}, + {"x": 12.25, "y": 3, "w": 1.75}, + {"x": 14, "y": 3}, + + {"x": 0, "y": 4, "w": 1.25}, + {"x": 1.25, "y": 4, "w": 1.25}, + {"x": 2.5, "y": 4, "w": 1.25}, + {"x": 3.75, "y": 4, "w": 6.25}, + {"x": 10, "y": 4, "w": 1.25}, + {"x": 11.25, "y": 4, "w": 1.25}, + {"x": 12.5, "y": 4, "w": 1.25}, + {"x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} diff --git a/keyboards/v60_type_r/v60_type_r.h b/keyboards/v60_type_r/v60_type_r.h index 78b6561ba5..8494897e62 100644 --- a/keyboards/v60_type_r/v60_type_r.h +++ b/keyboards/v60_type_r/v60_type_r.h @@ -88,7 +88,7 @@ enum my_keycodes { // KBP V60 Type R with ANSI layout - #define LAYOUT_60_ansi( \ +#define LAYOUT_60_ansi( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ |