diff options
| author | QMK Bot <hello@qmk.fm> | 2021-04-20 16:57:07 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-04-20 16:57:07 +0000 |
| commit | 5aa3fd5ac707ff35296ef0339ced022753ebd499 (patch) | |
| tree | e7c210419010c5c1a24666319c820f3dd40e7a13 /keyboards | |
| parent | 6620b6c5155a9139b210d1fbec526eb3ebac5de8 (diff) | |
| parent | 21c147c11b23aad7a9335fee309531eac22ecf6b (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/mechlovin/infinity87/rev1/rev1.h | 10 | ||||
| -rw-r--r-- | keyboards/mechlovin/infinity87/rev1/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/mechlovin/infinity87/rules.mk | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.h b/keyboards/mechlovin/infinity87/rev1/rev1.h index 16cdf9ed85..de623a1cdd 100644 --- a/keyboards/mechlovin/infinity87/rev1/rev1.h +++ b/keyboards/mechlovin/infinity87/rev1/rev1.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Team Mechlovin +/* Copyright 2021 Mechlovin' Studio * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,3 +17,11 @@ #pragma once #include "quantum.h" + +#ifdef KEYBOARD_mechlovin_infinity87_rev1_rogue87 + #include "rogue87.h" +#elif KEYBOARD_mechlovin_infinity87_rev1_rouge87 + #include "rouge87.h" +#elif KEYBOARD_mechlovin_infinity87_rev1_standard + #include "infinity87.h" +#endif diff --git a/keyboards/mechlovin/infinity87/rev1/rules.mk b/keyboards/mechlovin/infinity87/rev1/rules.mk index cb04a558f2..2f2d27fb2f 100644 --- a/keyboards/mechlovin/infinity87/rev1/rules.mk +++ b/keyboards/mechlovin/infinity87/rev1/rules.mk @@ -2,5 +2,3 @@ MCU = STM32F303 BOARD = QMK_PROTON_C BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - -DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard
\ No newline at end of file diff --git a/keyboards/mechlovin/infinity87/rules.mk b/keyboards/mechlovin/infinity87/rules.mk index 1222987996..e0858aff0f 100644 --- a/keyboards/mechlovin/infinity87/rules.mk +++ b/keyboards/mechlovin/infinity87/rules.mk @@ -16,4 +16,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard +DEFAULT_FOLDER = mechlovin/infinity87/rgb_rev1 |