aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Cole Markham <github@ccmcomputing.net>2017-12-13 15:56:36 -0600
committerGravatar Jack Humbert <jack.humb@gmail.com>2017-12-14 00:13:42 -0500
commit2dfdafbd5b9240b716c8c4d65154188594a98878 (patch)
tree44295c78e57d5700f222b87ab785f994e06f267d
parent5fe0fe37562635caef2e6c0d9fb40832e2c332d1 (diff)
downloadqmk_firmware-2dfdafbd5b9240b716c8c4d65154188594a98878.tar.gz
Update '?=' references in rules.mk. Add support for ortho_4x12 layout.
-rw-r--r--keyboards/meira/meira.h2
-rw-r--r--keyboards/meira/rules.mk31
2 files changed, 18 insertions, 15 deletions
diff --git a/keyboards/meira/meira.h b/keyboards/meira/meira.h
index 28d646dc7..29fdb84d5 100644
--- a/keyboards/meira/meira.h
+++ b/keyboards/meira/meira.h
@@ -38,3 +38,5 @@ void reset_keyboard_kb(void);
}
#endif
+
+#define LAYOUT_ortho_4x12 KEYMAP
diff --git a/keyboards/meira/rules.mk b/keyboards/meira/rules.mk
index 3c69cb60a..d4a1f921d 100644
--- a/keyboards/meira/rules.mk
+++ b/keyboards/meira/rules.mk
@@ -53,24 +53,24 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
-CONSOLE_ENABLE ?= yes # Console for debug(+400)
-COMMAND_ENABLE ?= yes # Commands for debug and configuration
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
+CONSOLE_ENABLE = yes # Console for debug(+400)
+COMMAND_ENABLE = yes # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE ?= no # USB Nkey Rollover
-BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE ?= no # Unicode
-BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE ?= no # Audio output on port C6
-RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
+UNICODE_ENABLE = no # Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no # Audio output on port C6
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
-ISSI_ENABLE ?= no # If the I2C pullup resistors aren't install this must be disabled
+ISSI_ENABLE = no # If the I2C pullup resistors aren't install this must be disabled
#WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms
CUSTOM_MATRIX = yes
@@ -84,3 +84,4 @@ ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
endif
DEFAULT_FOLDER = meira/promicro
+LAYOUTS = ortho_4x12