aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorMaarten Dekkers <maartenn2001@gmail.com>2017-07-07 21:11:12 +0200
committerJack Humbert <jack.humb@gmail.com>2017-07-07 15:33:09 -0400
commit53acc7b0748d9e04346a734baf0207b2ac1251ce (patch)
treea0c97fb56312c381cd6e75194ea0dd43d9f81348 /keyboards
parent68cf0d454c66095ac8ed8bbada1bf6c2822ec8b8 (diff)
downloadqmk_firmware-53acc7b0748d9e04346a734baf0207b2ac1251ce.tar.gz
qmk_firmware-53acc7b0748d9e04346a734baf0207b2ac1251ce.zip
Cleaned and corrected keymap code
Diffstat (limited to 'keyboards')
-rwxr-xr-xkeyboards/tada68/keymaps/maartenwut/config.h9
-rwxr-xr-xkeyboards/tada68/keymaps/maartenwut/keymap.c48
-rwxr-xr-xkeyboards/tada68/keymaps/maartenwut/tada68.h43
3 files changed, 76 insertions, 24 deletions
diff --git a/keyboards/tada68/keymaps/maartenwut/config.h b/keyboards/tada68/keymaps/maartenwut/config.h
new file mode 100755
index 000000000..5dcdad12e
--- /dev/null
+++ b/keyboards/tada68/keymaps/maartenwut/config.h
@@ -0,0 +1,9 @@
1#include "../../config.h"
2
3/* WS2812B RGB Underglow LED */
4#define RGB_DI_PIN F5 // See readme.md for wiring your led's
5#define RGBLIGHT_ANIMATIONS
6#define RGBLED_NUM 16 // Number of LEDs. Change this to match your use case.
7#define RGBLIGHT_HUE_STEP 8
8#define RGBLIGHT_SAT_STEP 8
9#define RGBLIGHT_VAL_STEP 8 \ No newline at end of file
diff --git a/keyboards/tada68/keymaps/maartenwut/keymap.c b/keyboards/tada68/keymaps/maartenwut/keymap.c
index b2edb6adc..b95305a57 100755
--- a/keyboards/tada68/keymaps/maartenwut/keymap.c
+++ b/keyboards/tada68/keymaps/maartenwut/keymap.c
@@ -1,4 +1,4 @@
1#include "maarten68.h" 1#include "tada68.h"
2#include "action_layer.h" 2#include "action_layer.h"
3#include "timer.h" 3#include "timer.h"
4#include "bootloader.h" 4#include "bootloader.h"
@@ -54,9 +54,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
54[_MA] = KEYMAP_ANSI( 54[_MA] = KEYMAP_ANSI(
55 KC_ESC, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, KC_BSPC, KC_MPLY, \ 55 KC_ESC, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, KC_BSPC, KC_MPLY, \
56 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, \ 56 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, \
57 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_PGUP, \ 57 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_PGUP, \
58 LSHIFT, END_HOME, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, \ 58 LSHIFT, END_HOME, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, \
59 KC_LCTL, KC_LGUI, KC_LALT, SPACE, KC_RALT, KC_RCTRL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), 59 KC_LCTL, KC_LGUI, KC_LALT, SPACE, KC_RALT, KC_RCTRL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
60 60
61 /* Keymap _FL: Function Layer 61 /* Keymap _FL: Function Layer
62 * ,----------------------------------------------------------------. 62 * ,----------------------------------------------------------------.
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
66 * |----------------------------------------------------------------| 66 * |----------------------------------------------------------------|
67 * | |MsL|MsD|MsR| | | | | | | | | |Hme | 67 * | |MsL|MsD|MsR| | | | | | | | | |Hme |
68 * |----------------------------------------------------------------| 68 * |----------------------------------------------------------------|
69 * | |Gam| | | | | | | | | | | |MwU|End | 69 * | | | | | | | | | | | | | |MwU|End |
70 * |----------------------------------------------------------------| 70 * |----------------------------------------------------------------|
71 * | | | | | | | |MwL|MwD|MwR | 71 * | | | | | | | |MwL|MwD|MwR |
72 * `----------------------------------------------------------------' 72 * `----------------------------------------------------------------'
@@ -74,29 +74,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
74[_FL] = KEYMAP_ANSI( 74[_FL] = KEYMAP_ANSI(
75 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, TRNS, KC_PSCR, \ 75 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, TRNS, KC_PSCR, \
76 TRNS, KC_BTN1, KC_MS_U, KC_BTN2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TO(_LO), \ 76 TRNS, KC_BTN1, KC_MS_U, KC_BTN2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TO(_LO), \
77 TRNS, KC_MS_L, KC_MS_D, KC_MS_R, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_HOME, \ 77 TRNS, KC_MS_L, KC_MS_D, KC_MS_R, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_HOME, \
78 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_VOLD, KC_VOLU, KC_MUTE, TRNS, KC_WH_U, KC_END, \ 78 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_VOLD, KC_VOLU, KC_MUTE, TRNS, KC_WH_U, KC_END, \
79 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_WH_L, KC_WH_D, KC_WH_R), 79 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_WH_L, KC_WH_D, KC_WH_R),
80 80
81 /* Keymap _AR: Arrow keys layer 81 /* Keymap _UL: Unlock layer
82 * ,----------------------------------------------------------------. 82 * ,----------------------------------------------------------------.
83 * |Esc | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |P/P | 83 * | | | | | | | | | | | | | | | |
84 * |----------------------------------------------------------------|
85 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ |Del |
86 * |----------------------------------------------------------------| 84 * |----------------------------------------------------------------|
87 * |CAPS | A| S| D| F| G| H| J| K| L| ;| '|Return |PgUp| 85 * | | | | | | | | | | | | | | |_MA |
88 * |----------------------------------------------------------------| 86 * |----------------------------------------------------------------|
89 * |Shft|End| Z| X| C| V| B| N| M| ,| .| /|Shift | Up|PgDn| 87 * | | | | | | |Lft|Dwn| Up|Rgt| | | | |
90 * |----------------------------------------------------------------| 88 * |----------------------------------------------------------------|
91 * |Ctrl|Win |Alt | Space |Alt|Ctrl| FN|Lef|Dow|Rig | 89 * | | | | | | | | | | | | | | | |
90 * |----------------------------------------------------------------|
91 * | | | | | | | | | | |
92 * `----------------------------------------------------------------' 92 * `----------------------------------------------------------------'
93 */ 93 */
94[_AR] = KEYMAP_ANSI( 94[_AR] = KEYMAP_ANSI(
95 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \ 95 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
96 LENNY, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \ 96 LENNY, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
97 DWNHRT, TRNS, TRNS, TRNS, TRNS, TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TRNS, TRNS, TRNS, TRNS, \ 97 DWNHRT, TRNS, TRNS, TRNS, TRNS, TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TRNS, TRNS, TRNS, TRNS, \
98 SHRUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \ 98 SHRUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
99 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), 99 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
100 100
101 /* Keymap _UL: Unlock layer 101 /* Keymap _UL: Unlock layer
102 * ,----------------------------------------------------------------. 102 * ,----------------------------------------------------------------.
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
106 * |----------------------------------------------------------------| 106 * |----------------------------------------------------------------|
107 * | | | | | | | | | | | | | | | 107 * | | | | | | | | | | | | | | |
108 * |----------------------------------------------------------------| 108 * |----------------------------------------------------------------|
109 * | | | | | | | | | | | | | | | 109 * | | | | | | | | | | | | | | | |
110 * |----------------------------------------------------------------| 110 * |----------------------------------------------------------------|
111 * | | | | | | | | | | | 111 * | | | | | | | | | | |
112 * `----------------------------------------------------------------' 112 * `----------------------------------------------------------------'
@@ -114,9 +114,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
114[_UL] = KEYMAP_ANSI( 114[_UL] = KEYMAP_ANSI(
115 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 115 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
116 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_MA), \ 116 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(_MA), \
117 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 117 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
118 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 118 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
119 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TRNS, KC_NO, KC_NO, KC_NO), 119 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TRNS, KC_NO, KC_NO, KC_NO),
120 120
121 /* Keymap _LO: Lock layer 121 /* Keymap _LO: Lock layer
122 * ,----------------------------------------------------------------. 122 * ,----------------------------------------------------------------.
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
126 * |----------------------------------------------------------------| 126 * |----------------------------------------------------------------|
127 * | | | | | | | | | | | | | | | 127 * | | | | | | | | | | | | | | |
128 * |----------------------------------------------------------------| 128 * |----------------------------------------------------------------|
129 * | | | | | | | | | | | | | | | 129 * | | | | | | | | | | | | | | | |
130 * |----------------------------------------------------------------| 130 * |----------------------------------------------------------------|
131 * | | | | | | | _UL | | | | 131 * | | | | | | | _UL | | | |
132 * `----------------------------------------------------------------' 132 * `----------------------------------------------------------------'
@@ -134,9 +134,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
134[_LO] = KEYMAP_ANSI( 134[_LO] = KEYMAP_ANSI(
135 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 135 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
136 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 136 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
137 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 137 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
138 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ 138 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
139 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MO(_UL), KC_NO, KC_NO, KC_NO), 139 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MO(_UL), KC_NO, KC_NO, KC_NO),
140}; 140};
141 141
142void tap(uint16_t keycode){ 142void tap(uint16_t keycode){
diff --git a/keyboards/tada68/keymaps/maartenwut/tada68.h b/keyboards/tada68/keymaps/maartenwut/tada68.h
new file mode 100755
index 000000000..e7e17a938
--- /dev/null
+++ b/keyboards/tada68/keymaps/maartenwut/tada68.h
@@ -0,0 +1,43 @@
1#ifndef TADA68_H
2#define TADA68_H
3
4#include "quantum.h"
5
6// readability
7#define XXX KC_NO
8
9/* TADA68 ANSI layout
10 * ,----------------------------------------------------------------.
11 * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e |
12 * |----------------------------------------------------------------|
13 * | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| 1d | 1e |
14 * |----------------------------------------------------------------|
15 * | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d | 2e |
16 * |----------------------------------------------------------------|
17 * | 30 | 31| 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3c| 3d| 3e |
18 * |----------------------------------------------------------------|
19 * | 40 | 41 | 42 | 45 | 49| 4a| 4b| 4c| 4d| 4e |
20 * `----------------------------------------------------------------'
21 */
22// The first section contains all of the arguments
23// The second converts the arguments into a two-dimensional array
24
25#define KEYMAP_ANSI( \
26 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
27 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
28 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k2e, \
29 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
30 k40, k41, k42, k45, k49, k4a, k4b, k4c, k4d, k4e \
31) \
32{ \
33 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
34 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
35 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
36 {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
37 {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \
38}
39
40void matrix_init_user(void);
41void matrix_scan_user(void);
42
43#endif