diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-01-07 08:45:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-07 08:45:19 -0600 |
| commit | 0fb82c15a5c9a69e17cff8dcd04c652d21381958 (patch) | |
| tree | dd7a441ad7d086bb7cb4b093bd8d0cbd4d39d69d /keyboards/preonic | |
| parent | db48b28eeb5ebe5252cc04495d5eb326fa62dc26 (diff) | |
| parent | e7df488a92da56cf160ac64c8cc7302ab717e145 (diff) | |
| download | qmk_firmware-0fb82c15a5c9a69e17cff8dcd04c652d21381958.tar.gz qmk_firmware-0fb82c15a5c9a69e17cff8dcd04c652d21381958.zip | |
Merge pull request #15 from jackhumbert/master
Merge from qmk
Diffstat (limited to 'keyboards/preonic')
| -rw-r--r-- | keyboards/preonic/config.h | 2 | ||||
| -rw-r--r-- | keyboards/preonic/rules.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index f88acf2111..239c29ebf9 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -37,6 +37,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } #define UNUSED_PINS +#define AUDIO_VOICES + #define BACKLIGHT_PIN B7 /* COL2ROW or ROW2COL */ diff --git a/keyboards/preonic/rules.mk b/keyboards/preonic/rules.mk index 071bfdc7fe..62473e3564 100644 --- a/keyboards/preonic/rules.mk +++ b/keyboards/preonic/rules.mk @@ -58,12 +58,12 @@ EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) CONSOLE_ENABLE ?= no # Console for debug(+400) COMMAND_ENABLE ?= no # Commands for debug and configuration NKRO_ENABLE ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality MIDI_ENABLE ?= yes # MIDI controls AUDIO_ENABLE ?= yes # Audio output on port C6 UNICODE_ENABLE ?= no # Unicode BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. API_SYSEX_ENABLE ?= yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |