diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-07-26 19:43:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 19:43:48 -0700 |
| commit | a617c8b80a5e1760ffaac5e4367d89065f2fbce9 (patch) | |
| tree | fadec9a4574074aa48578ff92d14d7812b041e4a | |
| parent | b1c5a53a68ca8a304e7739467f2793c223853f68 (diff) | |
| download | qmk_firmware-a617c8b80a5e1760ffaac5e4367d89065f2fbce9.tar.gz qmk_firmware-a617c8b80a5e1760ffaac5e4367d89065f2fbce9.zip | |
[Keyboard] Ares refactor (#13730)
| -rw-r--r-- | keyboards/ares/ares.h | 33 | ||||
| -rw-r--r-- | keyboards/ares/config.h | 4 | ||||
| -rw-r--r-- | keyboards/ares/info.json | 228 | ||||
| -rw-r--r-- | keyboards/ares/keymaps/default/keymap.c | 36 | ||||
| -rw-r--r-- | keyboards/ares/readme.md | 6 | ||||
| -rw-r--r-- | keyboards/ares/rules.mk | 29 |
6 files changed, 290 insertions, 46 deletions
diff --git a/keyboards/ares/ares.h b/keyboards/ares/ares.h index 6628bb022..13b8d885c 100644 --- a/keyboards/ares/ares.h +++ b/keyboards/ares/ares.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright 2019 Evy Dekkers | 2 | Copyright 2019 Evy Dekkers |
| 3 | 2021 James Young for QMK (@noroadsleft) | ||
| 3 | 4 | ||
| 4 | This program is free software: you can redistribute it and/or modify | 5 | This program is free software: you can redistribute it and/or modify |
| 5 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
| @@ -21,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 21 | 22 | ||
| 22 | #define XXX KC_NO | 23 | #define XXX KC_NO |
| 23 | 24 | ||
| 24 | #define LAYOUT( \ | 25 | #define LAYOUT_all( \ |
| 25 | k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ | 26 | k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ |
| 26 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ | 27 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ |
| 27 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ | 28 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ |
| @@ -35,3 +36,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 35 | {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \ | 36 | {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \ |
| 36 | {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e} \ | 37 | {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e} \ |
| 37 | } | 38 | } |
| 39 | |||
| 40 | #define LAYOUT_60_ansi_split_bs_rshift( \ | ||
| 41 | k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ | ||
| 42 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ | ||
| 43 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ | ||
| 44 | k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ | ||
| 45 | k00, k01, k02, k06, k0a, k0b, k0c, k0d \ | ||
| 46 | ) \ | ||
| 47 | { \ | ||
| 48 | {k00, k01, k02, XXX, XXX, XXX, k06, XXX, XXX, XXX, k0a, k0b, k0c, k0d, XXX}, \ | ||
| 49 | {k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \ | ||
| 50 | {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \ | ||
| 51 | {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \ | ||
| 52 | {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e} \ | ||
| 53 | } | ||
| 54 | |||
| 55 | #define LAYOUT_60_hhkb( \ | ||
| 56 | k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ | ||
| 57 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ | ||
| 58 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ | ||
| 59 | k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ | ||
| 60 | k01, k02, k06, k0b, k0c \ | ||
| 61 | ) \ | ||
| 62 | { \ | ||
| 63 | {XXX, k01, k02, XXX, XXX, XXX, k06, XXX, XXX, XXX, XXX, k0b, k0c, XXX, XXX}, \ | ||
| 64 | {k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \ | ||
| 65 | {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \ | ||
| 66 | {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \ | ||
| 67 | {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e} \ | ||
| 68 | } | ||
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h index 35e885d69..652b71e46 100644 --- a/keyboards/ares/config.h +++ b/keyboards/ares/config.h | |||
| @@ -49,5 +49,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 49 | // #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) | 49 | // #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) |
| 50 | 50 | ||
| 51 | /* Bootmagic Lite key configuration */ | 51 | /* Bootmagic Lite key configuration */ |
| 52 | // #define BOOTMAGIC_LITE_ROW 0 | 52 | #define BOOTMAGIC_LITE_ROW 4 |
| 53 | // #define BOOTMAGIC_LITE_COLUMN 0 | 53 | #define BOOTMAGIC_LITE_COLUMN 0 |
diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json index 00911deb9..ba5cf1592 100644 --- a/keyboards/ares/info.json +++ b/keyboards/ares/info.json | |||
| @@ -1,12 +1,224 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "LSJ Ares", | 2 | "keyboard_name": "LSJ Ares", |
| 3 | "url": "", | 3 | "url": "", |
| 4 | "maintainer": "qmk", | 4 | "maintainer": "qmk", |
| 5 | "width": 15, | 5 | "width": 15, |
| 6 | "height": 5, | 6 | "height": 5, |
| 7 | "layout_aliases": { | ||
| 8 | "LAYOUT": "LAYOUT_all" | ||
| 9 | }, | ||
| 7 | "layouts": { | 10 | "layouts": { |
| 8 | "LAYOUT": { | 11 | "LAYOUT_all": { |
| 9 | "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Back space", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"|", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] | 12 | "layout": [ |
| 13 | {"label":"~", "x":0, "y":0}, | ||
| 14 | {"label":"!", "x":1, "y":0}, | ||
| 15 | {"label":"@", "x":2, "y":0}, | ||
| 16 | {"label":"#", "x":3, "y":0}, | ||
| 17 | {"label":"$", "x":4, "y":0}, | ||
| 18 | {"label":"%", "x":5, "y":0}, | ||
| 19 | {"label":"^", "x":6, "y":0}, | ||
| 20 | {"label":"&", "x":7, "y":0}, | ||
| 21 | {"label":"*", "x":8, "y":0}, | ||
| 22 | {"label":"(", "x":9, "y":0}, | ||
| 23 | {"label":")", "x":10, "y":0}, | ||
| 24 | {"label":"_", "x":11, "y":0}, | ||
| 25 | {"label":"+", "x":12, "y":0}, | ||
| 26 | {"label":"|", "x":13, "y":0}, | ||
| 27 | {"label":"Back space", "x":14, "y":0}, | ||
| 28 | |||
| 29 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||
| 30 | {"label":"Q", "x":1.5, "y":1}, | ||
| 31 | {"label":"W", "x":2.5, "y":1}, | ||
| 32 | {"label":"E", "x":3.5, "y":1}, | ||
| 33 | {"label":"R", "x":4.5, "y":1}, | ||
| 34 | {"label":"T", "x":5.5, "y":1}, | ||
| 35 | {"label":"Y", "x":6.5, "y":1}, | ||
| 36 | {"label":"U", "x":7.5, "y":1}, | ||
| 37 | {"label":"I", "x":8.5, "y":1}, | ||
| 38 | {"label":"O", "x":9.5, "y":1}, | ||
| 39 | {"label":"P", "x":10.5, "y":1}, | ||
| 40 | {"label":"{", "x":11.5, "y":1}, | ||
| 41 | {"label":"}", "x":12.5, "y":1}, | ||
| 42 | {"label":"|", "x":13.5, "y":1, "w":1.5}, | ||
| 43 | |||
| 44 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||
| 45 | {"label":"A", "x":1.75, "y":2}, | ||
| 46 | {"label":"S", "x":2.75, "y":2}, | ||
| 47 | {"label":"D", "x":3.75, "y":2}, | ||
| 48 | {"label":"F", "x":4.75, "y":2}, | ||
| 49 | {"label":"G", "x":5.75, "y":2}, | ||
| 50 | {"label":"H", "x":6.75, "y":2}, | ||
| 51 | {"label":"J", "x":7.75, "y":2}, | ||
| 52 | {"label":"K", "x":8.75, "y":2}, | ||
| 53 | {"label":"L", "x":9.75, "y":2}, | ||
| 54 | {"label":":", "x":10.75, "y":2}, | ||
| 55 | {"label":"\"", "x":11.75, "y":2}, | ||
| 56 | {"label":"|", "x":12.75, "y":2}, | ||
| 57 | {"label":"Enter", "x":13.75, "y":2, "w":1.25}, | ||
| 58 | |||
| 59 | {"label":"Shift", "x":0, "y":3, "w":1.25}, | ||
| 60 | {"label":"|", "x":1.25, "y":3}, | ||
| 61 | {"label":"Z", "x":2.25, "y":3}, | ||
| 62 | {"label":"X", "x":3.25, "y":3}, | ||
| 63 | {"label":"C", "x":4.25, "y":3}, | ||
| 64 | {"label":"V", "x":5.25, "y":3}, | ||
| 65 | {"label":"B", "x":6.25, "y":3}, | ||
| 66 | {"label":"N", "x":7.25, "y":3}, | ||
| 67 | {"label":"M", "x":8.25, "y":3}, | ||
| 68 | {"label":"<", "x":9.25, "y":3}, | ||
| 69 | {"label":">", "x":10.25, "y":3}, | ||
| 70 | {"label":"?", "x":11.25, "y":3}, | ||
| 71 | {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||
| 72 | {"label":"Fn", "x":14, "y":3}, | ||
| 73 | |||
| 74 | {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||
| 75 | {"label":"Win", "x":1.25, "y":4, "w":1.25}, | ||
| 76 | {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||
| 77 | {"label":"Space", "x":3.75, "y":4, "w":6.25}, | ||
| 78 | {"label":"Alt", "x":10, "y":4, "w":1.25}, | ||
| 79 | {"label":"Win", "x":11.25, "y":4, "w":1.25}, | ||
| 80 | {"label":"Menu", "x":12.5, "y":4, "w":1.25}, | ||
| 81 | {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} | ||
| 82 | ] | ||
| 83 | }, | ||
| 84 | "LAYOUT_60_ansi_split_bs_rshift": { | ||
| 85 | "layout": [ | ||
| 86 | {"x":0, "y":0}, | ||
| 87 | {"x":1, "y":0}, | ||
| 88 | {"x":2, "y":0}, | ||
| 89 | {"x":3, "y":0}, | ||
| 90 | {"x":4, "y":0}, | ||
| 91 | {"x":5, "y":0}, | ||
| 92 | {"x":6, "y":0}, | ||
| 93 | {"x":7, "y":0}, | ||
| 94 | {"x":8, "y":0}, | ||
| 95 | {"x":9, "y":0}, | ||
| 96 | {"x":10, "y":0}, | ||
| 97 | {"x":11, "y":0}, | ||
| 98 | {"x":12, "y":0}, | ||
| 99 | {"x":13, "y":0}, | ||
| 100 | {"x":14, "y":0}, | ||
| 101 | |||
| 102 | {"x":0, "y":1, "w":1.5}, | ||
| 103 | {"x":1.5, "y":1}, | ||
| 104 | {"x":2.5, "y":1}, | ||
| 105 | {"x":3.5, "y":1}, | ||
| 106 | {"x":4.5, "y":1}, | ||
| 107 | {"x":5.5, "y":1}, | ||
| 108 | {"x":6.5, "y":1}, | ||
| 109 | {"x":7.5, "y":1}, | ||
| 110 | {"x":8.5, "y":1}, | ||
| 111 | {"x":9.5, "y":1}, | ||
| 112 | {"x":10.5, "y":1}, | ||
| 113 | {"x":11.5, "y":1}, | ||
| 114 | {"x":12.5, "y":1}, | ||
| 115 | {"x":13.5, "y":1, "w":1.5}, | ||
| 116 | |||
| 117 | {"x":0, "y":2, "w":1.75}, | ||
| 118 | {"x":1.75, "y":2}, | ||
| 119 | {"x":2.75, "y":2}, | ||
| 120 | {"x":3.75, "y":2}, | ||
| 121 | {"x":4.75, "y":2}, | ||
| 122 | {"x":5.75, "y":2}, | ||
| 123 | {"x":6.75, "y":2}, | ||
| 124 | {"x":7.75, "y":2}, | ||
| 125 | {"x":8.75, "y":2}, | ||
| 126 | {"x":9.75, "y":2}, | ||
| 127 | {"x":10.75, "y":2}, | ||
| 128 | {"x":11.75, "y":2}, | ||
| 129 | {"x":12.75, "y":2, "w":2.25}, | ||
| 130 | |||
| 131 | {"x":0, "y":3, "w":2.25}, | ||
| 132 | {"x":2.25, "y":3}, | ||
| 133 | {"x":3.25, "y":3}, | ||
| 134 | {"x":4.25, "y":3}, | ||
| 135 | {"x":5.25, "y":3}, | ||
| 136 | {"x":6.25, "y":3}, | ||
| 137 | {"x":7.25, "y":3}, | ||
| 138 | {"x":8.25, "y":3}, | ||
| 139 | {"x":9.25, "y":3}, | ||
| 140 | {"x":10.25, "y":3}, | ||
| 141 | {"x":11.25, "y":3}, | ||
| 142 | {"x":12.25, "y":3, "w":1.75}, | ||
| 143 | {"x":14, "y":3}, | ||
| 144 | |||
| 145 | {"x":0, "y":4, "w":1.25}, | ||
| 146 | {"x":1.25, "y":4, "w":1.25}, | ||
| 147 | {"x":2.5, "y":4, "w":1.25}, | ||
| 148 | {"x":3.75, "y":4, "w":6.25}, | ||
| 149 | {"x":10, "y":4, "w":1.25}, | ||
| 150 | {"x":11.25, "y":4, "w":1.25}, | ||
| 151 | {"x":12.5, "y":4, "w":1.25}, | ||
| 152 | {"x":13.75, "y":4, "w":1.25} | ||
| 153 | ] | ||
| 154 | }, | ||
| 155 | "LAYOUT_60_hhkb": { | ||
| 156 | "layout": [ | ||
| 157 | {"x":0, "y":0}, | ||
| 158 | {"x":1, "y":0}, | ||
| 159 | {"x":2, "y":0}, | ||
| 160 | {"x":3, "y":0}, | ||
| 161 | {"x":4, "y":0}, | ||
| 162 | {"x":5, "y":0}, | ||
| 163 | {"x":6, "y":0}, | ||
| 164 | {"x":7, "y":0}, | ||
| 165 | {"x":8, "y":0}, | ||
| 166 | {"x":9, "y":0}, | ||
| 167 | {"x":10, "y":0}, | ||
| 168 | {"x":11, "y":0}, | ||
| 169 | {"x":12, "y":0}, | ||
| 170 | {"x":13, "y":0}, | ||
| 171 | {"x":14, "y":0}, | ||
| 172 | |||
| 173 | {"x":0, "y":1, "w":1.5}, | ||
| 174 | {"x":1.5, "y":1}, | ||
| 175 | {"x":2.5, "y":1}, | ||
| 176 | {"x":3.5, "y":1}, | ||
| 177 | {"x":4.5, "y":1}, | ||
| 178 | {"x":5.5, "y":1}, | ||
| 179 | {"x":6.5, "y":1}, | ||
| 180 | {"x":7.5, "y":1}, | ||
| 181 | {"x":8.5, "y":1}, | ||
| 182 | {"x":9.5, "y":1}, | ||
| 183 | {"x":10.5, "y":1}, | ||
| 184 | {"x":11.5, "y":1}, | ||
| 185 | {"x":12.5, "y":1}, | ||
| 186 | {"x":13.5, "y":1, "w":1.5}, | ||
| 187 | |||
| 188 | {"x":0, "y":2, "w":1.75}, | ||
| 189 | {"x":1.75, "y":2}, | ||
| 190 | {"x":2.75, "y":2}, | ||
| 191 | {"x":3.75, "y":2}, | ||
| 192 | {"x":4.75, "y":2}, | ||
| 193 | {"x":5.75, "y":2}, | ||
| 194 | {"x":6.75, "y":2}, | ||
| 195 | {"x":7.75, "y":2}, | ||
| 196 | {"x":8.75, "y":2}, | ||
| 197 | {"x":9.75, "y":2}, | ||
| 198 | {"x":10.75, "y":2}, | ||
| 199 | {"x":11.75, "y":2}, | ||
| 200 | {"x":12.75, "y":2, "w":2.25}, | ||
| 201 | |||
| 202 | {"x":0, "y":3, "w":2.25}, | ||
| 203 | {"x":2.25, "y":3}, | ||
| 204 | {"x":3.25, "y":3}, | ||
| 205 | {"x":4.25, "y":3}, | ||
| 206 | {"x":5.25, "y":3}, | ||
| 207 | {"x":6.25, "y":3}, | ||
| 208 | {"x":7.25, "y":3}, | ||
| 209 | {"x":8.25, "y":3}, | ||
| 210 | {"x":9.25, "y":3}, | ||
| 211 | {"x":10.25, "y":3}, | ||
| 212 | {"x":11.25, "y":3}, | ||
| 213 | {"x":12.25, "y":3, "w":1.75}, | ||
| 214 | {"x":14, "y":3}, | ||
| 215 | |||
| 216 | {"x":1.5, "y":4}, | ||
| 217 | {"x":2.5, "y":4, "w":1.5}, | ||
| 218 | {"x":4, "y":4, "w":7}, | ||
| 219 | {"x":11, "y":4, "w":1.5}, | ||
| 220 | {"x":12.5, "y":4} | ||
| 221 | ] | ||
| 10 | } | 222 | } |
| 11 | } | 223 | } |
| 12 | } \ No newline at end of file | 224 | } |
diff --git a/keyboards/ares/keymaps/default/keymap.c b/keyboards/ares/keymaps/default/keymap.c index 490dbdf62..8b95db507 100644 --- a/keyboards/ares/keymaps/default/keymap.c +++ b/keyboards/ares/keymaps/default/keymap.c | |||
| @@ -17,24 +17,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #include QMK_KEYBOARD_H | 18 | #include QMK_KEYBOARD_H |
| 19 | 19 | ||
| 20 | #define _MA 0 | 20 | enum layer_names { |
| 21 | #define _FN 1 | 21 | _MA, |
| 22 | 22 | _FN, | |
| 23 | #define ______ KC_TRNS | 23 | }; |
| 24 | 24 | ||
| 25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 26 | 26 | ||
| 27 | [_MA] = LAYOUT( | 27 | [_MA] = LAYOUT_all( |
| 28 | 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_BSLS, KC_BSPC, | 28 | 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_BSLS, KC_BSPC, |
| 29 | 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, | 29 | 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, |
| 30 | 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_BSLS, KC_ENT, | 30 | 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_BSLS, KC_ENT, |
| 31 | 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(_FN), | 31 | 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(_FN), |
| 32 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTRL), | 32 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL |
| 33 | [_FN] = LAYOUT( | 33 | ), |
| 34 | RGB_MOD, BL_TOGG, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, RESET, | 34 | [_FN] = LAYOUT_all( |
| 35 | ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, | 35 | RGB_MOD, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, |
| 36 | ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, | 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 37 | ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, | 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 38 | ______, ______, ______, ______, ______, ______, ______, ______) | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 39 | 39 | _______, _______, _______, _______, _______, _______, _______, _______ | |
| 40 | ) | ||
| 41 | |||
| 40 | }; | 42 | }; |
diff --git a/keyboards/ares/readme.md b/keyboards/ares/readme.md index 376cee437..a1e04ecf9 100644 --- a/keyboards/ares/readme.md +++ b/keyboards/ares/readme.md | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | # lSJ Ares | 1 | # LSJ Ares |
| 2 | 2 | ||
| 3 | * Keyboard Maintainer: QMK Community | 3 | * Keyboard Maintainer: QMK Community |
| 4 | * Hardware Supported: LSJ Ares PCB | 4 | * Hardware Supported: LSJ Ares PCB |
| 5 | * Hardware Availability: <https://geekhack.org/index.php?topic=93146.0> | 5 | * Hardware Availability: [2018 Geekhack Group Buy](https://geekhack.org/index.php?topic=93146.0) |
| 6 | 6 | ||
| 7 | Make example for this keyboard (after setting up your build environment): | 7 | Make example for this keyboard (after setting up your build environment): |
| 8 | 8 | ||
| @@ -12,6 +12,6 @@ Flashing example for this keyboard ([after setting up the bootloadHID flashing e | |||
| 12 | 12 | ||
| 13 | make ares:default:flash | 13 | make ares:default:flash |
| 14 | 14 | ||
| 15 | **Reset Key**: Hold down the *left control* key while plugging in the keyboard. | 15 | **Reset Key**: Hold down the top left key, commonly programmed as *Escape*, while plugging in the keyboard. |
| 16 | 16 | ||
| 17 | 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). | 17 | 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/ares/rules.mk b/keyboards/ares/rules.mk index 076cbdc39..d24b74c95 100644 --- a/keyboards/ares/rules.mk +++ b/keyboards/ares/rules.mk | |||
| @@ -2,21 +2,20 @@ | |||
| 2 | MCU = atmega32a | 2 | MCU = atmega32a |
| 3 | 3 | ||
| 4 | # Bootloader selection | 4 | # Bootloader selection |
| 5 | # Teensy halfkay | ||
| 6 | # Pro Micro caterina | ||
| 7 | # Atmel DFU atmel-dfu | ||
| 8 | # LUFA DFU lufa-dfu | ||
| 9 | # QMK DFU qmk-dfu | ||
| 10 | # ATmega32A bootloadHID | ||
| 11 | # ATmega328P USBasp | ||
| 12 | BOOTLOADER = bootloadHID | 5 | BOOTLOADER = bootloadHID |
| 13 | 6 | ||
| 14 | # build options | 7 | # Build Options |
| 15 | BOOTMAGIC_ENABLE = lite | 8 | # change yes to no to disable |
| 16 | MOUSEKEY_ENABLE = no | 9 | # |
| 17 | EXTRAKEY_ENABLE = yes | 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration |
| 18 | CONSOLE_ENABLE = no | 11 | MOUSEKEY_ENABLE = no # Mouse keys |
| 19 | COMMAND_ENABLE = yes | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | BACKLIGHT_ENABLE = yes | 13 | CONSOLE_ENABLE = no # Console for debug |
| 21 | RGBLIGHT_ENABLE = no | 14 | COMMAND_ENABLE = yes # Commands for debug and configuration |
| 15 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
| 16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
| 17 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | ||
| 18 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | ||
| 22 | WS2812_DRIVER = i2c | 19 | WS2812_DRIVER = i2c |
| 20 | |||
| 21 | LAYOUTS = 60_ansi_split_bs_rshift 60_hhkb | ||
