diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2022-01-30 15:10:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-30 23:10:42 +0000 |
| commit | 2e13f7d9f00df0b7b08d890cb71568698014f77e (patch) | |
| tree | 865cb2e0bdf56e814b1b363f0360afe45b60fec9 /keyboards | |
| parent | c6a613ef7c7135ad6c9e6d4f78beeb29b21f4d42 (diff) | |
| download | qmk_firmware-2e13f7d9f00df0b7b08d890cb71568698014f77e.tar.gz qmk_firmware-2e13f7d9f00df0b7b08d890cb71568698014f77e.zip | |
Mechlovin Olly BB Touch-Up (#16137)
* fix keymap alignment
Both the `default` and `via` keymaps had misalignments on the top 3 layers, which was misleading as to which keycode was on which switch on those layers.
* fix layout macro reference in info.json
* friendly-format info.json, phase 1
Adds line breaks between keyboard rows.
* correct info.json key sequence
* bb.h: use XXX for KC_NO
* bb.h: add matrix diagram
* add LAYOUT_ansi_split_bs
Includes reference keymap.
* add LAYOUT_iso_split_bs
Includes reference keymap.
* info.json: remove meta key
Diffstat (limited to 'keyboards')
8 files changed, 401 insertions, 44 deletions
diff --git a/keyboards/mechlovin/olly/bb/bb.h b/keyboards/mechlovin/olly/bb/bb.h index 91a8f2389..7980a1c4e 100644 --- a/keyboards/mechlovin/olly/bb/bb.h +++ b/keyboards/mechlovin/olly/bb/bb.h | |||
| @@ -18,6 +18,35 @@ | |||
| 18 | 18 | ||
| 19 | #include "quantum.h" | 19 | #include "quantum.h" |
| 20 | 20 | ||
| 21 | #define XXX KC_NO | ||
| 22 | |||
| 23 | /* | ||
| 24 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐ ┌───────┐ | ||
| 25 | * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D ││0E ││0F │0G │0H │0I │ │0D │ 2u Backspace | ||
| 26 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤ └─┬─────┤ ┌───┐ | ||
| 27 | * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2E ││1E ││1F │1G │1H │1I │ │ │ │ │ | ||
| 28 | * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┼───┤ ┌──┴┐2D │ ISO Enter │2I │ 2u Plus | ||
| 29 | * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │2F │2G │2H │2I │ │2C │ │ │ │ | ||
| 30 | * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ├───┼───┼───┼───┤ ┌─┴───┴────┤ ├───┤ | ||
| 31 | * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │┌───┐│3F │3G │3H │3I │ │3C │ 2.75u RShift │ │ | ||
| 32 | * └────────┘ ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬────┼───┘│3E │└───┼───┼───┼───┤ └──────────┘ │4I │ 2u Enter | ||
| 33 | * │40 │41 │43 │46 │4A │4B │4C │┌───┼───┼───┐│4G │4H │4I │ │ │ | ||
| 34 | * └─────┴───┴─────┴────────────────────────┴────┴────┴────┘│4D │4E │4F │└───┴───┴───┘ └───┘ | ||
| 35 | * └───┴───┴───┘┌───────┐ | ||
| 36 | * ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐ │4G │ 2u 0 | ||
| 37 | * │40 │41 │43 │46 │4A │4B │4C │ └───────┘ | ||
| 38 | * └────┴────┴────┴────────────────────────┴─────┴─────┴───┘ | ||
| 39 | * ┌────┬────┬────┬────────────────────────┬─────┬───┬─────┐ | ||
| 40 | * │40 │41 │43 │46 │4A │4B │4C │ | ||
| 41 | * └────┴────┴────┴────────────────────────┴─────┴───┴─────┘ | ||
| 42 | * ┌────┬────┬────┬────────────────────────┬─────┬────┬────┐ | ||
| 43 | * │40 │41 │43 │46 │4A │4B │4C │ | ||
| 44 | * └────┴────┴────┴────────────────────────┴─────┴────┴────┘ | ||
| 45 | * ┌─────┬───┬─────┬───────────────────────────┬─────┬─────┐ | ||
| 46 | * │40 │41 │43 │46 │4B │4C │ | ||
| 47 | * └─────┴───┴─────┴───────────────────────────┴─────┴─────┘ | ||
| 48 | */ | ||
| 49 | |||
| 21 | #define LAYOUT_all( \ | 50 | #define LAYOUT_all( \ |
| 22 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E, K0F, K0G, K0H, K0I, \ | 51 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E, K0F, K0G, K0H, K0I, \ |
| 23 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2E, K1E, K1F, K1G, K1H, K1I, \ | 52 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2E, K1E, K1F, K1G, K1H, K1I, \ |
| @@ -25,9 +54,37 @@ | |||
| 25 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, \ | 54 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, \ |
| 26 | K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I \ | 55 | K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I \ |
| 27 | ) { \ | 56 | ) { \ |
| 28 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \ | 57 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \ |
| 29 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \ | 58 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \ |
| 30 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I }, \ | 59 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I }, \ |
| 31 | { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \ | 60 | { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \ |
| 32 | { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \ | 61 | { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \ |
| 62 | } | ||
| 63 | |||
| 64 | #define LAYOUT_ansi_split_bs( \ | ||
| 65 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E, K0F, K0G, K0H, K0I, \ | ||
| 66 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2E, K1E, K1F, K1G, K1H, K1I, \ | ||
| 67 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, K2G, K2H, K2I, \ | ||
| 68 | K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, \ | ||
| 69 | K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I \ | ||
| 70 | ) { \ | ||
| 71 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \ | ||
| 72 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \ | ||
| 73 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E, K2F, K2G, K2H, K2I }, \ | ||
| 74 | { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \ | ||
| 75 | { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \ | ||
| 76 | } | ||
| 77 | |||
| 78 | #define LAYOUT_iso_split_bs( \ | ||
| 79 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E, K0F, K0G, K0H, K0I, \ | ||
| 80 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, K1G, K1H, K1I, \ | ||
| 81 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, K2I, \ | ||
| 82 | K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, \ | ||
| 83 | K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I \ | ||
| 84 | ) { \ | ||
| 85 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \ | ||
| 86 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \ | ||
| 87 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F, K2G, K2H, K2I }, \ | ||
| 88 | { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \ | ||
| 89 | { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \ | ||
| 33 | } | 90 | } |
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json index 90e07662f..fbc9bae3e 100644 --- a/keyboards/mechlovin/olly/bb/info.json +++ b/keyboards/mechlovin/olly/bb/info.json | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | "url": "", | 3 | "url": "", |
| 4 | "maintainer": "Mechlovin' Studio", | 4 | "maintainer": "Mechlovin' Studio", |
| 5 | "layouts": { | 5 | "layouts": { |
| 6 | "LAYOUT": { | 6 | "LAYOUT_all": { |
| 7 | "layout": [ | 7 | "layout": [ |
| 8 | { "label": "K00 (B0,B5)", "x": 0, "y": 0 }, | 8 | { "label": "K00 (B0,B5)", "x": 0, "y": 0 }, |
| 9 | { "label": "K01 (B0,B6)", "x": 1, "y": 0 }, | 9 | { "label": "K01 (B0,B6)", "x": 1, "y": 0 }, |
| @@ -25,6 +25,7 @@ | |||
| 25 | { "label": "K0G (B0,D5)", "x": 17.5, "y": 0 }, | 25 | { "label": "K0G (B0,D5)", "x": 17.5, "y": 0 }, |
| 26 | { "label": "K0H (B0,D6)", "x": 18.5, "y": 0 }, | 26 | { "label": "K0H (B0,D6)", "x": 18.5, "y": 0 }, |
| 27 | { "label": "K0I (B0,D7)", "x": 19.5, "y": 0 }, | 27 | { "label": "K0I (B0,D7)", "x": 19.5, "y": 0 }, |
| 28 | |||
| 28 | { "label": "K10 (B1,B5)", "x": 0, "y": 1, "w": 1.5 }, | 29 | { "label": "K10 (B1,B5)", "x": 0, "y": 1, "w": 1.5 }, |
| 29 | { "label": "K11 (B1,B6)", "x": 1.5, "y": 1 }, | 30 | { "label": "K11 (B1,B6)", "x": 1.5, "y": 1 }, |
| 30 | { "label": "K12 (B1,B7)", "x": 2.5, "y": 1 }, | 31 | { "label": "K12 (B1,B7)", "x": 2.5, "y": 1 }, |
| @@ -44,6 +45,7 @@ | |||
| 44 | { "label": "K1G (B1,D5)", "x": 17.5, "y": 1 }, | 45 | { "label": "K1G (B1,D5)", "x": 17.5, "y": 1 }, |
| 45 | { "label": "K1H (B1,D6)", "x": 18.5, "y": 1 }, | 46 | { "label": "K1H (B1,D6)", "x": 18.5, "y": 1 }, |
| 46 | { "label": "K1I (B1,D7)", "x": 19.5, "y": 1 }, | 47 | { "label": "K1I (B1,D7)", "x": 19.5, "y": 1 }, |
| 48 | |||
| 47 | { "label": "K20 (B2,B5)", "x": 0, "y": 2, "w": 1.75 }, | 49 | { "label": "K20 (B2,B5)", "x": 0, "y": 2, "w": 1.75 }, |
| 48 | { "label": "K21 (B2,B6)", "x": 1.75, "y": 2 }, | 50 | { "label": "K21 (B2,B6)", "x": 1.75, "y": 2 }, |
| 49 | { "label": "K22 (B2,B7)", "x": 2.75, "y": 2 }, | 51 | { "label": "K22 (B2,B7)", "x": 2.75, "y": 2 }, |
| @@ -62,6 +64,7 @@ | |||
| 62 | { "label": "K2G (B2,D5)", "x": 17.5, "y": 2 }, | 64 | { "label": "K2G (B2,D5)", "x": 17.5, "y": 2 }, |
| 63 | { "label": "K2H (B2,D6)", "x": 18.5, "y": 2 }, | 65 | { "label": "K2H (B2,D6)", "x": 18.5, "y": 2 }, |
| 64 | { "label": "K2I (B2,D7)", "x": 19.5, "y": 2 }, | 66 | { "label": "K2I (B2,D7)", "x": 19.5, "y": 2 }, |
| 67 | |||
| 65 | { "label": "K30 (B3,B5)", "x": 0, "y": 3, "w": 1.25 }, | 68 | { "label": "K30 (B3,B5)", "x": 0, "y": 3, "w": 1.25 }, |
| 66 | { "label": "K31 (B3,B6)", "x": 1.25, "y": 3 }, | 69 | { "label": "K31 (B3,B6)", "x": 1.25, "y": 3 }, |
| 67 | { "label": "K32 (B3,B7)", "x": 2.25, "y": 3 }, | 70 | { "label": "K32 (B3,B7)", "x": 2.25, "y": 3 }, |
| @@ -76,11 +79,12 @@ | |||
| 76 | { "label": "K3B (B3,D0)", "x": 11.25, "y": 3 }, | 79 | { "label": "K3B (B3,D0)", "x": 11.25, "y": 3 }, |
| 77 | { "label": "K3C (B3,D1)", "x": 12.25, "y": 3, "w": 1.75 }, | 80 | { "label": "K3C (B3,D1)", "x": 12.25, "y": 3, "w": 1.75 }, |
| 78 | { "label": "K3D (B3,D2)", "x": 14, "y": 3 }, | 81 | { "label": "K3D (B3,D2)", "x": 14, "y": 3 }, |
| 82 | { "label": "K3E (B3,D3)", "x": 15.25, "y": 3.25 }, | ||
| 79 | { "label": "K3F (B3,D4)", "x": 16.5, "y": 3 }, | 83 | { "label": "K3F (B3,D4)", "x": 16.5, "y": 3 }, |
| 80 | { "label": "K3G (B3,D5)", "x": 17.5, "y": 3 }, | 84 | { "label": "K3G (B3,D5)", "x": 17.5, "y": 3 }, |
| 81 | { "label": "K3H (B3,D6)", "x": 18.5, "y": 3 }, | 85 | { "label": "K3H (B3,D6)", "x": 18.5, "y": 3 }, |
| 82 | { "label": "K3I (B3,D7)", "x": 19.5, "y": 3 }, | 86 | { "label": "K3I (B3,D7)", "x": 19.5, "y": 3 }, |
| 83 | { "label": "K3E (B3,D3)", "x": 15.25, "y": 3.25 }, | 87 | |
| 84 | { "label": "K40 (B4,B5)", "x": 0, "y": 4, "w": 1.5 }, | 88 | { "label": "K40 (B4,B5)", "x": 0, "y": 4, "w": 1.5 }, |
| 85 | { "label": "K41 (B4,B6)", "x": 1.5, "y": 4 }, | 89 | { "label": "K41 (B4,B6)", "x": 1.5, "y": 4 }, |
| 86 | { "label": "K43 (B4,C0)", "x": 2.5, "y": 4, "w": 1.5 }, | 90 | { "label": "K43 (B4,C0)", "x": 2.5, "y": 4, "w": 1.5 }, |
| @@ -88,14 +92,204 @@ | |||
| 88 | { "label": "K4A (B4,C7)", "x": 10.25, "y": 4, "w": 1.25 }, | 92 | { "label": "K4A (B4,C7)", "x": 10.25, "y": 4, "w": 1.25 }, |
| 89 | { "label": "K4B (B4,D0)", "x": 11.5, "y": 4, "w": 1.25 }, | 93 | { "label": "K4B (B4,D0)", "x": 11.5, "y": 4, "w": 1.25 }, |
| 90 | { "label": "K4C (B4,D1)", "x": 12.75, "y": 4, "w": 1.25 }, | 94 | { "label": "K4C (B4,D1)", "x": 12.75, "y": 4, "w": 1.25 }, |
| 91 | { "label": "K4G (B4,D5)", "x": 17.5, "y": 4 }, | ||
| 92 | { "label": "K4H (B4,D6)", "x": 18.5, "y": 4 }, | ||
| 93 | { "label": "K4I (B4,D7)", "x": 19.5, "y": 4 }, | ||
| 94 | { "label": "K4D (B4,D2)", "x": 14.25, "y": 4.25 }, | 95 | { "label": "K4D (B4,D2)", "x": 14.25, "y": 4.25 }, |
| 95 | { "label": "K4E (B4,D3)", "x": 15.25, "y": 4.25 }, | 96 | { "label": "K4E (B4,D3)", "x": 15.25, "y": 4.25 }, |
| 96 | { "label": "K4F (B4,D4)", "x": 16.25, "y": 4.25 } | 97 | { "label": "K4F (B4,D4)", "x": 16.25, "y": 4.25 }, |
| 98 | { "label": "K4G (B4,D5)", "x": 17.5, "y": 4 }, | ||
| 99 | { "label": "K4H (B4,D6)", "x": 18.5, "y": 4 }, | ||
| 100 | { "label": "K4I (B4,D7)", "x": 19.5, "y": 4 } | ||
| 101 | ] | ||
| 102 | }, | ||
| 103 | "LAYOUT_ansi_split_bs": { | ||
| 104 | "layout": [ | ||
| 105 | { "label": "Esc", "x": 0, "y": 0 }, | ||
| 106 | { "label": "1!", "x": 1, "y": 0 }, | ||
| 107 | { "label": "2@", "x": 2, "y": 0 }, | ||
| 108 | { "label": "3#", "x": 3, "y": 0 }, | ||
| 109 | { "label": "4$", "x": 4, "y": 0 }, | ||
| 110 | { "label": "5%", "x": 5, "y": 0 }, | ||
| 111 | { "label": "6^", "x": 6, "y": 0 }, | ||
| 112 | { "label": "7*", "x": 7, "y": 0 }, | ||
| 113 | { "label": "8*", "x": 8, "y": 0 }, | ||
| 114 | { "label": "9(", "x": 9, "y": 0 }, | ||
| 115 | { "label": "0)", "x": 10, "y": 0 }, | ||
| 116 | { "label": "-_", "x": 11, "y": 0 }, | ||
| 117 | { "label": "=+", "x": 12, "y": 0 }, | ||
| 118 | { "label": "Backspace", "x": 13, "y": 0 }, | ||
| 119 | { "label": "Backspace", "x": 14, "y": 0 }, | ||
| 120 | { "label": "Insert", "x": 15.25, "y": 0 }, | ||
| 121 | { "label": "Num Lock", "x": 16.5, "y": 0 }, | ||
| 122 | { "label": "/", "x": 17.5, "y": 0 }, | ||
| 123 | { "label": "*", "x": 18.5, "y": 0 }, | ||
| 124 | { "label": "Pause", "x": 19.5, "y": 0 }, | ||
| 125 | |||
| 126 | { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, | ||
| 127 | { "label": "Q", "x": 1.5, "y": 1 }, | ||
| 128 | { "label": "W", "x": 2.5, "y": 1 }, | ||
| 129 | { "label": "E", "x": 3.5, "y": 1 }, | ||
| 130 | { "label": "R", "x": 4.5, "y": 1 }, | ||
| 131 | { "label": "T", "x": 5.5, "y": 1 }, | ||
| 132 | { "label": "Y", "x": 6.5, "y": 1 }, | ||
| 133 | { "label": "U", "x": 7.5, "y": 1 }, | ||
| 134 | { "label": "I", "x": 8.5, "y": 1 }, | ||
| 135 | { "label": "O", "x": 9.5, "y": 1 }, | ||
| 136 | { "label": "P", "x": 10.5, "y": 1 }, | ||
| 137 | { "label": "[{", "x": 11.5, "y": 1 }, | ||
| 138 | { "label": "]}", "x": 12.5, "y": 1 }, | ||
| 139 | { "label": "\\|", "x": 13.5, "y": 1, "w": 1.5 }, | ||
| 140 | { "label": "Delete", "x": 15.25, "y": 1 }, | ||
| 141 | { "label": "7", "x": 16.5, "y": 1 }, | ||
| 142 | { "label": "8", "x": 17.5, "y": 1 }, | ||
| 143 | { "label": "9", "x": 18.5, "y": 1 }, | ||
| 144 | { "label": "-", "x": 19.5, "y": 1 }, | ||
| 145 | |||
| 146 | { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 }, | ||
| 147 | { "label": "A", "x": 1.75, "y": 2 }, | ||
| 148 | { "label": "S", "x": 2.75, "y": 2 }, | ||
| 149 | { "label": "D", "x": 3.75, "y": 2 }, | ||
| 150 | { "label": "F", "x": 4.75, "y": 2 }, | ||
| 151 | { "label": "G", "x": 5.75, "y": 2 }, | ||
| 152 | { "label": "H", "x": 6.75, "y": 2 }, | ||
| 153 | { "label": "J", "x": 7.75, "y": 2 }, | ||
| 154 | { "label": "K", "x": 8.75, "y": 2 }, | ||
| 155 | { "label": "L", "x": 9.75, "y": 2 }, | ||
| 156 | { "label": ";:", "x": 10.75, "y": 2 }, | ||
| 157 | { "label": "'\"", "x": 11.75, "y": 2 }, | ||
| 158 | { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, | ||
| 159 | { "label": "4", "x": 16.5, "y": 2 }, | ||
| 160 | { "label": "5", "x": 17.5, "y": 2 }, | ||
| 161 | { "label": "6", "x": 18.5, "y": 2 }, | ||
| 162 | { "label": "+", "x": 19.5, "y": 2 }, | ||
| 163 | |||
| 164 | { "label": "Shift", "x": 0, "y": 3, "w": 2.25 }, | ||
| 165 | { "label": "Z", "x": 2.25, "y": 3 }, | ||
| 166 | { "label": "X", "x": 3.25, "y": 3 }, | ||
| 167 | { "label": "C", "x": 4.25, "y": 3 }, | ||
| 168 | { "label": "V", "x": 5.25, "y": 3 }, | ||
| 169 | { "label": "B", "x": 6.25, "y": 3 }, | ||
| 170 | { "label": "N", "x": 7.25, "y": 3 }, | ||
| 171 | { "label": "M", "x": 8.25, "y": 3 }, | ||
| 172 | { "label": ",<", "x": 9.25, "y": 3 }, | ||
| 173 | { "label": ".>", "x": 10.25, "y": 3 }, | ||
| 174 | { "label": "/?", "x": 11.25, "y": 3 }, | ||
| 175 | { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, | ||
| 176 | { "label": "Fn", "x": 14, "y": 3 }, | ||
| 177 | { "label": "\u2191", "x": 15.25, "y": 3.25 }, | ||
| 178 | { "label": "1", "x": 16.5, "y": 3 }, | ||
| 179 | { "label": "2", "x": 17.5, "y": 3 }, | ||
| 180 | { "label": "3", "x": 18.5, "y": 3 }, | ||
| 181 | { "label": "Enter", "x": 19.5, "y": 3 }, | ||
| 182 | |||
| 183 | { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 }, | ||
| 184 | { "label": "GUI", "x": 1.5, "y": 4 }, | ||
| 185 | { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 }, | ||
| 186 | { "label": "Space", "x": 4, "y": 4, "w": 6.25 }, | ||
| 187 | { "label": "Alt", "x": 10.25, "y": 4, "w": 1.25 }, | ||
| 188 | { "label": "GUI", "x": 11.5, "y": 4, "w": 1.25 }, | ||
| 189 | { "label": "Ctrl", "x": 12.75, "y": 4, "w": 1.25 }, | ||
| 190 | { "label": "\u2190", "x": 14.25, "y": 4.25 }, | ||
| 191 | { "label": "\u2193", "x": 15.25, "y": 4.25 }, | ||
| 192 | { "label": "\u2192", "x": 16.25, "y": 4.25 }, | ||
| 193 | { "label": "0", "x": 17.5, "y": 4 }, | ||
| 194 | { "label": ".", "x": 18.5, "y": 4 }, | ||
| 195 | { "label": "Enter", "x": 19.5, "y": 4 } | ||
| 196 | ] | ||
| 197 | }, | ||
| 198 | "LAYOUT_iso_split_bs": { | ||
| 199 | "layout": [ | ||
| 200 | { "label": "Esc", "x": 0, "y": 0 }, | ||
| 201 | { "label": "1!", "x": 1, "y": 0 }, | ||
| 202 | { "label": "2\"", "x": 2, "y": 0 }, | ||
| 203 | { "label": "3\u00a3", "x": 3, "y": 0 }, | ||
| 204 | { "label": "4$", "x": 4, "y": 0 }, | ||
| 205 | { "label": "5%", "x": 5, "y": 0 }, | ||
| 206 | { "label": "6^", "x": 6, "y": 0 }, | ||
| 207 | { "label": "7*", "x": 7, "y": 0 }, | ||
| 208 | { "label": "8*", "x": 8, "y": 0 }, | ||
| 209 | { "label": "9(", "x": 9, "y": 0 }, | ||
| 210 | { "label": "0)", "x": 10, "y": 0 }, | ||
| 211 | { "label": "-_", "x": 11, "y": 0 }, | ||
| 212 | { "label": "=+", "x": 12, "y": 0 }, | ||
| 213 | { "label": "Backspace", "x": 13, "y": 0 }, | ||
| 214 | { "label": "Backspace", "x": 14, "y": 0 }, | ||
| 215 | { "label": "Insert", "x": 15.25, "y": 0 }, | ||
| 216 | { "label": "Num Lock", "x": 16.5, "y": 0 }, | ||
| 217 | { "label": "/", "x": 17.5, "y": 0 }, | ||
| 218 | { "label": "*", "x": 18.5, "y": 0 }, | ||
| 219 | { "label": "Pause", "x": 19.5, "y": 0 }, | ||
| 220 | |||
| 221 | { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, | ||
| 222 | { "label": "Q", "x": 1.5, "y": 1 }, | ||
| 223 | { "label": "W", "x": 2.5, "y": 1 }, | ||
| 224 | { "label": "E", "x": 3.5, "y": 1 }, | ||
| 225 | { "label": "R", "x": 4.5, "y": 1 }, | ||
| 226 | { "label": "T", "x": 5.5, "y": 1 }, | ||
| 227 | { "label": "Y", "x": 6.5, "y": 1 }, | ||
| 228 | { "label": "U", "x": 7.5, "y": 1 }, | ||
| 229 | { "label": "I", "x": 8.5, "y": 1 }, | ||
| 230 | { "label": "O", "x": 9.5, "y": 1 }, | ||
| 231 | { "label": "P", "x": 10.5, "y": 1 }, | ||
| 232 | { "label": "[{", "x": 11.5, "y": 1 }, | ||
| 233 | { "label": "]}", "x": 12.5, "y": 1 }, | ||
| 234 | { "label": "Delete", "x": 15.25, "y": 1 }, | ||
| 235 | { "label": "7", "x": 16.5, "y": 1 }, | ||
| 236 | { "label": "8", "x": 17.5, "y": 1 }, | ||
| 237 | { "label": "9", "x": 18.5, "y": 1 }, | ||
| 238 | { "label": "-", "x": 19.5, "y": 1 }, | ||
| 239 | |||
| 240 | { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 }, | ||
| 241 | { "label": "A", "x": 1.75, "y": 2 }, | ||
| 242 | { "label": "S", "x": 2.75, "y": 2 }, | ||
| 243 | { "label": "D", "x": 3.75, "y": 2 }, | ||
| 244 | { "label": "F", "x": 4.75, "y": 2 }, | ||
| 245 | { "label": "G", "x": 5.75, "y": 2 }, | ||
| 246 | { "label": "H", "x": 6.75, "y": 2 }, | ||
| 247 | { "label": "J", "x": 7.75, "y": 2 }, | ||
| 248 | { "label": "K", "x": 8.75, "y": 2 }, | ||
| 249 | { "label": "L", "x": 9.75, "y": 2 }, | ||
| 250 | { "label": ";:", "x": 10.75, "y": 2 }, | ||
| 251 | { "label": "'@", "x": 11.75, "y": 2 }, | ||
| 252 | { "label": "#~", "x": 12.75, "y": 2 }, | ||
| 253 | { "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2 }, | ||
| 254 | { "label": "4", "x": 16.5, "y": 2 }, | ||
| 255 | { "label": "5", "x": 17.5, "y": 2 }, | ||
| 256 | { "label": "6", "x": 18.5, "y": 2 }, | ||
| 257 | { "label": "+", "x": 19.5, "y": 2 }, | ||
| 258 | |||
| 259 | { "label": "Shift", "x": 0, "y": 3, "w": 1.25 }, | ||
| 260 | { "label": "\\|", "x": 1.25, "y": 3 }, | ||
| 261 | { "label": "Z", "x": 2.25, "y": 3 }, | ||
| 262 | { "label": "X", "x": 3.25, "y": 3 }, | ||
| 263 | { "label": "C", "x": 4.25, "y": 3 }, | ||
| 264 | { "label": "V", "x": 5.25, "y": 3 }, | ||
| 265 | { "label": "B", "x": 6.25, "y": 3 }, | ||
| 266 | { "label": "N", "x": 7.25, "y": 3 }, | ||
| 267 | { "label": "M", "x": 8.25, "y": 3 }, | ||
| 268 | { "label": ",<", "x": 9.25, "y": 3 }, | ||
| 269 | { "label": ".>", "x": 10.25, "y": 3 }, | ||
| 270 | { "label": "/?", "x": 11.25, "y": 3 }, | ||
| 271 | { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, | ||
| 272 | { "label": "Fn", "x": 14, "y": 3 }, | ||
| 273 | { "label": "\u2191", "x": 15.25, "y": 3.25 }, | ||
| 274 | { "label": "1", "x": 16.5, "y": 3 }, | ||
| 275 | { "label": "2", "x": 17.5, "y": 3 }, | ||
| 276 | { "label": "3", "x": 18.5, "y": 3 }, | ||
| 277 | { "label": "Enter", "x": 19.5, "y": 3 }, | ||
| 278 | |||
| 279 | { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 }, | ||
| 280 | { "label": "GUI", "x": 1.5, "y": 4 }, | ||
| 281 | { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 }, | ||
| 282 | { "label": "Space", "x": 4, "y": 4, "w": 6.25 }, | ||
| 283 | { "label": "Alt", "x": 10.25, "y": 4, "w": 1.25 }, | ||
| 284 | { "label": "GUI", "x": 11.5, "y": 4, "w": 1.25 }, | ||
| 285 | { "label": "Ctrl", "x": 12.75, "y": 4, "w": 1.25 }, | ||
| 286 | { "label": "\u2190", "x": 14.25, "y": 4.25 }, | ||
| 287 | { "label": "\u2193", "x": 15.25, "y": 4.25 }, | ||
| 288 | { "label": "\u2192", "x": 16.25, "y": 4.25 }, | ||
| 289 | { "label": "0", "x": 17.5, "y": 4 }, | ||
| 290 | { "label": ".", "x": 18.5, "y": 4 }, | ||
| 291 | { "label": "Enter", "x": 19.5, "y": 4 } | ||
| 97 | ] | 292 | ] |
| 98 | } | 293 | } |
| 99 | } | 294 | } |
| 100 | ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" | ||
| 101 | } | 295 | } |
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c index c7c0da223..d1bcb7cb2 100644 --- a/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c +++ b/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c | |||
| @@ -24,25 +24,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT | 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT |
| 25 | ), | 25 | ), |
| 26 | [1] = LAYOUT_all( | 26 | [1] = LAYOUT_all( |
| 27 | 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, | 27 | 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, |
| 28 | 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, | 28 | 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, |
| 29 | 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, | 29 | 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, |
| 30 | 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, | 30 | 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, |
| 31 | 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 | 31 | 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 |
| 32 | ), | 32 | ), |
| 33 | [2] = LAYOUT_all( | 33 | [2] = LAYOUT_all( |
| 34 | 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, | 34 | 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, |
| 35 | 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, | 35 | 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, |
| 36 | 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, | 36 | 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, |
| 37 | 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, | 37 | 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, |
| 38 | 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 | 38 | 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 |
| 39 | ), | 39 | ), |
| 40 | [3] = LAYOUT_all( | 40 | [3] = LAYOUT_all( |
| 41 | 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, | 41 | 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, |
| 42 | 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, | 42 | 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, |
| 43 | 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, | 43 | 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, |
| 44 | 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, | 44 | 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, |
| 45 | 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 | 45 | 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 |
| 46 | ), | 46 | ), |
| 47 | 47 | ||
| 48 | }; \ No newline at end of file | 48 | }; |
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c new file mode 100644 index 000000000..652cf85c9 --- /dev/null +++ b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | /* Copyright 2021 mechlovin, QMK (James Young @noroadsleft) | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include QMK_KEYBOARD_H | ||
| 17 | |||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 19 | |||
| 20 | [0] = LAYOUT_ansi_split_bs( | ||
| 21 | 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_BSPC, KC_DEL, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS, | ||
| 22 | 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_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS, | ||
| 23 | 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, | ||
| 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, | ||
| 25 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT | ||
| 26 | ), | ||
| 27 | |||
| 28 | [1] = LAYOUT_ansi_split_bs( | ||
| 29 | 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, _______, _______, _______, _______, _______, _______, _______, | ||
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, | ||
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, | ||
| 33 | _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______ | ||
| 34 | ), | ||
| 35 | |||
| 36 | [2] = LAYOUT_ansi_split_bs( | ||
| 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 42 | ), | ||
| 43 | |||
| 44 | [3] = LAYOUT_ansi_split_bs( | ||
| 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 48 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 49 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 50 | ), | ||
| 51 | |||
| 52 | }; | ||
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md new file mode 100644 index 000000000..95cffc54a --- /dev/null +++ b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md | |||
| @@ -0,0 +1 @@ | |||
| # The default_ansi_split_bs keymap for Olly BB | |||
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c new file mode 100644 index 000000000..e0abc90c4 --- /dev/null +++ b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | /* Copyright 2021 mechlovin, QMK (James Young @noroadsleft) | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include QMK_KEYBOARD_H | ||
| 17 | |||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 19 | |||
| 20 | [0] = LAYOUT_iso_split_bs( | ||
| 21 | 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_BSPC, KC_DEL, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS, | ||
| 22 | 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_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS, | ||
| 23 | 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, | ||
| 24 | 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_RSFT, MO(1), KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, | ||
| 25 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT | ||
| 26 | ), | ||
| 27 | |||
| 28 | [1] = LAYOUT_iso_split_bs( | ||
| 29 | 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, _______, _______, _______, _______, _______, _______, _______, | ||
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______, _______, _______, _______, _______, | ||
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______, _______, _______, _______, | ||
| 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, | ||
| 33 | _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______ | ||
| 34 | ), | ||
| 35 | |||
| 36 | [2] = LAYOUT_iso_split_bs( | ||
| 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 42 | ), | ||
| 43 | |||
| 44 | [3] = LAYOUT_iso_split_bs( | ||
| 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 48 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 49 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 50 | ), | ||
| 51 | |||
| 52 | }; | ||
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md new file mode 100644 index 000000000..7ad1086f9 --- /dev/null +++ b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md | |||
| @@ -0,0 +1 @@ | |||
| # The default_iso_split_bs keymap for Olly BB | |||
diff --git a/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c index c7c0da223..d1bcb7cb2 100644 --- a/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c +++ b/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c | |||
| @@ -24,25 +24,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT | 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT |
| 25 | ), | 25 | ), |
| 26 | [1] = LAYOUT_all( | 26 | [1] = LAYOUT_all( |
| 27 | 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, | 27 | 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, |
| 28 | 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, | 28 | 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, |
| 29 | 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, | 29 | 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, |
| 30 | 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, | 30 | 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, |
| 31 | 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 | 31 | 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 |
| 32 | ), | 32 | ), |
| 33 | [2] = LAYOUT_all( | 33 | [2] = LAYOUT_all( |
| 34 | 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, | 34 | 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, |
| 35 | 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, | 35 | 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, |
| 36 | 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, | 36 | 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, |
| 37 | 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, | 37 | 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, |
| 38 | 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 | 38 | 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 |
| 39 | ), | 39 | ), |
| 40 | [3] = LAYOUT_all( | 40 | [3] = LAYOUT_all( |
| 41 | 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, | 41 | 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, |
| 42 | 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, | 42 | 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, |
| 43 | 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, | 43 | 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, |
| 44 | 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, | 44 | 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, |
| 45 | 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 | 45 | 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 |
| 46 | ), | 46 | ), |
| 47 | 47 | ||
| 48 | }; \ No newline at end of file | 48 | }; |
