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/moonlander | |
| parent | 996a19ee7ba3308e17fd347afde0b135852835cc (diff) | |
| parent | a913db63aa41f7d1c939d735fbd316a85225d935 (diff) | |
Merge tag '0.13.13' into firmware_21
Diffstat (limited to 'keyboards/moonlander')
| -rw-r--r-- | keyboards/moonlander/moonlander.c | 2 | ||||
| -rw-r--r-- | keyboards/moonlander/rules.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index efc7de85bb..0746d279c9 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -386,7 +386,7 @@ bool music_mask_kb(uint16_t keycode) { #ifdef SWAP_HANDS_ENABLE // swap-hands action needs a matrix to define the swap // clang-format off -const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { +const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { /* Left hand, matrix positions */ {{6,6}, {5,6}, {4,6}, {3,6}, {2,6}, {1,6},{0,6}}, {{6,7}, {5,7}, {4,7}, {3,7}, {2,7}, {1,7},{0,7}}, diff --git a/keyboards/moonlander/rules.mk b/keyboards/moonlander/rules.mk index ffd415d78d..16822cb504 100644 --- a/keyboards/moonlander/rules.mk +++ b/keyboards/moonlander/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # change yes to no to disable # @@ -23,7 +26,6 @@ DEBOUNCE_TYPE = custom SWAP_HANDS_ENABLE = yes RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = IS31FL3731 -#SERIAL_LINK_ENABLE = yes EEPROM_DRIVER = i2c MOUSE_SHARED_EP = no |