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

This commit is contained in:
fauxpark 2022-02-19 04:27:09 +11:00
commit 5b688a09ec
14 changed files with 25 additions and 19 deletions

View file

@ -1,4 +1,4 @@
/* Copyright 2021 frooastside /* Copyright 2021-2022 frooastside
* *
* 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
@ -20,7 +20,7 @@
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
#define MANUFACTURER frooastside #define MANUFACTURER frooastside
#define PRODUCT Frooastboard #define PRODUCT Frooastboard Nano
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 2 #define MATRIX_ROWS 2

View file

@ -1,6 +1,6 @@
{ {
"keyboard_name": "Frooastboard", "keyboard_name": "Frooastboard Nano",
"url": "https://github.com/frooastside/qmk_firmware/tree/master/keyboards/frooastboard", "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/nano",
"maintainer": "frooastside", "maintainer": "frooastside",
"debounce": 5, "debounce": 5,
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",

View file

@ -1,4 +1,4 @@
/* Copyright 2021 frooastside /* Copyright 2021-2022 frooastside
* *
* 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

View file

@ -1,4 +1,4 @@
/* Copyright 2021 frooastside /* Copyright 2021-2022 frooastside
* *
* 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

View file

@ -1,4 +1,4 @@
/* Copyright 2021 frooastside /* Copyright 2021-2022 frooastside
* *
* 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

View file

@ -1,4 +1,4 @@
/* Copyright 2021 frooastside /* Copyright 2021-2022 frooastside
* *
* 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

View file

@ -1,4 +1,4 @@
/* Copyright 2021 frooastside /* Copyright 2021-2022 frooastside
* *
* 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
@ -14,4 +14,4 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "frooastboard.h" #include "nano.h"

View file

@ -1,4 +1,4 @@
/* Copyright 2021 frooastside /* Copyright 2021-2022 frooastside
* *
* 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

View file

@ -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) * Keyboard Maintainer: [Frooastside](https://github.com/frooastside)
* Hardware Supported: Frooastboard * Hardware Supported: Frooastboard Nano
* Hardware Availability: https://github.com/Frooastside/Frooastboard * 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`.) **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 example for this keyboard (after setting up your build environment):
make frooastboard:default make frooastboard/nano:default
Flashing example for this keyboard: 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). 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).

View file

@ -1,6 +1,5 @@
{ {
"keyboard_name": "mlego/m60_split", "keyboard_name": "mlego/m60_split",
"keyboard_folder": "mlego/m60_split",
"url": "https://gitlab.com/m-lego/m65", "url": "https://gitlab.com/m-lego/m65",
"maintainer": "alin elena", "maintainer": "alin elena",
"layouts": { "layouts": {

View file

@ -1,3 +1,10 @@
# MCU name
MCU = STM32F303
BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
WS2812_DRIVER = pwm WS2812_DRIVER = pwm
SERIAL_DRIVER = usart SERIAL_DRIVER = usart
AUDIO_ENABLE = no AUDIO_ENABLE = no

View file

@ -1,5 +1,5 @@
#ifdef LED_MATRIX_KEYREACTIVE_ENABLED #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 # ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
LED_MATRIX_EFFECT(SOLID_REACTIVE_WIDE) LED_MATRIX_EFFECT(SOLID_REACTIVE_WIDE)
@ -30,5 +30,5 @@ bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) {
# endif # endif
# endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS # 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 #endif // LED_MATRIX_KEYREACTIVE_ENABLED