diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-12-10 20:38:57 +0100 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-12-10 20:38:57 +0100 |
| commit | e5380795b9a0b554673449675630062be3b09573 (patch) | |
| tree | d8190bf95bf0303d7e871b2b2fbe0c020ea4ef80 /keyboards/lfkeyboards/mini1800 | |
| parent | 4a5e68f4f29b0c4c75a68b5958dff197f4ac0f53 (diff) | |
| download | qmk_firmware-e5380795b9a0b554673449675630062be3b09573.tar.gz qmk_firmware-e5380795b9a0b554673449675630062be3b09573.tar.xz | |
Fix the LFKeyboards so they work with the QMK Configurator (#4591)
* Make layer_info weak so it works with QMK Configurator
* Fix lfk87 compile issue
* Add fixes for lfkpad
Diffstat (limited to 'keyboards/lfkeyboards/mini1800')
| -rw-r--r-- | keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/lfkeyboards/mini1800/mini1800.c | 10 |
3 files changed, 10 insertions, 7 deletions
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk index 16452df67..2c6035d58 100644 --- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk +++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk @@ -23,9 +23,6 @@ ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be di WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms -ifndef QUANTUM_DIR - include ../../../../Makefile -endif ifeq ($(strip $(ISSI_ENABLE)), yes) TMK_COMMON_DEFS += -DISSI_ENABLE diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk b/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk index d6e35e353..1598173f3 100644 --- a/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk +++ b/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk @@ -23,10 +23,6 @@ ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be di WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms -ifndef QUANTUM_DIR - include ../../../../Makefile -endif - ifeq ($(strip $(ISSI_ENABLE)), yes) TMK_COMMON_DEFS += -DISSI_ENABLE endif diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c index f0692d46c..d5f4193c1 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.c +++ b/keyboards/lfkeyboards/mini1800/mini1800.c @@ -17,6 +17,16 @@ uint16_t click_time = CLICK_MS; uint8_t click_toggle = CLICK_ENABLED; float my_song[][2] = SONG(ZELDA_PUZZLE); +// Colors of the layer indicator LED +// This list needs to define layer 0xFFFFFFFF, it is the end of the list, and the unknown layer +__attribute__((weak)) +const Layer_Info layer_info[] = { + // Layer Mask Red Green Blue + {0x00000000, 0xFFFFFFFF, {0x00, 0xFF, 0x00}}, // base layers - green + {0x00000002, 0xFFFFFFFE, {0x00, 0x00, 0xFF}}, // function layer - blue + {0x00000004, 0xFFFFFFFC, {0xFF, 0x00, 0xFF}}, // settings layer - magenta + {0xFFFFFFFF, 0xFFFFFFFF, {0xFF, 0xFF, 0xFF}}, // unknown layer - REQUIRED - white +}; void matrix_init_kb(void) { |