diff options
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/atomic/atomic.c | 20 | ||||
| -rw-r--r-- | keyboards/atomic/atomic.h | 28 | ||||
| -rw-r--r-- | keyboards/atomic/config.h | 57 | ||||
| -rw-r--r-- | keyboards/atomic/info.json | 173 | ||||
| -rw-r--r-- | keyboards/atomic/keymaps/abienz.c | 18 | ||||
| -rw-r--r-- | keyboards/atomic/keymaps/abienz/keymap.c | 19 | ||||
| -rw-r--r-- | keyboards/atomic/keymaps/default/keymap.c | 12 | ||||
| -rw-r--r-- | keyboards/atomic/keymaps/michelle.c | 169 | ||||
| -rw-r--r-- | keyboards/atomic/keymaps/michelle/keymap.c | 25 | ||||
| -rw-r--r-- | keyboards/atomic/keymaps/pvc/keymap.c | 12 | ||||
| -rw-r--r-- | keyboards/atomic/keymaps/twolayer.c | 63 | ||||
| -rw-r--r-- | keyboards/atomic/keymaps/twolayer/keymap.c | 46 | ||||
| -rw-r--r-- | keyboards/atomic/rules.mk | 26 |
13 files changed, 314 insertions, 354 deletions
diff --git a/keyboards/atomic/atomic.c b/keyboards/atomic/atomic.c index eba5ed61f..1bd663c51 100644 --- a/keyboards/atomic/atomic.c +++ b/keyboards/atomic/atomic.c | |||
| @@ -1,3 +1,19 @@ | |||
| 1 | /* Copyright 2015 Jack Humbert | ||
| 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 | |||
| 1 | #include "atomic.h" | 17 | #include "atomic.h" |
| 2 | 18 | ||
| 3 | void matrix_init_kb(void) { | 19 | void matrix_init_kb(void) { |
| @@ -5,8 +21,8 @@ void matrix_init_kb(void) { | |||
| 5 | // runs once when the firmware starts up | 21 | // runs once when the firmware starts up |
| 6 | 22 | ||
| 7 | // Turn status LED on | 23 | // Turn status LED on |
| 8 | DDRE |= (1<<6); | 24 | setPinOutput(E6); |
| 9 | PORTE |= (1<<6); | 25 | writePinHigh(E6); |
| 10 | 26 | ||
| 11 | matrix_init_user(); | 27 | matrix_init_user(); |
| 12 | } | 28 | } |
diff --git a/keyboards/atomic/atomic.h b/keyboards/atomic/atomic.h index a22029f76..7579f49e3 100644 --- a/keyboards/atomic/atomic.h +++ b/keyboards/atomic/atomic.h | |||
| @@ -1,10 +1,22 @@ | |||
| 1 | #ifndef ATOMIC_H | 1 | /* Copyright 2015 Jack Humbert |
| 2 | #define ATOMIC_H | 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 | |||
| 17 | #pragma once | ||
| 3 | 18 | ||
| 4 | #include "quantum.h" | 19 | #include "quantum.h" |
| 5 | #include <stddef.h> | ||
| 6 | #include <avr/io.h> | ||
| 7 | #include <avr/interrupt.h> | ||
| 8 | 20 | ||
| 9 | // This a shortcut to help you visually see your layout. | 21 | // This a shortcut to help you visually see your layout. |
| 10 | // The following is an example using the Planck MIT layout | 22 | // The following is an example using the Planck MIT layout |
| @@ -24,7 +36,7 @@ | |||
| 24 | { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \ | 36 | { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \ |
| 25 | } | 37 | } |
| 26 | 38 | ||
| 27 | #define LAYOUT_grid( \ | 39 | #define LAYOUT_ortho_5x15( \ |
| 28 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\ | 40 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\ |
| 29 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\ | 41 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\ |
| 30 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\ | 42 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\ |
| @@ -37,7 +49,3 @@ | |||
| 37 | { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ | 49 | { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ |
| 38 | { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E } \ | 50 | { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E } \ |
| 39 | } | 51 | } |
| 40 | |||
| 41 | #define LAYOUT_ortho_5x15 LAYOUT_grid | ||
| 42 | |||
| 43 | #endif \ No newline at end of file | ||
diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h index 06019dd54..cb4aee0f7 100644 --- a/keyboards/atomic/config.h +++ b/keyboards/atomic/config.h | |||
| @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef CONFIG_H | 18 | #pragma once |
| 19 | #define CONFIG_H | ||
| 20 | 19 | ||
| 21 | #include "config_common.h" | 20 | #include "config_common.h" |
| 22 | 21 | ||
| @@ -24,8 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 24 | #define VENDOR_ID 0xFEED | 23 | #define VENDOR_ID 0xFEED |
| 25 | #define PRODUCT_ID 0x6060 | 24 | #define PRODUCT_ID 0x6060 |
| 26 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
| 27 | #define MANUFACTURER Ortholinear Keyboards | 26 | #define MANUFACTURER OLKB |
| 28 | #define PRODUCT The Atomic Keyboard | 27 | #define PRODUCT Atomic |
| 29 | 28 | ||
| 30 | /* key matrix size */ | 29 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 5 | 30 | #define MATRIX_ROWS 5 |
| @@ -86,54 +85,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 86 | //#define FORCE_NKRO | 85 | //#define FORCE_NKRO |
| 87 | 86 | ||
| 88 | /* | 87 | /* |
| 89 | * Magic Key Options | ||
| 90 | * | ||
| 91 | * Magic keys are hotkey commands that allow control over firmware functions of | ||
| 92 | * the keyboard. They are best used in combination with the HID Listen program, | ||
| 93 | * found here: https://www.pjrc.com/teensy/hid_listen.html | ||
| 94 | * | ||
| 95 | * The options below allow the magic key functionality to be changed. This is | ||
| 96 | * useful if your keyboard/keypad is missing keys and you want magic key support. | ||
| 97 | * | ||
| 98 | */ | ||
| 99 | |||
| 100 | /* control how magic key switches layers */ | ||
| 101 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true | ||
| 102 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true | ||
| 103 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false | ||
| 104 | |||
| 105 | /* override magic key keymap */ | ||
| 106 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS | ||
| 107 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS | ||
| 108 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM | ||
| 109 | //#define MAGIC_KEY_HELP1 H | ||
| 110 | //#define MAGIC_KEY_HELP2 SLASH | ||
| 111 | //#define MAGIC_KEY_DEBUG D | ||
| 112 | //#define MAGIC_KEY_DEBUG_MATRIX X | ||
| 113 | //#define MAGIC_KEY_DEBUG_KBD K | ||
| 114 | //#define MAGIC_KEY_DEBUG_MOUSE M | ||
| 115 | //#define MAGIC_KEY_VERSION V | ||
| 116 | //#define MAGIC_KEY_STATUS S | ||
| 117 | //#define MAGIC_KEY_CONSOLE C | ||
| 118 | //#define MAGIC_KEY_LAYER0_ALT1 ESC | ||
| 119 | //#define MAGIC_KEY_LAYER0_ALT2 GRAVE | ||
| 120 | //#define MAGIC_KEY_LAYER0 0 | ||
| 121 | //#define MAGIC_KEY_LAYER1 1 | ||
| 122 | //#define MAGIC_KEY_LAYER2 2 | ||
| 123 | //#define MAGIC_KEY_LAYER3 3 | ||
| 124 | //#define MAGIC_KEY_LAYER4 4 | ||
| 125 | //#define MAGIC_KEY_LAYER5 5 | ||
| 126 | //#define MAGIC_KEY_LAYER6 6 | ||
| 127 | //#define MAGIC_KEY_LAYER7 7 | ||
| 128 | //#define MAGIC_KEY_LAYER8 8 | ||
| 129 | //#define MAGIC_KEY_LAYER9 9 | ||
| 130 | #define MAGIC_KEY_BOOTLOADER B | ||
| 131 | //#define MAGIC_KEY_LOCK CAPS | ||
| 132 | //#define MAGIC_KEY_EEPROM E | ||
| 133 | //#define MAGIC_KEY_NKRO N | ||
| 134 | //#define MAGIC_KEY_SLEEP_LED Z | ||
| 135 | |||
| 136 | /* | ||
| 137 | * Feature disable options | 88 | * Feature disable options |
| 138 | * These options are also useful to firmware size reduction. | 89 | * These options are also useful to firmware size reduction. |
| 139 | */ | 90 | */ |
| @@ -150,5 +101,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 150 | //#define NO_ACTION_ONESHOT | 101 | //#define NO_ACTION_ONESHOT |
| 151 | //#define NO_ACTION_MACRO | 102 | //#define NO_ACTION_MACRO |
| 152 | //#define NO_ACTION_FUNCTION | 103 | //#define NO_ACTION_FUNCTION |
| 153 | |||
| 154 | #endif | ||
diff --git a/keyboards/atomic/info.json b/keyboards/atomic/info.json index 6e543b7b5..b4054eacd 100644 --- a/keyboards/atomic/info.json +++ b/keyboards/atomic/info.json | |||
| @@ -1,11 +1,168 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "Atomic", | 2 | "keyboard_name": "Atomic", |
| 3 | "maintainer": "qmk", | 3 | "maintainer": "jackhumbert", |
| 4 | "width": 15, | 4 | "width": 15, |
| 5 | "height": 5, | 5 | "height": 5, |
| 6 | "layouts": { | 6 | "layout_aliases": { |
| 7 | "LAYOUT_semi_standard": { | 7 | "LAYOUT_grid": "LAYOUT_ortho_5x15" |
| 8 | "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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2, "w":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3, "w":2}, {"x":13, "y":3}, {"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}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] | 8 | }, |
| 9 | "layouts": { | ||
| 10 | "LAYOUT_semi_standard": { | ||
| 11 | "layout": [ | ||
| 12 | {"x":0, "y":0}, | ||
| 13 | {"x":1, "y":0}, | ||
| 14 | {"x":2, "y":0}, | ||
| 15 | {"x":3, "y":0}, | ||
| 16 | {"x":4, "y":0}, | ||
| 17 | {"x":5, "y":0}, | ||
| 18 | {"x":6, "y":0}, | ||
| 19 | {"x":7, "y":0}, | ||
| 20 | {"x":8, "y":0}, | ||
| 21 | {"x":9, "y":0}, | ||
| 22 | {"x":10, "y":0}, | ||
| 23 | {"x":11, "y":0}, | ||
| 24 | {"x":12, "y":0}, | ||
| 25 | {"x":13, "y":0, "w":2}, | ||
| 26 | |||
| 27 | {"x":0, "y":1}, | ||
| 28 | {"x":1, "y":1}, | ||
| 29 | {"x":2, "y":1}, | ||
| 30 | {"x":3, "y":1}, | ||
| 31 | {"x":4, "y":1}, | ||
| 32 | {"x":5, "y":1}, | ||
| 33 | {"x":6, "y":1}, | ||
| 34 | {"x":7, "y":1}, | ||
| 35 | {"x":8, "y":1}, | ||
| 36 | {"x":9, "y":1}, | ||
| 37 | {"x":10, "y":1}, | ||
| 38 | {"x":11, "y":1}, | ||
| 39 | {"x":12, "y":1}, | ||
| 40 | {"x":13, "y":1}, | ||
| 41 | {"x":14, "y":1}, | ||
| 42 | |||
| 43 | {"x":0, "y":2}, | ||
| 44 | {"x":1, "y":2}, | ||
| 45 | {"x":2, "y":2}, | ||
| 46 | {"x":3, "y":2}, | ||
| 47 | {"x":4, "y":2}, | ||
| 48 | {"x":5, "y":2}, | ||
| 49 | {"x":6, "y":2}, | ||
| 50 | {"x":7, "y":2}, | ||
| 51 | {"x":8, "y":2}, | ||
| 52 | {"x":9, "y":2}, | ||
| 53 | {"x":10, "y":2}, | ||
| 54 | {"x":11, "y":2}, | ||
| 55 | {"x":12, "y":2, "w":2}, | ||
| 56 | {"x":14, "y":2}, | ||
| 57 | |||
| 58 | {"x":0, "y":3}, | ||
| 59 | {"x":1, "y":3}, | ||
| 60 | {"x":2, "y":3}, | ||
| 61 | {"x":3, "y":3}, | ||
| 62 | {"x":4, "y":3}, | ||
| 63 | {"x":5, "y":3}, | ||
| 64 | {"x":6, "y":3}, | ||
| 65 | {"x":7, "y":3}, | ||
| 66 | {"x":8, "y":3}, | ||
| 67 | {"x":9, "y":3}, | ||
| 68 | {"x":10, "y":3}, | ||
| 69 | {"x":11, "y":3, "w":2}, | ||
| 70 | {"x":13, "y":3}, | ||
| 71 | {"x":14, "y":3}, | ||
| 72 | |||
| 73 | {"x":0, "y":4, "w":1.25}, | ||
| 74 | {"x":1.25, "y":4, "w":1.25}, | ||
| 75 | {"x":2.5, "y":4, "w":1.25}, | ||
| 76 | {"x":3.75, "y":4, "w":6.25}, | ||
| 77 | {"x":10, "y":4}, | ||
| 78 | {"x":11, "y":4}, | ||
| 79 | {"x":12, "y":4}, | ||
| 80 | {"x":13, "y":4}, | ||
| 81 | {"x":14, "y":4} | ||
| 82 | ] | ||
| 83 | }, | ||
| 84 | "LAYOUT_ortho_5x15": { | ||
| 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}, | ||
| 103 | {"x":1, "y":1}, | ||
| 104 | {"x":2, "y":1}, | ||
| 105 | {"x":3, "y":1}, | ||
| 106 | {"x":4, "y":1}, | ||
| 107 | {"x":5, "y":1}, | ||
| 108 | {"x":6, "y":1}, | ||
| 109 | {"x":7, "y":1}, | ||
| 110 | {"x":8, "y":1}, | ||
| 111 | {"x":9, "y":1}, | ||
| 112 | {"x":10, "y":1}, | ||
| 113 | {"x":11, "y":1}, | ||
| 114 | {"x":12, "y":1}, | ||
| 115 | {"x":13, "y":1}, | ||
| 116 | {"x":14, "y":1}, | ||
| 117 | |||
| 118 | {"x":0, "y":2}, | ||
| 119 | {"x":1, "y":2}, | ||
| 120 | {"x":2, "y":2}, | ||
| 121 | {"x":3, "y":2}, | ||
| 122 | {"x":4, "y":2}, | ||
| 123 | {"x":5, "y":2}, | ||
| 124 | {"x":6, "y":2}, | ||
| 125 | {"x":7, "y":2}, | ||
| 126 | {"x":8, "y":2}, | ||
| 127 | {"x":9, "y":2}, | ||
| 128 | {"x":10, "y":2}, | ||
| 129 | {"x":11, "y":2}, | ||
| 130 | {"x":12, "y":2}, | ||
| 131 | {"x":13, "y":2}, | ||
| 132 | {"x":14, "y":2}, | ||
| 133 | |||
| 134 | {"x":0, "y":3}, | ||
| 135 | {"x":1, "y":3}, | ||
| 136 | {"x":2, "y":3}, | ||
| 137 | {"x":3, "y":3}, | ||
| 138 | {"x":4, "y":3}, | ||
| 139 | {"x":5, "y":3}, | ||
| 140 | {"x":6, "y":3}, | ||
| 141 | {"x":7, "y":3}, | ||
| 142 | {"x":8, "y":3}, | ||
| 143 | {"x":9, "y":3}, | ||
| 144 | {"x":10, "y":3}, | ||
| 145 | {"x":11, "y":3}, | ||
| 146 | {"x":12, "y":3}, | ||
| 147 | {"x":13, "y":3}, | ||
| 148 | {"x":14, "y":3}, | ||
| 149 | |||
| 150 | {"x":0, "y":4}, | ||
| 151 | {"x":1, "y":4}, | ||
| 152 | {"x":2, "y":4}, | ||
| 153 | {"x":3, "y":4}, | ||
| 154 | {"x":4, "y":4}, | ||
| 155 | {"x":5, "y":4}, | ||
| 156 | {"x":6, "y":4}, | ||
| 157 | {"x":7, "y":4}, | ||
| 158 | {"x":8, "y":4}, | ||
| 159 | {"x":9, "y":4}, | ||
| 160 | {"x":10, "y":4}, | ||
| 161 | {"x":11, "y":4}, | ||
| 162 | {"x":12, "y":4}, | ||
| 163 | {"x":13, "y":4}, | ||
| 164 | {"x":14, "y":4} | ||
| 165 | ] | ||
| 166 | } | ||
| 9 | } | 167 | } |
| 10 | } | ||
| 11 | } | 168 | } |
diff --git a/keyboards/atomic/keymaps/abienz.c b/keyboards/atomic/keymaps/abienz.c deleted file mode 100644 index 7cc27d71a..000000000 --- a/keyboards/atomic/keymaps/abienz.c +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 4 | [0] = LAYOUT_grid( /* Colemak */ | ||
| 5 | 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_NO , | ||
| 6 | KC_TAB, CM_Q, CM_W, CM_F, CM_P, CM_G, CM_J, CM_L, CM_U, CM_Y, CM_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , | ||
| 7 | KC_BSPC, CM_A, CM_R, CM_S, CM_T, CM_D, CM_H, CM_N, CM_E, CM_I, CM_O, KC_QUOT, KC_ENT, KC_NO, KC_PGUP, | ||
| 8 | KC_LSFT, CM_Z, CM_X, CM_C, CM_V, CM_B, CM_K, CM_M, CM_COMM, CM_DOT, CM_SLSH, KC_RSFT, KC_NO, KC_UP, KC_PGDN, | ||
| 9 | KC_LCTL, KC_LGUI, KC_NO, KC_LALT, MO(1), KC_SPC, KC_NO, KC_RALT, MO(1), KC_RGUI, KC_NO, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, | ||
| 10 | ), | ||
| 11 | [1] = LAYOUT_grid( /* function */ | ||
| 12 | 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_BSPC, KC_NO , | ||
| 13 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 14 | KC_TRNS, KC_TRNS, KC_TRNS, KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 15 | KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MPLY, | ||
| 16 | KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, MO(1), KC_TRNS, KC_NO, KC_TRNS, MO(1), KC_TRNS, KC_NO, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT, | ||
| 17 | ), | ||
| 18 | }; | ||
diff --git a/keyboards/atomic/keymaps/abienz/keymap.c b/keyboards/atomic/keymaps/abienz/keymap.c new file mode 100644 index 000000000..c499807d7 --- /dev/null +++ b/keyboards/atomic/keymaps/abienz/keymap.c | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | #include "keymap_colemak.h" | ||
| 3 | |||
| 4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 5 | [0] = LAYOUT_ortho_5x15(/* Colemak */ | ||
| 6 | 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, XXXXXXX, | ||
| 7 | KC_TAB, CM_Q, CM_W, CM_F, CM_P, CM_G, CM_J, CM_L, CM_U, CM_Y, CM_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, | ||
| 8 | KC_BSPC, CM_A, CM_R, CM_S, CM_T, CM_D, CM_H, CM_N, CM_E, CM_I, CM_O, KC_QUOT, KC_ENT, XXXXXXX, KC_PGUP, | ||
| 9 | KC_LSFT, CM_Z, CM_X, CM_C, CM_V, CM_B, CM_K, CM_M, CM_COMM, CM_DOT, CM_SLSH, KC_RSFT, XXXXXXX, KC_UP, KC_PGDN, | ||
| 10 | KC_LCTL, KC_LGUI, XXXXXXX, KC_LALT, MO(1), KC_SPC, XXXXXXX, KC_RALT, MO(1), KC_RGUI, XXXXXXX, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 11 | ), | ||
| 12 | [1] = LAYOUT_ortho_5x15(/* function */ | ||
| 13 | 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_BSPC, XXXXXXX, | ||
| 14 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 15 | _______, _______, _______, KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 16 | _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_MPLY, | ||
| 17 | _______, _______, XXXXXXX, _______, MO(1), _______, XXXXXXX, _______, MO(1), _______, XXXXXXX, _______, KC_MPRV, KC_VOLD, KC_MNXT | ||
| 18 | ), | ||
| 19 | }; | ||
diff --git a/keyboards/atomic/keymaps/default/keymap.c b/keyboards/atomic/keymaps/default/keymap.c index 6d314f147..d4bdc1837 100644 --- a/keyboards/atomic/keymaps/default/keymap.c +++ b/keyboards/atomic/keymaps/default/keymap.c | |||
| @@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 90 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 90 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 91 | */ | 91 | */ |
| 92 | 92 | ||
| 93 | [_QW] = LAYOUT_grid( /* QWERTY */ | 93 | [_QW] = LAYOUT_ortho_5x15( /* QWERTY */ |
| 94 | KC_GRV, 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_BSPC, | 94 | KC_GRV, 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_BSPC, |
| 95 | 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 , | 95 | 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 , |
| 96 | KC_ESC, 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_ENT, KC_PGUP, | 96 | KC_ESC, 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_ENT, KC_PGUP, |
| @@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 112 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 112 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 113 | */ | 113 | */ |
| 114 | 114 | ||
| 115 | [_CM] = LAYOUT_grid( /* COLEMAK */ | 115 | [_CM] = LAYOUT_ortho_5x15( /* COLEMAK */ |
| 116 | KC_GRV, 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_BSPC, | 116 | KC_GRV, 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_BSPC, |
| 117 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , | 117 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , |
| 118 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP, | 118 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP, |
| @@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 134 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 134 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 135 | */ | 135 | */ |
| 136 | 136 | ||
| 137 | [_DV] = LAYOUT_grid( /* DVORAK */ | 137 | [_DV] = LAYOUT_ortho_5x15( /* DVORAK */ |
| 138 | KC_GRV, 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_BSPC, | 138 | KC_GRV, 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_BSPC, |
| 139 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , | 139 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , |
| 140 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, KC_ENT, KC_ENT, KC_PGUP, | 140 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, KC_ENT, KC_ENT, KC_PGUP, |
| @@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 156 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 156 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 157 | */ | 157 | */ |
| 158 | 158 | ||
| 159 | [_LW] = LAYOUT_grid( /* LOWERED */ | 159 | [_LW] = LAYOUT_ortho_5x15( /* LOWERED */ |
| 160 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___, | 160 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___, |
| 161 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS , | 161 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS , |
| 162 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______, | 162 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______, |
| @@ -178,7 +178,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 178 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 178 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 179 | */ | 179 | */ |
| 180 | 180 | ||
| 181 | [_RS] = LAYOUT_grid( /* RAISED */ | 181 | [_RS] = LAYOUT_ortho_5x15( /* RAISED */ |
| 182 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___, | 182 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___, |
| 183 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, KC_INS , | 183 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, KC_INS , |
| 184 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______, | 184 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______, |
| @@ -200,7 +200,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 200 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 200 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 201 | */ | 201 | */ |
| 202 | 202 | ||
| 203 | [_FN] = LAYOUT_grid( /* FUNCTION */ | 203 | [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */ |
| 204 | KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___, | 204 | KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___, |
| 205 | KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR, | 205 | KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR, |
| 206 | KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U, | 206 | KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U, |
diff --git a/keyboards/atomic/keymaps/michelle.c b/keyboards/atomic/keymaps/michelle.c deleted file mode 100644 index 6dd2de279..000000000 --- a/keyboards/atomic/keymaps/michelle.c +++ /dev/null | |||
| @@ -1,169 +0,0 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 4 | [0] = LAYOUT_grid( /* Dvorak */ | ||
| 5 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_NO , | ||
| 6 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 7 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 8 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 9 | // ┌─ 2u ────────────┐ | ||
| 10 | // │ X │ | ||
| 11 | // └─────────────────┘ | ||
| 12 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_INS, KC_DEL , | ||
| 13 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 14 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 15 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 16 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 17 | // │ X │ │ X │ | ||
| 18 | // └─────────────────┘ └─────────────────┘ | ||
| 19 | KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_NO, KC_PGUP , | ||
| 20 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 21 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 22 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 23 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 24 | // │ X │ │ X │ | ||
| 25 | // └─────────────────┘ └─────────────────┘ | ||
| 26 | // ┌─ 2u ────────────┐ | ||
| 27 | // │ X │ | ||
| 28 | // └─────────────────┘ | ||
| 29 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_NO, KC_UP, KC_PGDN , | ||
| 30 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 31 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 32 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 33 | // ┌─ 2u ────────────┐ | ||
| 34 | // │ X │ | ||
| 35 | // └─────────────────┘ | ||
| 36 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 37 | // │ X │ │ X │ | ||
| 38 | // └─────────────────┘ └─────────────────┘ | ||
| 39 | // ┌─ 2u ────────────┐ | ||
| 40 | // │ X │ | ||
| 41 | // └─────────────────┘ | ||
| 42 | KC_LCTL, MO(1), KC_NO, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_LGUI, MO(2), KC_LEFT, KC_DOWN, KC_RGHT , | ||
| 43 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 44 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 45 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 46 | // ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐ | ||
| 47 | // │ X │ X │ X │ X │ X │ X │ X │ X │ X │ | ||
| 48 | // └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘ | ||
| 49 | // ┌─ 2u ────────────┐ | ||
| 50 | // │ X │ | ||
| 51 | // └─────────────────┘ | ||
| 52 | // ┌───────────────────── 6.25u ────────────────────────────┐ | ||
| 53 | // │ X │ | ||
| 54 | // └────────────────────────────────────────────────────────┘ | ||
| 55 | // ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐ | ||
| 56 | // │ X │ X │ X │ X │ X │ X │ | ||
| 57 | // └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘ | ||
| 58 | ), | ||
| 59 | [1] = LAYOUT_grid( /* Qwerty + F keys */ | ||
| 60 | KC_ESC, 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_BSPC, KC_NO , | ||
| 61 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 62 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 63 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 64 | // ┌─ 2u ────────────┐ | ||
| 65 | // │ X │ | ||
| 66 | // └─────────────────┘ | ||
| 67 | 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_INS, KC_DEL , | ||
| 68 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 69 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 70 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 71 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 72 | // │ X │ │ X │ | ||
| 73 | // └─────────────────┘ └─────────────────┘ | ||
| 74 | KC_ESC, 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_NO, KC_PGUP , | ||
| 75 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 76 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 77 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 78 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 79 | // │ X │ │ X │ | ||
| 80 | // └─────────────────┘ └─────────────────┘ | ||
| 81 | // ┌─ 2u ────────────┐ | ||
| 82 | // │ X │ | ||
| 83 | // └─────────────────┘ | ||
| 84 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_UP, KC_PGDN , | ||
| 85 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 86 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 87 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 88 | // ┌─ 2u ────────────┐ | ||
| 89 | // │ X │ | ||
| 90 | // └─────────────────┘ | ||
| 91 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 92 | // │ X │ │ X │ | ||
| 93 | // └─────────────────┘ └─────────────────┘ | ||
| 94 | // ┌─ 2u ────────────┐ | ||
| 95 | // │ X │ | ||
| 96 | // └─────────────────┘ | ||
| 97 | KC_LCTL, KC_TRNS, KC_NO, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT , | ||
| 98 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 99 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 100 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 101 | // ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐ | ||
| 102 | // │ X │ X │ X │ X │ X │ X │ X │ X │ X │ | ||
| 103 | // └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘ | ||
| 104 | // ┌─ 2u ────────────┐ | ||
| 105 | // │ X │ | ||
| 106 | // └─────────────────┘ | ||
| 107 | // ┌───────────────────── 6.25u ────────────────────────────┐ | ||
| 108 | // │ X │ | ||
| 109 | // └────────────────────────────────────────────────────────┘ | ||
| 110 | // ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐ | ||
| 111 | // │ X │ X │ X │ X │ X │ X │ | ||
| 112 | // └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘ | ||
| 113 | ), | ||
| 114 | [2] = LAYOUT_grid( /* Numpad + qwerty shortcut keys */ | ||
| 115 | { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_P7, KC_P8, KC_P9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_NO , | ||
| 116 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 117 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 118 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 119 | // ┌─ 2u ────────────┐ | ||
| 120 | // │ X │ | ||
| 121 | // └─────────────────┘ | ||
| 122 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_P4, KC_P5, KC_P6, KC_L, KC_SLSH, KC_EQL, KC_INS, KC_DEL , | ||
| 123 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 124 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 125 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 126 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 127 | // │ X │ │ X │ | ||
| 128 | // └─────────────────┘ └─────────────────┘ | ||
| 129 | KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_P1, KC_P2, KC_P3, KC_S, KC_MINS, KC_ENT, KC_NO, KC_PGUP , | ||
| 130 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 131 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 132 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 133 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 134 | // │ X │ │ X │ | ||
| 135 | // └─────────────────┘ └─────────────────┘ | ||
| 136 | // ┌─ 2u ────────────┐ | ||
| 137 | // │ X │ | ||
| 138 | // └─────────────────┘ | ||
| 139 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_X, KC_B, KC_P0, KC_P0, KC_PENT, KC_Z, KC_RSFT, KC_NO, KC_UP, KC_PGDN , | ||
| 140 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 141 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 142 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 143 | // ┌─ 2u ────────────┐ | ||
| 144 | // │ X │ | ||
| 145 | // └─────────────────┘ | ||
| 146 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 147 | // │ X │ │ X │ | ||
| 148 | // └─────────────────┘ └─────────────────┘ | ||
| 149 | // ┌─ 2u ────────────┐ | ||
| 150 | // │ X │ | ||
| 151 | // └─────────────────┘ | ||
| 152 | KC_LCTL, KC_TRNS, KC_NO, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT , | ||
| 153 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 154 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 155 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 156 | // ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐ | ||
| 157 | // │ X │ X │ X │ X │ X │ X │ X │ X │ X │ | ||
| 158 | // └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘ | ||
| 159 | // ┌─ 2u ────────────┐ | ||
| 160 | // │ X │ | ||
| 161 | // └─────────────────┘ | ||
| 162 | // ┌───────────────────── 6.25u ────────────────────────────┐ | ||
| 163 | // │ X │ | ||
| 164 | // └────────────────────────────────────────────────────────┘ | ||
| 165 | // ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐ | ||
| 166 | // │ X │ X │ X │ X │ X │ X │ | ||
| 167 | // └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘ | ||
| 168 | ), | ||
| 169 | }; | ||
diff --git a/keyboards/atomic/keymaps/michelle/keymap.c b/keyboards/atomic/keymaps/michelle/keymap.c new file mode 100644 index 000000000..da6942716 --- /dev/null +++ b/keyboards/atomic/keymaps/michelle/keymap.c | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 4 | [0] = LAYOUT_ortho_5x15( /* Dvorak */ | ||
| 5 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, XXXXXXX, | ||
| 6 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_INS, KC_DEL, | ||
| 7 | KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, XXXXXXX, KC_PGUP, | ||
| 8 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, XXXXXXX, KC_UP, KC_PGDN, | ||
| 9 | KC_LCTL, MO(1), XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, MO(2), KC_LEFT, KC_DOWN, KC_RGHT | ||
| 10 | ), | ||
| 11 | [1] = LAYOUT_ortho_5x15( /* Qwerty + F keys */ | ||
| 12 | KC_ESC, 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_BSPC, XXXXXXX, | ||
| 13 | 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_INS, KC_DEL, | ||
| 14 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, XXXXXXX, KC_PGUP, | ||
| 15 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXXXXX, KC_UP, KC_PGDN, | ||
| 16 | KC_LCTL, _______, XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 17 | ), | ||
| 18 | [2] = LAYOUT_ortho_5x15( /* Numpad + qwerty shortcut keys */ | ||
| 19 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_P7, KC_P8, KC_P9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, XXXXXXX, | ||
| 20 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_P4, KC_P5, KC_P6, KC_L, KC_SLSH, KC_EQL, KC_INS, KC_DEL, | ||
| 21 | KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_P1, KC_P2, KC_P3, KC_S, KC_MINS, KC_ENT, XXXXXXX, KC_PGUP, | ||
| 22 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_X, KC_B, KC_P0, KC_P0, KC_PENT, KC_Z, KC_RSFT, XXXXXXX, KC_UP, KC_PGDN, | ||
| 23 | KC_LCTL, _______, XXXXXXX, KC_LALT, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 24 | ), | ||
| 25 | }; | ||
diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c index 51e697f96..9ed79899d 100644 --- a/keyboards/atomic/keymaps/pvc/keymap.c +++ b/keyboards/atomic/keymaps/pvc/keymap.c | |||
| @@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 122 | | LCTRL | LWIN | FN | LALT | UPPER | SPACE . SPACE | LOWER | OSHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | | 122 | | LCTRL | LWIN | FN | LALT | UPPER | SPACE . SPACE | LOWER | OSHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | |
| 123 | '--------------------------------------------------------------------------------------------------------------------------------------' | 123 | '--------------------------------------------------------------------------------------------------------------------------------------' |
| 124 | */ | 124 | */ |
| 125 | [LAYER_QWERTY] = LAYOUT_grid( | 125 | [LAYER_QWERTY] = LAYOUT_ortho_5x15( |
| 126 | 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_BSPC, | 126 | 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_BSPC, |
| 127 | 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 , | 127 | 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 , |
| 128 | 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_ENT , KC_PGUP, | 128 | 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_ENT , KC_PGUP, |
| @@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 142 | | ______ | ______ | ______ | ______ | UPPER | KP 0 . KP 0 | ______ | RALT | KP . | KP ENT | ______ | ______ | ______ | ______ | | 142 | | ______ | ______ | ______ | ______ | UPPER | KP 0 . KP 0 | ______ | RALT | KP . | KP ENT | ______ | ______ | ______ | ______ | |
| 143 | '--------------------------------------------------------------------------------------------------------------------------------------' | 143 | '--------------------------------------------------------------------------------------------------------------------------------------' |
| 144 | */ | 144 | */ |
| 145 | [LAYER_UPPER] = LAYOUT_grid( | 145 | [LAYER_UPPER] = LAYOUT_ortho_5x15( |
| 146 | KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, _______, _______, | 146 | KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, _______, _______, |
| 147 | KC_PAUS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, KC_INS , | 147 | KC_PAUS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, KC_INS , |
| 148 | _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_CAPS, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______, _______, KC_HOME, | 148 | _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_CAPS, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______, _______, KC_HOME, |
| @@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 162 | | ______ | ______ | ______ | ______ | ______ | ______ . ______ | LOWER | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | 162 | | ______ | ______ | ______ | ______ | ______ | ______ . ______ | LOWER | ______ | ______ | ______ | ______ | ______ | ______ | ______ | |
| 163 | '--------------------------------------------------------------------------------------------------------------------------------------' | 163 | '--------------------------------------------------------------------------------------------------------------------------------------' |
| 164 | */ | 164 | */ |
| 165 | [LAYER_LOWER] = LAYOUT_grid( | 165 | [LAYER_LOWER] = LAYOUT_ortho_5x15( |
| 166 | KC_PSCR, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, | 166 | KC_PSCR, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, |
| 167 | _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT , _______, _______, _______, KC_INS , | 167 | _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT , _______, _______, _______, KC_INS , |
| 168 | _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , _______, _______, _______, KC_HOME, | 168 | _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , _______, _______, _______, KC_HOME, |
| @@ -182,7 +182,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 182 | | ______ | ______ | FN | ______ | ______ | PLAY . PLAY | ______ | ______ | ______ | ______ | ______ | PREV | VOL DN | NEXT | | 182 | | ______ | ______ | FN | ______ | ______ | PLAY . PLAY | ______ | ______ | ______ | ______ | ______ | PREV | VOL DN | NEXT | |
| 183 | '--------------------------------------------------------------------------------------------------------------------------------------' | 183 | '--------------------------------------------------------------------------------------------------------------------------------------' |
| 184 | */ | 184 | */ |
| 185 | [LAYER_FUNCTION] = LAYOUT_grid( | 185 | [LAYER_FUNCTION] = LAYOUT_ortho_5x15( |
| 186 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 186 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 187 | XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 187 | XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 188 | XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 188 | XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| @@ -202,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 202 | | ______ | ______ | ______ | ______ | ______ | MS BT1 . MS BT1 | ______ | ______ | ______ | ______ | ______ | MS L | MS D | MS R | | 202 | | ______ | ______ | ______ | ______ | ______ | MS BT1 . MS BT1 | ______ | ______ | ______ | ______ | ______ | MS L | MS D | MS R | |
| 203 | '--------------------------------------------------------------------------------------------------------------------------------------' | 203 | '--------------------------------------------------------------------------------------------------------------------------------------' |
| 204 | */ | 204 | */ |
| 205 | [LAYER_MOUSE] = LAYOUT_grid( | 205 | [LAYER_MOUSE] = LAYOUT_ortho_5x15( |
| 206 | KC_ESC , KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 206 | KC_ESC , KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 207 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_R, | 207 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_R, |
| 208 | XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, | 208 | XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, |
| @@ -222,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 222 | | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER | XXXXXX . XXXXXX | LOWER | XXXXXX | XXXXXX | XXXXXX | XXXXXX | TEMPO- | VOICE- | TEMPO+ | | 222 | | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER | XXXXXX . XXXXXX | LOWER | XXXXXX | XXXXXX | XXXXXX | XXXXXX | TEMPO- | VOICE- | TEMPO+ | |
| 223 | '--------------------------------------------------------------------------------------------------------------------------------------' | 223 | '--------------------------------------------------------------------------------------------------------------------------------------' |
| 224 | */ | 224 | */ |
| 225 | [LAYER_ADJUST] = LAYOUT_grid( | 225 | [LAYER_ADJUST] = LAYOUT_ortho_5x15( |
| 226 | XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, XXXXXXX, MU_TOG , AU_TOG , XXXXXXX, XXXXXXX, | 226 | XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, XXXXXXX, MU_TOG , AU_TOG , XXXXXXX, XXXXXXX, |
| 227 | XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 227 | XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 228 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 228 | XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
diff --git a/keyboards/atomic/keymaps/twolayer.c b/keyboards/atomic/keymaps/twolayer.c deleted file mode 100644 index 9ecbbc6df..000000000 --- a/keyboards/atomic/keymaps/twolayer.c +++ /dev/null | |||
| @@ -1,63 +0,0 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 4 | |||
| 5 | /* QWERTY - MIT ENHANCED / GRID COMPATIBLE | ||
| 6 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | ||
| 7 | * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | | ||
| 8 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | ||
| 9 | * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | | ||
| 10 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | ||
| 11 | * | LCTRL1 | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP | | ||
| 12 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 13 | * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | | ||
| 14 | * |--------+--------+--------+--------+--------+- 6.25u ---------+--------+--------+--------+--------+-----------------+--------+--------| | ||
| 15 | * | BRITE | LALT | FN | XXXXXX . SPACE | RCTRL | RALT | FN | LEFT | DOWN | RIGHT | | ||
| 16 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 17 | */ | ||
| 18 | [0] = LAYOUT_grid( /* QWERTY */ | ||
| 19 | 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_BSPC, | ||
| 20 | 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, | ||
| 21 | KC_LCTL, 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_ENT, KC_PGUP, | ||
| 22 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN, | ||
| 23 | M(0), KC_ALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RCTL, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, | ||
| 24 | ), | ||
| 25 | |||
| 26 | /* FUNCTION | ||
| 27 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | ||
| 28 | * | GRV | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | | ||
| 29 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | ||
| 30 | * | SCR LK | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | PAUSE | PR SCR | | ||
| 31 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | ||
| 32 | * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | XXXXXX . | WHEEL+ | | ||
| 33 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 34 | * | NUM LK | | | | | | | | INSERT | END1 | HOME | XXXXXX . | MOUS U | WHEEL- | | ||
| 35 | * |--------+--------+--------+--------+--------+- 6.25 ------------+--------+--------+------+--------+-----------------+--------+--------| | ||
| 36 | * | | | FN | XXXXXX . MS BT1 | | | FN | MOUS L | MOUS D | MOUS R | | ||
| 37 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 38 | */ | ||
| 39 | [1] = LAYOUT_grid( /* FUNCTION LAYER*/ | ||
| 40 | 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, ___T___, ___T___, | ||
| 41 | KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR, | ||
| 42 | KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U, | ||
| 43 | KC_NLCK, _______, _______, _______, _______, _______, _______, _______, KC_INSERT, KC_END, KC_HOME, ___T___, ___T___, KC_MS_U, KC_WH_D, | ||
| 44 | _______, _______, MO(1), _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, MO(1), KC_MS_L, KC_MS_D, KC_MS_R, | ||
| 45 | ), | ||
| 46 | }; | ||
| 47 | |||
| 48 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 49 | // MACRODOWN only works in this function | ||
| 50 | switch(id) { | ||
| 51 | case 0: | ||
| 52 | if (record->event.pressed) { | ||
| 53 | register_code(KC_RSFT); | ||
| 54 | #ifdef BACKLIGHT_ENABLE | ||
| 55 | backlight_step(); | ||
| 56 | #endif | ||
| 57 | } else { | ||
| 58 | unregister_code(KC_RSFT); | ||
| 59 | } | ||
| 60 | break; | ||
| 61 | } | ||
| 62 | return MACRO_NONE; | ||
| 63 | }; | ||
diff --git a/keyboards/atomic/keymaps/twolayer/keymap.c b/keyboards/atomic/keymaps/twolayer/keymap.c new file mode 100644 index 000000000..a38ddf358 --- /dev/null +++ b/keyboards/atomic/keymaps/twolayer/keymap.c | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 4 | |||
| 5 | /* QWERTY - MIT ENHANCED / GRID COMPATIBLE | ||
| 6 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | ||
| 7 | * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | | ||
| 8 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | ||
| 9 | * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | | ||
| 10 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | ||
| 11 | * | LCTRL1 | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP | | ||
| 12 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 13 | * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | | ||
| 14 | * |--------+--------+--------+--------+--------+- 6.25u ---------+--------+--------+--------+--------+-----------------+--------+--------| | ||
| 15 | * | BRITE | LALT | FN | XXXXXX . SPACE | RCTRL | RALT | FN | LEFT | DOWN | RIGHT | | ||
| 16 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 17 | */ | ||
| 18 | [0] = LAYOUT_ortho_5x15( /* QWERTY */ | ||
| 19 | 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_BSPC, | ||
| 20 | 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, | ||
| 21 | KC_LCTL, 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_ENT, KC_PGUP, | ||
| 22 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN, | ||
| 23 | BL_STEP, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RCTL, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | ||
| 24 | ), | ||
| 25 | |||
| 26 | /* FUNCTION | ||
| 27 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | ||
| 28 | * | GRV | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | | ||
| 29 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | ||
| 30 | * | SCR LK | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | PAUSE | PR SCR | | ||
| 31 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | ||
| 32 | * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | XXXXXX . | WHEEL+ | | ||
| 33 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 34 | * | NUM LK | | | | | | | | INSERT | END1 | HOME | XXXXXX . | MOUS U | WHEEL- | | ||
| 35 | * |--------+--------+--------+--------+--------+- 6.25 ------------+--------+--------+------+--------+-----------------+--------+--------| | ||
| 36 | * | | | FN | XXXXXX . MS BT1 | | | FN | MOUS L | MOUS D | MOUS R | | ||
| 37 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 38 | */ | ||
| 39 | [1] = LAYOUT_ortho_5x15( /* FUNCTION LAYER*/ | ||
| 40 | 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, _______, _______, | ||
| 41 | KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR, | ||
| 42 | KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, KC_WH_U, | ||
| 43 | KC_NLCK, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_END, KC_HOME, _______, _______, KC_MS_U, KC_WH_D, | ||
| 44 | _______, _______, MO(1), _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, MO(1), KC_MS_L, KC_MS_D, KC_MS_R | ||
| 45 | ), | ||
| 46 | }; | ||
diff --git a/keyboards/atomic/rules.mk b/keyboards/atomic/rules.mk index 5a057f973..71d5f924e 100644 --- a/keyboards/atomic/rules.mk +++ b/keyboards/atomic/rules.mk | |||
| @@ -2,33 +2,23 @@ | |||
| 2 | MCU = atmega32u4 | 2 | MCU = atmega32u4 |
| 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 = atmel-dfu | 5 | BOOTLOADER = atmel-dfu |
| 13 | 6 | ||
| 14 | # Build Options | 7 | # Build Options |
| 15 | # change to "no" to disable the options, or define them in the Makefile in | 8 | # change yes to no to disable |
| 16 | # the appropriate keymap folder that will get included automatically | ||
| 17 | # | 9 | # |
| 18 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration |
| 19 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 20 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 21 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
| 22 | COMMAND_ENABLE = yes # Commands for debug and configuration | 14 | COMMAND_ENABLE = yes # Commands for debug and configuration |
| 23 | NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
| 24 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | ||
| 25 | MIDI_ENABLE = no # MIDI controls | ||
| 26 | AUDIO_ENABLE = no # Audio output on port C6 | ||
| 27 | UNICODE_ENABLE = no # Unicode | ||
| 28 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | ||
| 29 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | ||
| 30 | |||
| 31 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 15 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 32 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
| 18 | NKRO_ENABLE = no # USB Nkey Rollover | ||
| 19 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | ||
| 20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | ||
| 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | ||
| 22 | AUDIO_ENABLE = no # Audio output | ||
| 33 | 23 | ||
| 34 | LAYOUTS = ortho_5x15 | 24 | LAYOUTS = ortho_5x15 |
