diff options
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/meira/featherble/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/meira/meira.c | 3 | ||||
| -rw-r--r-- | keyboards/meira/promicro/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/meira/rules.mk | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/keyboards/meira/featherble/rules.mk b/keyboards/meira/featherble/rules.mk index 47d0e5b89..391364322 100644 --- a/keyboards/meira/featherble/rules.mk +++ b/keyboards/meira/featherble/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | BLUETOOTH_ENABLE = yes | 1 | BLUETOOTH_ENABLE = yes |
| 2 | BACKLIGHT_ENABLE = yes | 2 | BACKLIGHT_ENABLE = no |
| 3 | F_CPU = 8000000 | 3 | F_CPU = 8000000 |
| 4 | 4 | ||
diff --git a/keyboards/meira/meira.c b/keyboards/meira/meira.c index cd6bf5580..2ae53e00a 100644 --- a/keyboards/meira/meira.c +++ b/keyboards/meira/meira.c | |||
| @@ -20,6 +20,8 @@ | |||
| 20 | #include "quantum.h" | 20 | #include "quantum.h" |
| 21 | #define BACKLIGHT_BREATHING | 21 | #define BACKLIGHT_BREATHING |
| 22 | 22 | ||
| 23 | extern void backlight_set(uint8_t level); | ||
| 24 | |||
| 23 | #ifdef AUDIO_ENABLE | 25 | #ifdef AUDIO_ENABLE |
| 24 | float tone_startup[][2] = SONG(STARTUP_SOUND); | 26 | float tone_startup[][2] = SONG(STARTUP_SOUND); |
| 25 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | 27 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); |
| @@ -55,7 +57,6 @@ void matrix_init_kb(void) | |||
| 55 | wdt_enable(WDTO_500MS); | 57 | wdt_enable(WDTO_500MS); |
| 56 | #endif | 58 | #endif |
| 57 | 59 | ||
| 58 | |||
| 59 | // put your keyboard start-up code here | 60 | // put your keyboard start-up code here |
| 60 | // runs once when the firmware starts up | 61 | // runs once when the firmware starts up |
| 61 | matrix_init_user(); | 62 | matrix_init_user(); |
diff --git a/keyboards/meira/promicro/rules.mk b/keyboards/meira/promicro/rules.mk index 8d6c4e168..529e3147e 100644 --- a/keyboards/meira/promicro/rules.mk +++ b/keyboards/meira/promicro/rules.mk | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | BLUETOOTH_ENABLE = no | 1 | BLUETOOTH_ENABLE = no |
| 2 | BACKLIGHT_ENABLE = yes | 2 | BACKLIGHT_ENABLE = no |
diff --git a/keyboards/meira/rules.mk b/keyboards/meira/rules.mk index 9f1d2fbae..3c69cb60a 100644 --- a/keyboards/meira/rules.mk +++ b/keyboards/meira/rules.mk | |||
| @@ -47,7 +47,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
| 47 | # Atmel DFU loader 4096 | 47 | # Atmel DFU loader 4096 |
| 48 | # LUFA bootloader 4096 | 48 | # LUFA bootloader 4096 |
| 49 | # USBaspLoader 2048 | 49 | # USBaspLoader 2048 |
| 50 | OPT_DEFS += -DBOOTLOADER_SIZE=512 | 50 | OPT_DEFS += -DBOOTLOADER_SIZE=4096 |
| 51 | 51 | ||
| 52 | 52 | ||
| 53 | # Build Options | 53 | # Build Options |
| @@ -62,7 +62,7 @@ COMMAND_ENABLE ?= yes # Commands for debug and configuration | |||
| 62 | SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend | 62 | SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend |
| 63 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 63 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 64 | NKRO_ENABLE ?= no # USB Nkey Rollover | 64 | NKRO_ENABLE ?= no # USB Nkey Rollover |
| 65 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 65 | BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default |
| 66 | MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config) | 66 | MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config) |
| 67 | UNICODE_ENABLE ?= no # Unicode | 67 | UNICODE_ENABLE ?= no # Unicode |
| 68 | BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID | 68 | BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID |
| @@ -70,7 +70,7 @@ AUDIO_ENABLE ?= no # Audio output on port C6 | |||
| 70 | RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 70 | RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 71 | FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches | 71 | FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches |
| 72 | 72 | ||
| 73 | ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled | 73 | ISSI_ENABLE ?= no # If the I2C pullup resistors aren't install this must be disabled |
| 74 | #WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms | 74 | #WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms |
| 75 | 75 | ||
| 76 | CUSTOM_MATRIX = yes | 76 | CUSTOM_MATRIX = yes |
