From 7dd993fb066ad34623bc2875b7b609de1732a027 Mon Sep 17 00:00:00 2001 From: Joakim Tufvegren <104522+firetech@users.noreply.github.com> Date: Thu, 17 Feb 2022 17:53:06 +0100 Subject: [PATCH 1/3] Fix build error for LED Matrix effect solid_reactive_wide. (#16383) --- quantum/led_matrix/animations/solid_reactive_wide.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quantum/led_matrix/animations/solid_reactive_wide.h b/quantum/led_matrix/animations/solid_reactive_wide.h index 3aa88063a7..9f039c45d4 100644 --- a/quantum/led_matrix/animations/solid_reactive_wide.h +++ b/quantum/led_matrix/animations/solid_reactive_wide.h @@ -1,5 +1,5 @@ #ifdef LED_MATRIX_KEYREACTIVE_ENABLED -# if !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) +# if defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE LED_MATRIX_EFFECT(SOLID_REACTIVE_WIDE) @@ -26,5 +26,5 @@ bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_re # endif # endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS -# endif // !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) +# endif // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE) #endif // LED_MATRIX_KEYREACTIVE_ENABLED From 2d12eacb4b9bf1b3d331cec0bd06fd1a58a5d217 Mon Sep 17 00:00:00 2001 From: Simon <47527944+Frooastside@users.noreply.github.com> Date: Thu, 17 Feb 2022 17:59:12 +0100 Subject: [PATCH 2/3] [Keyboard] Renamed Frooastboard to Frooastboard Nano (#16373) --- keyboards/frooastboard/{ => nano}/config.h | 4 ++-- keyboards/frooastboard/{ => nano}/info.json | 4 ++-- .../frooastboard/{ => nano}/keymaps/default/keymap.c | 2 +- .../frooastboard/{ => nano}/keymaps/safe_mode/keymap.c | 2 +- keyboards/frooastboard/{ => nano}/keymaps/via/config.h | 2 +- keyboards/frooastboard/{ => nano}/keymaps/via/keymap.c | 2 +- keyboards/frooastboard/{ => nano}/keymaps/via/rules.mk | 0 keyboards/frooastboard/{frooastboard.c => nano/nano.c} | 4 ++-- keyboards/frooastboard/{frooastboard.h => nano/nano.h} | 2 +- keyboards/frooastboard/{ => nano}/readme.md | 10 +++++----- keyboards/frooastboard/{ => nano}/rules.mk | 0 11 files changed, 16 insertions(+), 16 deletions(-) rename keyboards/frooastboard/{ => nano}/config.h (94%) rename keyboards/frooastboard/{ => nano}/info.json (85%) rename keyboards/frooastboard/{ => nano}/keymaps/default/keymap.c (96%) rename keyboards/frooastboard/{ => nano}/keymaps/safe_mode/keymap.c (96%) rename keyboards/frooastboard/{ => nano}/keymaps/via/config.h (96%) rename keyboards/frooastboard/{ => nano}/keymaps/via/keymap.c (96%) rename keyboards/frooastboard/{ => nano}/keymaps/via/rules.mk (100%) rename keyboards/frooastboard/{frooastboard.c => nano/nano.c} (92%) rename keyboards/frooastboard/{frooastboard.h => nano/nano.h} (95%) rename keyboards/frooastboard/{ => nano}/readme.md (78%) rename keyboards/frooastboard/{ => nano}/rules.mk (100%) diff --git a/keyboards/frooastboard/config.h b/keyboards/frooastboard/nano/config.h similarity index 94% rename from keyboards/frooastboard/config.h rename to 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 similarity index 85% rename from keyboards/frooastboard/info.json rename to keyboards/frooastboard/nano/info.json index bb63e10920..7c594187eb 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 similarity index 96% rename from keyboards/frooastboard/keymaps/default/keymap.c rename to 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 similarity index 96% rename from keyboards/frooastboard/keymaps/safe_mode/keymap.c rename to 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 similarity index 96% rename from keyboards/frooastboard/keymaps/via/config.h rename to 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 similarity index 96% rename from keyboards/frooastboard/keymaps/via/keymap.c rename to 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 similarity index 100% rename from keyboards/frooastboard/keymaps/via/rules.mk rename to keyboards/frooastboard/nano/keymaps/via/rules.mk diff --git a/keyboards/frooastboard/frooastboard.c b/keyboards/frooastboard/nano/nano.c similarity index 92% rename from keyboards/frooastboard/frooastboard.c rename to 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 . */ -#include "frooastboard.h" +#include "nano.h" diff --git a/keyboards/frooastboard/frooastboard.h b/keyboards/frooastboard/nano/nano.h similarity index 95% rename from keyboards/frooastboard/frooastboard.h rename to 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 similarity index 78% rename from keyboards/frooastboard/readme.md rename to 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 similarity index 100% rename from keyboards/frooastboard/rules.mk rename to keyboards/frooastboard/nano/rules.mk From 4666d2600801ecca959cc13911e69379978a0436 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 19 Feb 2022 02:53:36 +1100 Subject: [PATCH 3/3] Fix a couple of boards being wrongly identified as AVR (#16377) --- keyboards/mlego/m60_split/info.json | 1 - keyboards/splitkb/kyria/rev1/proton_c/rules.mk | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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