~ruther/qmk_firmware

5b688a09ecfd95215941d76eb696aa6de2c988dd — fauxpark 3 years ago da28073 + 4666d26
Merge remote-tracking branch 'upstream/master' into develop
R keyboards/frooastboard/config.h => keyboards/frooastboard/nano/config.h +2 -2
@@ 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

R keyboards/frooastboard/info.json => keyboards/frooastboard/nano/info.json +2 -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",

R keyboards/frooastboard/keymaps/default/keymap.c => keyboards/frooastboard/nano/keymaps/default/keymap.c +1 -1
@@ 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

R keyboards/frooastboard/keymaps/safe_mode/keymap.c => keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c +1 -1
@@ 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

R keyboards/frooastboard/keymaps/via/config.h => keyboards/frooastboard/nano/keymaps/via/config.h +1 -1
@@ 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

R keyboards/frooastboard/keymaps/via/keymap.c => keyboards/frooastboard/nano/keymaps/via/keymap.c +1 -1
@@ 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

R keyboards/frooastboard/keymaps/via/rules.mk => keyboards/frooastboard/nano/keymaps/via/rules.mk +0 -0
R keyboards/frooastboard/frooastboard.c => keyboards/frooastboard/nano/nano.c +2 -2
@@ 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"

R keyboards/frooastboard/frooastboard.h => keyboards/frooastboard/nano/nano.h +1 -1
@@ 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

R keyboards/frooastboard/readme.md => keyboards/frooastboard/nano/readme.md +5 -5
@@ 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).

R keyboards/frooastboard/rules.mk => keyboards/frooastboard/nano/rules.mk +0 -0
M keyboards/mlego/m60_split/info.json => keyboards/mlego/m60_split/info.json +0 -1
@@ 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": {

M keyboards/splitkb/kyria/rev1/proton_c/rules.mk => keyboards/splitkb/kyria/rev1/proton_c/rules.mk +7 -0
@@ 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

M quantum/led_matrix/animations/solid_reactive_wide.h => quantum/led_matrix/animations/solid_reactive_wide.h +2 -2
@@ 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