Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
fauxpark
commit
5b688a09ec
14 changed files with 25 additions and 19 deletions
|
|
@ -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
|
||||
|
|
@ -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",
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
@ -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
|
||||
|
|
@ -1,19 +1,19 @@
|
|||
# Frooastboard
|
||||
# Frooastboard Nano
|
||||
|
||||
|
||||
|
||||
|
||||
* 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).
|
||||
|
|
@ -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": {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -30,5 +30,5 @@ bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) {
|
|||
# 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
|
||||
|
|
|
|||
Loading…
Reference in a new issue