Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-04-20 16:57:07 +00:00
commit 5aa3fd5ac7
3 changed files with 10 additions and 4 deletions

View File

@ -1,4 +1,4 @@
/* Copyright 2020 Team Mechlovin /* Copyright 2021 Mechlovin' Studio
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -17,3 +17,11 @@
#pragma once #pragma once
#include "quantum.h" #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

View File

@ -2,5 +2,3 @@ MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard

View File

@ -16,4 +16,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard DEFAULT_FOLDER = mechlovin/infinity87/rgb_rev1