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

11 files changed, 9 insertions, 9 deletions

diff --git a/keyboards/mechlovin/kay65/rev1/config.h b/keyboards/mechlovin/kay65/config.h
index cc1b991672..cc1b991672 100644
--- a/keyboards/mechlovin/kay65/rev1/config.h
+++ b/keyboards/mechlovin/kay65/config.h
diff --git a/keyboards/mechlovin/kay65/rev1/info.json b/keyboards/mechlovin/kay65/info.json
index 9a2f7dc01b..9a2f7dc01b 100644
--- a/keyboards/mechlovin/kay65/rev1/info.json
+++ b/keyboards/mechlovin/kay65/info.json
diff --git a/keyboards/mechlovin/kay65/rev1/rev1.c b/keyboards/mechlovin/kay65/kay65.c
index bc894a96e1..abc6a7f8d4 100644
--- a/keyboards/mechlovin/kay65/rev1/rev1.c
+++ b/keyboards/mechlovin/kay65/kay65.c
@@ -15,11 +15,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "rev1.h"
+#include "kay65.h"
 
 void keyboard_pre_init_user(void) {
   // Call the keyboard pre init code.
 
   // Set our LED pins as output
   setPinOutput(D7);
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechlovin/kay65/rev1/rev1.h b/keyboards/mechlovin/kay65/kay65.h
index 7da2a74969..7da2a74969 100644
--- a/keyboards/mechlovin/kay65/rev1/rev1.h
+++ b/keyboards/mechlovin/kay65/kay65.h
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/default/keymap.c b/keyboards/mechlovin/kay65/keymaps/default/keymap.c
index 1607eee4fd..cc7cdc44fa 100644
--- a/keyboards/mechlovin/kay65/rev1/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/kay65/keymaps/default/keymap.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 enum my_keycodes {
-  LOGO_LED_ON = USER00,
-  LOGO_LED_OFF = USER01
+  LOGO_LED_ON = SAFE_RANGE,
+  LOGO_LED_OFF
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -47,6 +47,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         } 
         break;
   }
-    return true;
+  return true;
 };
 
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/default/readme.md b/keyboards/mechlovin/kay65/keymaps/default/readme.md
index 95a00bd46c..95a00bd46c 100644
--- a/keyboards/mechlovin/kay65/rev1/keymaps/default/readme.md
+++ b/keyboards/mechlovin/kay65/keymaps/default/readme.md
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/via/keymap.c b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
index c2bdbf219f..02e1b8578d 100644
--- a/keyboards/mechlovin/kay65/rev1/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
@@ -68,5 +68,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         } 
         break;
   }
-    return true;
-};
\ No newline at end of file
+  return true;
+};
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/via/readme.md b/keyboards/mechlovin/kay65/keymaps/via/readme.md
index 9a13f95f0d..9a13f95f0d 100644
--- a/keyboards/mechlovin/kay65/rev1/keymaps/via/readme.md
+++ b/keyboards/mechlovin/kay65/keymaps/via/readme.md
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/via/rules.mk b/keyboards/mechlovin/kay65/keymaps/via/rules.mk
index 43061db1dd..43061db1dd 100644
--- a/keyboards/mechlovin/kay65/rev1/keymaps/via/rules.mk
+++ b/keyboards/mechlovin/kay65/keymaps/via/rules.mk
diff --git a/keyboards/mechlovin/kay65/rev1/readme.md b/keyboards/mechlovin/kay65/readme.md
index dfa454d370..768ce12aa7 100644
--- a/keyboards/mechlovin/kay65/rev1/readme.md
+++ b/keyboards/mechlovin/kay65/readme.md
@@ -10,11 +10,11 @@ A 65% PCB with centered USB, RGB underglow and top right LED.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mechlovin/kay65/rev1:default
+    make mechlovin/kay65:default
 
 Flashing example for this keyboard:
 
-    make mechlovin/kay65/rev1:default:flash
+    make mechlovin/kay65:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/mechlovin/kay65/rev1/rules.mk b/keyboards/mechlovin/kay65/rules.mk
index a9dd139c6b..a9dd139c6b 100644
--- a/keyboards/mechlovin/kay65/rev1/rules.mk
+++ b/keyboards/mechlovin/kay65/rules.mk