diff options
| author | Drashna Jael're <drashna@live.com> | 2021-07-08 21:16:31 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-07-08 21:16:31 -0700 |
| commit | 4d0291668b0feb3e54b03011e9a9b4349ed83d99 (patch) | |
| tree | 8a58c5d0d3030d7400c6670a97e463343c52ae46 /keyboards/planck/ez | |
| parent | 996a19ee7ba3308e17fd347afde0b135852835cc (diff) | |
| parent | a913db63aa41f7d1c939d735fbd316a85225d935 (diff) | |
Merge tag '0.13.13' into firmware_21
Diffstat (limited to 'keyboards/planck/ez')
| -rw-r--r-- | keyboards/planck/ez/ez.h | 1 | ||||
| -rw-r--r-- | keyboards/planck/ez/glow/keymaps/glow/keymap.c | 3 | ||||
| -rwxr-xr-x | keyboards/planck/ez/rules.mk | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/keyboards/planck/ez/ez.h b/keyboards/planck/ez/ez.h index 144734a885..e3b5077bbb 100644 --- a/keyboards/planck/ez/ez.h +++ b/keyboards/planck/ez/ez.h @@ -55,7 +55,6 @@ { k37, k38, k39, k33, k34, k35 } \ } -#define KEYMAP LAYOUT_ortho_4x12 #define LAYOUT_planck_mit LAYOUT_planck_1x2uC #define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/planck/ez/glow/keymaps/glow/keymap.c b/keyboards/planck/ez/glow/keymaps/glow/keymap.c index 03cc0049e4..2cb68dfe95 100644 --- a/keyboards/planck/ez/glow/keymaps/glow/keymap.c +++ b/keyboards/planck/ez/glow/keymaps/glow/keymap.c @@ -256,7 +256,7 @@ uint16_t muse_counter = 0; uint8_t muse_offset = 70; uint16_t muse_tempo = 50; -void encoder_update(bool clockwise) { +bool encoder_update(bool clockwise) { if (muse_mode) { if (IS_LAYER_ON(_RAISE)) { if (clockwise) { @@ -290,6 +290,7 @@ void encoder_update(bool clockwise) { #endif } } + return true; } void dip_update(uint8_t index, bool active) { diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index cf95578b65..23f2aaa313 100755 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -2,12 +2,15 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug @@ -22,7 +25,6 @@ ENCODER_ENABLE = yes SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -# SERIAL_LINK_ENABLE = yes ENCODER_ENABLE = yes RGB_MATRIX_DRIVER = IS31FL3737 |