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

13 files changed, 23 insertions, 17 deletions

diff --git a/keyboards/frooastboard/config.h b/keyboards/frooastboard/nano/config.h
index ebfc6a75d7..48af8e7e9c 100644
--- a/keyboards/frooastboard/config.h
+++ b/keyboards/frooastboard/nano/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
@@ -20,7 +20,7 @@
 
 /* USB Device descriptor parameter */
 #define MANUFACTURER    frooastside
-#define PRODUCT         Frooastboard
+#define PRODUCT         Frooastboard Nano
 
 /* key matrix size */
 #define MATRIX_ROWS 2
diff --git a/keyboards/frooastboard/info.json b/keyboards/frooastboard/nano/info.json
index b1f7df7502..ae94705195 100644
--- a/keyboards/frooastboard/info.json
+++ b/keyboards/frooastboard/nano/info.json
@@ -1,6 +1,6 @@
 {
-    "keyboard_name": "Frooastboard",
-    "url": "https://github.com/frooastside/qmk_firmware/tree/master/keyboards/frooastboard",
+    "keyboard_name": "Frooastboard Nano",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/nano",
     "maintainer": "frooastside",
     "debounce": 5,
     "diode_direction": "COL2ROW",
diff --git a/keyboards/frooastboard/keymaps/default/keymap.c b/keyboards/frooastboard/nano/keymaps/default/keymap.c
index 569937d8e2..aa3ed88da2 100644
--- a/keyboards/frooastboard/keymaps/default/keymap.c
+++ b/keyboards/frooastboard/nano/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/keymaps/safe_mode/keymap.c b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
index dc040070ed..d237438da3 100644
--- a/keyboards/frooastboard/keymaps/safe_mode/keymap.c
+++ b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/keymaps/via/config.h b/keyboards/frooastboard/nano/keymaps/via/config.h
index 6bd3c6ea37..8c39695693 100644
--- a/keyboards/frooastboard/keymaps/via/config.h
+++ b/keyboards/frooastboard/nano/keymaps/via/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/keymaps/via/keymap.c b/keyboards/frooastboard/nano/keymaps/via/keymap.c
index 028462cded..bddd16bae5 100644
--- a/keyboards/frooastboard/keymaps/via/keymap.c
+++ b/keyboards/frooastboard/nano/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/keymaps/via/rules.mk b/keyboards/frooastboard/nano/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/frooastboard/keymaps/via/rules.mk
+++ b/keyboards/frooastboard/nano/keymaps/via/rules.mk
diff --git a/keyboards/frooastboard/frooastboard.c b/keyboards/frooastboard/nano/nano.c
index 8e7f3c8998..584176a4e9 100644
--- a/keyboards/frooastboard/frooastboard.c
+++ b/keyboards/frooastboard/nano/nano.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "frooastboard.h"
+#include "nano.h"
diff --git a/keyboards/frooastboard/frooastboard.h b/keyboards/frooastboard/nano/nano.h
index da598cf4aa..76d1a42eac 100644
--- a/keyboards/frooastboard/frooastboard.h
+++ b/keyboards/frooastboard/nano/nano.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/readme.md b/keyboards/frooastboard/nano/readme.md
index d465c3f4b7..d67f17483f 100644
--- a/keyboards/frooastboard/readme.md
+++ b/keyboards/frooastboard/nano/readme.md
@@ -1,19 +1,19 @@
-# Frooastboard
+# Frooastboard Nano
 
-![Frooastboard](https://i.imgur.com/f26O8JLh.jpg)
+![Frooastboard Nano](https://i.imgur.com/f26O8JLh.jpg)
 
 * Keyboard Maintainer: [Frooastside](https://github.com/frooastside)
-* Hardware Supported: Frooastboard
+* Hardware Supported: Frooastboard Nano
 * Hardware Availability: https://github.com/Frooastside/Frooastboard
 
 **Reset Key:** Hold down the key located at `K00`, commonly programmed as ESCAPE while plugging in the keyboard. (If via is used it is the key located at `K10`.)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make frooastboard:default
+    make frooastboard/nano:default
 
 Flashing example for this keyboard:
 
-    make frooastboard:default:flash
+    make frooastboard/nano: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/frooastboard/rules.mk b/keyboards/frooastboard/nano/rules.mk
index bef90c50ac..bef90c50ac 100644
--- a/keyboards/frooastboard/rules.mk
+++ b/keyboards/frooastboard/nano/rules.mk
diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json
index ad1f8f4bc9..c6c5ee480d 100644
--- a/keyboards/mlego/m60_split/info.json
+++ b/keyboards/mlego/m60_split/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "mlego/m60_split",
-    "keyboard_folder": "mlego/m60_split",
     "url": "https://gitlab.com/m-lego/m65",
     "maintainer": "alin elena",
     "layouts": {
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
index 9e0942398f..1a5f9a7cb3 100644
--- a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
+++ b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
@@ -1,3 +1,10 @@
+# MCU name
+MCU = STM32F303
+BOARD = QMK_PROTON_C
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 AUDIO_ENABLE = no