summaryrefslogtreecommitdiff
path: root/keyboards
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
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')
-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 d1301d40bc..a729e4be89 100644
--- a/keyboards/tada68/keymaps/rys/keymap.c
+++ b/keyboards/tada68/keymaps/rys/keymap.c
@@ -5,6 +5,21 @@
#define _______ KC_TRNS
+enum rys_keycodes {
+ PSTOKEN = SAFE_RANGE,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case PSTOKEN:
+ if (record->event.pressed) {
+ SEND_STRING(RYS_PSTOKEN);
+ }
+ break;
+ }
+ return true;
+};
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _BL: (Base Layer) Default Layer
* ,----------------------------------------------------------------.
@@ -16,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |----------------------------------------------------------------|
* |Shift| \ | Z| X| C| V| B| N| M| ,| .| /|Rshift|Up|PgDn|
* |----------------------------------------------------------------|
- * |Ctrl|Win |Alt | Space |Alt| FN|Ctrl|Lef|Dow|Rig |
+ * |Ctrl|Alt |LGUI| Space |Alt| FN|Ctrl|Lef|Dow|Rig |
* `----------------------------------------------------------------'
*/
[_BL] = LAYOUT_iso(
@@ -29,22 +44,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _FL1: Function Layer 1
* ,----------------------------------------------------------------.
- * | | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Delete| Ins|
+ * | | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| | :D |
* |----------------------------------------------------------------|
- * | | | ↑ | | | | | | | | | | | |Home|
+ * | |LMB| Up|RMB| | | | | | | | | | | |
* |------------------------------------------------------- -----|
- * | | ← | ↓ | → | | | | | | | | | | | End|
+ * | |Lef|Dow|Rig| | | | | | | | | | |Home|
* |----------------------------------------------------------------|
- * | | | | | L+|LED| L-| | V+| V-|Mut| | MsBtn|Up|MsBn|
+ * | | | | | L+|LED| L-| | V+| V-|Mut| | MsBtn|↑ | End|
* |----------------------------------------------------------------|
- * | | | | | | | | Lt| Dn| Rt |
+ * | | | | Reset | | | | ← | ↓ | → |
* `----------------------------------------------------------------'
*/
[_FL] = LAYOUT_iso(
- _______, 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, PSTOKEN, \
_______, KC_BTN1, KC_UP, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, \
_______, _______, _______, _______, BL_DEC, BL_TOGG, BL_INC, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, KC_MS_U, KC_END, \
- _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+ _______, _______, _______, RESET, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
),
};
diff --git a/keyboards/tada68/keymaps/rys/readme.md b/keyboards/tada68/keymaps/rys/readme.md
index a9425bf067..bf6a643d33 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
following command:
```
-make tada68:rys:bin
+make tada68:rys:flashbin
```
diff --git a/keyboards/tada68/keymaps/rys/rules.mk b/keyboards/tada68/keymaps/rys/rules.mk
index b2789a78a7..db6efeb8f1 100644
--- a/keyboards/tada68/keymaps/rys/rules.mk
+++ b/keyboards/tada68/keymaps/rys/rules.mk
@@ -15,3 +15,6 @@ UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+
+RYS_PSTOKEN = $(shell security find-generic-password -a qmk -s tada68 -w)
+CFLAGS += -DRYS_PSTOKEN=\"$(RYS_PSTOKEN)\"