diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-13 18:01:57 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-13 18:01:57 +0700 |
| commit | 75e57b4bcb4f97fea7ed1b011eea3557a6b3e041 (patch) | |
| tree | 3a0a6b0bfae3246d28b8b7dec32b0b8fc904ff06 /keyboards | |
| parent | 200488bb31c1776cf4745b005bb8e9d696aea26e (diff) | |
| parent | 8c93c5d9ab8a0a69d84f707db71f417b66402693 (diff) | |
Merge branch 'faux_clicky' into promethium
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/planck/keymaps/priyadi/Makefile | 3 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/priyadi/keymap.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/keyboards/planck/keymaps/priyadi/Makefile b/keyboards/planck/keymaps/priyadi/Makefile index 336608b8cc..27c2638e2f 100644 --- a/keyboards/planck/keymaps/priyadi/Makefile +++ b/keyboards/planck/keymaps/priyadi/Makefile @@ -10,12 +10,13 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = yes # Audio output on port C6 +AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode UNICODEMAP_ENABLE = yes # Unicode map BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. API_SYSEX_ENABLE = no +FAUXCLICKY_ENABLE = yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend diff --git a/keyboards/planck/keymaps/priyadi/keymap.c b/keyboards/planck/keymaps/priyadi/keymap.c index 80e867621a..2c215702b5 100644 --- a/keyboards/planck/keymaps/priyadi/keymap.c +++ b/keyboards/planck/keymaps/priyadi/keymap.c @@ -310,6 +310,10 @@ const uint32_t PROGMEM unicode_map[] = { [FSIGM] = 0x03C2, }; +// hybrid right-gui & scroll lock (mapped to Compose in OS) +#undef KC_RALT +#define KC_RALT MT(MOD_RALT, KC_SLCK) + // keymaps const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |