summaryrefslogtreecommitdiff
path: root/keyboard
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2015-02-21 15:35:09 -0500
committerJack Humbert <jack.humb@gmail.com>2015-02-21 15:35:09 -0500
commit64dc4784e46cd5b5b2614569208fd85c9f9a67a9 (patch)
tree0ddd17124cfb8a4dc55b786bc7dea63b3aba36c1 /keyboard
parent7884125b797f0c594e666616caf289122489ec5e (diff)
vlad
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/atomic/Makefile2
-rw-r--r--keyboard/atomic/keymap_common.h16
-rw-r--r--keyboard/atomic/keymap_vlad.c14
3 files changed, 30 insertions, 2 deletions
diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile
index a018b6cab8..c4e0cb45d7 100644
--- a/keyboard/atomic/Makefile
+++ b/keyboard/atomic/Makefile
@@ -55,7 +55,7 @@ SRC = keymap_common.c \
ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC)
else
- SRC := keymap_plain.c $(SRC)
+ SRC := keymap_vlad.c $(SRC)
endif
CONFIG_H = config.h
diff --git a/keyboard/atomic/keymap_common.h b/keyboard/atomic/keymap_common.h
index 7f807bbc07..c582c0135f 100644
--- a/keyboard/atomic/keymap_common.h
+++ b/keyboard/atomic/keymap_common.h
@@ -49,7 +49,7 @@ extern const uint16_t fn_actions[];
}
// ASK: Short Space layout
-#define KEYMAP_ASK( \
+#define KEYMAP_ASK_MESSY( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
@@ -63,6 +63,20 @@ extern const uint16_t fn_actions[];
{ KC_##K40, KC_##K41, KC_NO, KC_##K43, KC_##K44, KC_NO, KC_##K46, KC_NO, KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E } \
}
+#define KEYMAP_ASK( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
+ K40, K41, K43, K44, K46, K47, K48, K4A, K4B, K4C, K4D, K4E \
+) { \
+ { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_NO, KC_##K0E }, \
+ { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E }, \
+ { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_NO, KC_##K2E }, \
+ { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_NO, KC_##K3D, KC_##K3E }, \
+ { KC_##K40, KC_##K41, KC_NO, KC_##K43, KC_##K44, KC_NO, KC_##K46, KC_##K47, KC_##K48, KC_NO, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E } \
+}
+
// MLO: Semi-Grid layout
diff --git a/keyboard/atomic/keymap_vlad.c b/keyboard/atomic/keymap_vlad.c
new file mode 100644
index 0000000000..e56bcf1618
--- /dev/null
+++ b/keyboard/atomic/keymap_vlad.c
@@ -0,0 +1,14 @@
+#include "keymap_common.h"
+
+// JCK: Semi-Standard layout
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* 0: qwerty */
+ [0] = KEYMAP_ASK(GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, DEL, \
+ CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, ENT, VOLU, \
+ LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, UP, VOLD, \
+ LCTL, LGUI, LALT, LGUI, SPC, RGUI, RALT, RGUI, RCTL, LEFT, DOWN, RGHT)
+};
+const uint16_t PROGMEM fn_actions[] = {
+}; \ No newline at end of file