_/qmk_firmware
1
0
Fork 0
Code Releases Activity

Update default Planck layout to be more in line with standard conventions

Browse source
This commit is contained in:
Drashna Jaelre 2018-10-06 07:57:55 -07:00 committed by Jack Humbert
parent 5a127293e7
commit 1df10ae3bf
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
keyboards/planck/keymaps/default/config.h
View file

@ -1,7 +1,4 @@
#ifndef CONFIG_USER_H #pragma once
#define CONFIG_USER_H
#include "config_common.h"
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#define STARTUP_SONG SONG(PLANCK_SOUND) #define STARTUP_SONG SONG(PLANCK_SOUND)
@ -40,4 +37,3 @@
// Most tactile encoders have detents every 4 stages // Most tactile encoders have detents every 4 stages
#define ENCODER_RESOLUTION 4 #define ENCODER_RESOLUTION 4
#endif

21
keyboards/planck/keymaps/default/keymap.c
View file

@ -14,8 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "planck.h" #include QMK_KEYBOARD_H
#include "action_layer.h"
#include "muse.h" #include "muse.h"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
@ -276,11 +275,21 @@ void encoder_update(bool clockwise) {
} }
} else { } else {
if (clockwise) { if (clockwise) {
register_code(KC_PGDN); #ifdef MOUSEKEY_ENABLE
unregister_code(KC_PGDN); register_code(KC_MS_WH_DOWN);
unregister_code(KC_MS_WH_DOWN);
#else
register_code(KC_PGDN);
unregister_code(KC_PGDN);
#endif
} else { } else {
register_code(KC_PGUP); #ifdef MOUSEKEY_ENABLE
unregister_code(KC_PGUP); register_code(KC_MS_WH_UP);
unregister_code(KC_MS_WH_UP);
#else
register_code(KC_PGUP);
unregister_code(KC_PGUP);
#endif
} }
} }
} }