diff options
| author | QMK Bot <hello@qmk.fm> | 2021-07-20 00:30:40 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-07-20 00:30:40 +0000 |
| commit | f9332747e324f4fd131c4251cbc4996c7e9eb0a3 (patch) | |
| tree | 12b95ad3968d0479e60d6593766bc708ee9b61d5 /keyboards/boardsource | |
| parent | f493f560cc85585b336930ca551a44df10aab90c (diff) | |
| parent | 7e698c71cd8b9d0cdef6c622cfdd88a13e2a6587 (diff) | |
| download | qmk_firmware-f9332747e324f4fd131c4251cbc4996c7e9eb0a3.tar.gz qmk_firmware-f9332747e324f4fd131c4251cbc4996c7e9eb0a3.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/boardsource')
| -rw-r--r-- | keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/boardsource/holiday/spooky/rules.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c b/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c index b4fcfc1bc..63fbb1b94 100644 --- a/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c +++ b/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c | |||
| @@ -24,7 +24,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 24 | /* Base */ | 24 | /* Base */ |
| 25 | [_BASE] = LAYOUT_ortho_2x3( | 25 | [_BASE] = LAYOUT_ortho_2x3( |
| 26 | KC_F1, KC_F2, KC_F3, | 26 | KC_F1, KC_F2, KC_F3, |
| 27 | KC_F4, KC_F5,KC_F6 | 27 | KC_F4, KC_F5, KC_F6 |
| 28 | ), | 28 | ), |
| 29 | }; | 29 | }; |
| 30 | |||
diff --git a/keyboards/boardsource/holiday/spooky/rules.mk b/keyboards/boardsource/holiday/spooky/rules.mk index d23e95512..2fd07c241 100644 --- a/keyboards/boardsource/holiday/spooky/rules.mk +++ b/keyboards/boardsource/holiday/spooky/rules.mk | |||
| @@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | |||
| 20 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 20 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
| 22 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
| 23 | |||
| 24 | LAYOUTS = ortho_2x3 | ||