aboutsummaryrefslogtreecommitdiff
path: root/keyboards/tada68
diff options
context:
space:
mode:
authorRys Sommefeldt <rys@pixeltards.com>2019-01-22 20:39:53 +0000
committerDrashna Jaelre <drashna@live.com>2019-01-22 12:39:53 -0800
commit2a33d2c4243e6fdca9849ff1caadbaea941e8c85 (patch)
treec6ca58591d23f40d4d79888c9ca0ffa3a0f849a2 /keyboards/tada68
parent5be7d09b36a1a15e80978746cf256a5b62db7355 (diff)
downloadqmk_firmware-2a33d2c4243e6fdca9849ff1caadbaea941e8c85.tar.gz
qmk_firmware-2a33d2c4243e6fdca9849ff1caadbaea941e8c85.zip
[Keymap] Add a compile-time provided macro and assign to _FL (#4908)
* Update make command with correct variant * Add a custom keycode for a compile-time defined macro and add to _FL
Diffstat (limited to 'keyboards/tada68')
-rw-r--r--keyboards/tada68/keymaps/rys/keymap.c31
-rw-r--r--keyboards/tada68/keymaps/rys/readme.md2
-rw-r--r--keyboards/tada68/keymaps/rys/rules.mk3
3 files changed, 27 insertions, 9 deletions
diff --git a/keyboards/tada68/keymaps/rys/keymap.c b/keyboards/tada68/keymaps/rys/keymap.c
index d1301d40b..a729e4be8 100644
--- a/keyboards/tada68/keymaps/rys/keymap.c
+++ b/keyboards/tada68/keymaps/rys/keymap.c
@@ -5,6 +5,21 @@
5 5
6#define _______ KC_TRNS 6#define _______ KC_TRNS
7 7
8enum rys_keycodes {
9 PSTOKEN = SAFE_RANGE,
10};
11
12bool process_record_user(uint16_t keycode, keyrecord_t *record) {
13 switch (keycode) {
14 case PSTOKEN:
15 if (record->event.pressed) {
16 SEND_STRING(RYS_PSTOKEN);
17 }
18 break;
19 }
20 return true;
21};
22
8const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 23const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9 /* Keymap _BL: (Base Layer) Default Layer 24 /* Keymap _BL: (Base Layer) Default Layer
10 * ,----------------------------------------------------------------. 25 * ,----------------------------------------------------------------.
@@ -16,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
16 * |----------------------------------------------------------------| 31 * |----------------------------------------------------------------|
17 * |Shift| \ | Z| X| C| V| B| N| M| ,| .| /|Rshift|Up|PgDn| 32 * |Shift| \ | Z| X| C| V| B| N| M| ,| .| /|Rshift|Up|PgDn|
18 * |----------------------------------------------------------------| 33 * |----------------------------------------------------------------|
19 * |Ctrl|Win |Alt | Space |Alt| FN|Ctrl|Lef|Dow|Rig | 34 * |Ctrl|Alt |LGUI| Space |Alt| FN|Ctrl|Lef|Dow|Rig |
20 * `----------------------------------------------------------------' 35 * `----------------------------------------------------------------'
21 */ 36 */
22 [_BL] = LAYOUT_iso( 37 [_BL] = LAYOUT_iso(
@@ -29,22 +44,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29 44
30 /* Keymap _FL1: Function Layer 1 45 /* Keymap _FL1: Function Layer 1
31 * ,----------------------------------------------------------------. 46 * ,----------------------------------------------------------------.
32 * | | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Delete| Ins| 47 * | | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| | :D |
33 * |----------------------------------------------------------------| 48 * |----------------------------------------------------------------|
34 * | | | | | | | | | | | | | | |Home| 49 * | |LMB| Up|RMB| | | | | | | | | | | |
35 * |------------------------------------------------------- -----| 50 * |------------------------------------------------------- -----|
36 * | |||| | | | | | | | | | | End| 51 * | |Lef|Dow|Rig| | | | | | | | | | |Home|
37 * |----------------------------------------------------------------| 52 * |----------------------------------------------------------------|
38 * | | | | | L+|LED| L-| | V+| V-|Mut| | MsBtn|Up|MsBn| 53 * | | | | | L+|LED| L-| | V+| V-|Mut| | MsBtn|| End|
39 * |----------------------------------------------------------------| 54 * |----------------------------------------------------------------|
40 * | | | | | | | | Lt| Dn| Rt | 55 * | | | | Reset | | | | | | |
41 * `----------------------------------------------------------------' 56 * `----------------------------------------------------------------'
42 */ 57 */
43 [_FL] = LAYOUT_iso( 58 [_FL] = LAYOUT_iso(
44 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, \ 59 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, PSTOKEN, \
45 _______, KC_BTN1, KC_UP, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 60 _______, KC_BTN1, KC_UP, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
46 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, \ 61 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, \
47 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_MS_U, KC_END, \ 62 _______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_MS_U, KC_END, \
48 _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R 63 _______, _______, _______, RESET, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
49 ), 64 ),
50}; 65};
diff --git a/keyboards/tada68/keymaps/rys/readme.md b/keyboards/tada68/keymaps/rys/readme.md
index a9425bf06..bf6a643d3 100644
--- a/keyboards/tada68/keymaps/rys/readme.md
+++ b/keyboards/tada68/keymaps/rys/readme.md
@@ -11,5 +11,5 @@ Please see the [Tada68 readme](../../readme.md). Make the firmware wih the
11following command: 11following command:
12 12
13``` 13```
14make tada68:rys:bin 14make tada68:rys:flashbin
15``` 15```
diff --git a/keyboards/tada68/keymaps/rys/rules.mk b/keyboards/tada68/keymaps/rys/rules.mk
index b2789a78a..db6efeb8f 100644
--- a/keyboards/tada68/keymaps/rys/rules.mk
+++ b/keyboards/tada68/keymaps/rys/rules.mk
@@ -15,3 +15,6 @@ UNICODE_ENABLE = no # Unicode
15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 15BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
16RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. 16RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
17SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 17SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
18
19RYS_PSTOKEN = $(shell security find-generic-password -a qmk -s tada68 -w)
20CFLAGS += -DRYS_PSTOKEN=\"$(RYS_PSTOKEN)\"