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

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

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

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