diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-10-06 07:57:55 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-10-09 15:21:37 -0400 |
| commit | 1df10ae3bfc146805c75b06dc0c126cd1ef3a60a (patch) | |
| tree | b4585fac728f4f729b8796bcf711682919a66b9b | |
| parent | 5a127293e7dfb348102afcb47d0e21b6fefad50a (diff) | |
| download | firmware-1df10ae3bfc146805c75b06dc0c126cd1ef3a60a.tar.gz firmware-1df10ae3bfc146805c75b06dc0c126cd1ef3a60a.tar.bz2 firmware-1df10ae3bfc146805c75b06dc0c126cd1ef3a60a.zip | |
Update default Planck layout to be more in line with standard conventions
| -rw-r--r-- | keyboards/planck/keymaps/default/config.h | 6 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/default/keymap.c | 21 |
2 files changed, 16 insertions, 11 deletions
diff --git a/keyboards/planck/keymaps/default/config.h b/keyboards/planck/keymaps/default/config.h index fbd2fdb27..6fa31cc8a 100644 --- a/keyboards/planck/keymaps/default/config.h +++ b/keyboards/planck/keymaps/default/config.h @@ -1,7 +1,4 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "config_common.h" +#pragma once #ifdef AUDIO_ENABLE #define STARTUP_SONG SONG(PLANCK_SOUND) @@ -40,4 +37,3 @@ // Most tactile encoders have detents every 4 stages #define ENCODER_RESOLUTION 4 -#endif diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c index cffa5a5df..0b787cd12 100644 --- a/keyboards/planck/keymaps/default/keymap.c +++ b/keyboards/planck/keymaps/default/keymap.c @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "planck.h" -#include "action_layer.h" +#include QMK_KEYBOARD_H #include "muse.h" extern keymap_config_t keymap_config; @@ -276,11 +275,21 @@ void encoder_update(bool clockwise) { } } else { if (clockwise) { - register_code(KC_PGDN); - unregister_code(KC_PGDN); + #ifdef MOUSEKEY_ENABLE + register_code(KC_MS_WH_DOWN); + unregister_code(KC_MS_WH_DOWN); + #else + register_code(KC_PGDN); + unregister_code(KC_PGDN); + #endif } else { - register_code(KC_PGUP); - unregister_code(KC_PGUP); + #ifdef MOUSEKEY_ENABLE + register_code(KC_MS_WH_UP); + unregister_code(KC_MS_WH_UP); + #else + register_code(KC_PGUP); + unregister_code(KC_PGUP); + #endif } } } |