andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #743 from shelaf/patch-2 

Fix compiler warnings for HHKB
master
Jack Humbert 2016-09-11 19:24:59 -04:00 committed by GitHub
parent b06b8f5c18 2a8536f00f
commit ffa12f9235
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/hhkb/keymaps/jp/Makefile
View File

@ -1 +1 @@
HHKB_JP=yes OPT_DEFS += -DHHKB_JP

2
keyboards/hhkb/keymaps/rdg_jp/Makefile
View File

@ -1 +1 @@
HHKB_JP=yes OPT_DEFS += -DHHKB_JP

24
keyboards/hhkb/rules.mk
View File

@ -58,23 +58,19 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
CONSOLE_ENABLE ?= yes # Console for debug(+400) CONSOLE_ENABLE ?= yes # Console for debug(+400)
COMMAND_ENABLE ?= yes # Commands for debug and configuration COMMAND_ENABLE ?= yes # Commands for debug and configuration
CUSTOM_MATRIX ?= yes # Custom matrix file for the HHKB CUSTOM_MATRIX ?= yes # Custom matrix file for the HHKB
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
# SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend # SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend
# NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work # NKRO_ENABLE ?= yes # USB 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 ?= yes # Enable keyboard backlight functionality
# MIDI_ENABLE ?= YES # MIDI controls # MIDI_ENABLE ?= yes # MIDI controls
# UNICODE_ENABLE ?= YES # Unicode # UNICODE_ENABLE ?= yes # Unicode
# BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID # BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID
ifneq (, $(findstring yes, $(HHKB_JP)))
OPT_DEFS += -DHHKB_JP
endif
debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
debug-on: all debug-on: all