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: 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 -- cgit v1.2.3 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: [Keyboard] Renamed Frooastboard to Frooastboard Nano (#16373) --- keyboards/frooastboard/config.h | 52 ---------------------- keyboards/frooastboard/frooastboard.c | 17 ------- keyboards/frooastboard/frooastboard.h | 27 ----------- keyboards/frooastboard/info.json | 42 ----------------- keyboards/frooastboard/keymaps/default/keymap.c | 47 ------------------- keyboards/frooastboard/keymaps/safe_mode/keymap.c | 43 ------------------ keyboards/frooastboard/keymaps/via/config.h | 30 ------------- keyboards/frooastboard/keymaps/via/keymap.c | 27 ----------- keyboards/frooastboard/keymaps/via/rules.mk | 2 - keyboards/frooastboard/nano/config.h | 52 ++++++++++++++++++++++ keyboards/frooastboard/nano/info.json | 42 +++++++++++++++++ .../frooastboard/nano/keymaps/default/keymap.c | 47 +++++++++++++++++++ .../frooastboard/nano/keymaps/safe_mode/keymap.c | 43 ++++++++++++++++++ keyboards/frooastboard/nano/keymaps/via/config.h | 30 +++++++++++++ keyboards/frooastboard/nano/keymaps/via/keymap.c | 27 +++++++++++ keyboards/frooastboard/nano/keymaps/via/rules.mk | 2 + keyboards/frooastboard/nano/nano.c | 17 +++++++ keyboards/frooastboard/nano/nano.h | 27 +++++++++++ keyboards/frooastboard/nano/readme.md | 19 ++++++++ keyboards/frooastboard/nano/rules.mk | 18 ++++++++ keyboards/frooastboard/readme.md | 19 -------- keyboards/frooastboard/rules.mk | 18 -------- 22 files changed, 324 insertions(+), 324 deletions(-) delete mode 100644 keyboards/frooastboard/config.h delete mode 100644 keyboards/frooastboard/frooastboard.c delete mode 100644 keyboards/frooastboard/frooastboard.h delete mode 100644 keyboards/frooastboard/info.json delete mode 100644 keyboards/frooastboard/keymaps/default/keymap.c delete mode 100644 keyboards/frooastboard/keymaps/safe_mode/keymap.c delete mode 100644 keyboards/frooastboard/keymaps/via/config.h delete mode 100644 keyboards/frooastboard/keymaps/via/keymap.c delete mode 100644 keyboards/frooastboard/keymaps/via/rules.mk create mode 100644 keyboards/frooastboard/nano/config.h create mode 100644 keyboards/frooastboard/nano/info.json create mode 100644 keyboards/frooastboard/nano/keymaps/default/keymap.c create mode 100644 keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c create mode 100644 keyboards/frooastboard/nano/keymaps/via/config.h create mode 100644 keyboards/frooastboard/nano/keymaps/via/keymap.c create mode 100644 keyboards/frooastboard/nano/keymaps/via/rules.mk create mode 100644 keyboards/frooastboard/nano/nano.c create mode 100644 keyboards/frooastboard/nano/nano.h create mode 100644 keyboards/frooastboard/nano/readme.md create mode 100644 keyboards/frooastboard/nano/rules.mk delete mode 100644 keyboards/frooastboard/readme.md delete mode 100644 keyboards/frooastboard/rules.mk diff --git a/keyboards/frooastboard/config.h b/keyboards/frooastboard/config.h deleted file mode 100644 index ebfc6a75d7..0000000000 --- a/keyboards/frooastboard/config.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define MANUFACTURER frooastside -#define PRODUCT Frooastboard - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 - -#define BOOTMAGIC_LITE_ROW 1 -#define BOOTMAGIC_LITE_COLUMN 1 - -#define RGB_DI_PIN B4 -#define RGBLED_NUM 8 - -#define RGBLIGHT_SLEEP - -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 - -#define RGBLIGHT_DEFAULT_HUE 234 - -#define RGBLIGHT_LIMIT_VAL 255 -#define RGBLIGHT_DEFAULT_VAL 190 - -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_SNAKE - -#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD + 2 diff --git a/keyboards/frooastboard/frooastboard.c b/keyboards/frooastboard/frooastboard.c deleted file mode 100644 index 8e7f3c8998..0000000000 --- a/keyboards/frooastboard/frooastboard.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "frooastboard.h" diff --git a/keyboards/frooastboard/frooastboard.h b/keyboards/frooastboard/frooastboard.h deleted file mode 100644 index da598cf4aa..0000000000 --- a/keyboards/frooastboard/frooastboard.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, \ - K10, K11 \ -) { \ - { K00, K01 }, \ - { K10, K11 } \ -} diff --git a/keyboards/frooastboard/info.json b/keyboards/frooastboard/info.json deleted file mode 100644 index bb63e10920..0000000000 --- a/keyboards/frooastboard/info.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "keyboard_name": "Frooastboard", - "url": "https://github.com/frooastside/qmk_firmware/tree/master/keyboards/frooastboard", - "maintainer": "frooastside", - "debounce": 5, - "diode_direction": "COL2ROW", - "layouts": { - "LAYOUT": { - "layout": [ - { - "label": "Z", - "x": 0, - "y": 0 - }, - { - "label": "X", - "x": 1, - "y": 0 - }, - { - "label": "Esc", - "x": 0, - "y": 1 - }, - { - "label": "~", - "x": 1, - "y": 1 - } - ] - } - }, - "matrix_pins": { - "rows": ["B0", "B1"], - "cols": ["B2", "B3"] - }, - "usb": { - "vid": "0x4642", - "pid": "0x6F21", - "device_ver": "0x0001" - } -} diff --git a/keyboards/frooastboard/keymaps/default/keymap.c b/keyboards/frooastboard/keymaps/default/keymap.c deleted file mode 100644 index 569937d8e2..0000000000 --- a/keyboards/frooastboard/keymaps/default/keymap.c +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_Z, KC_X, - LT(1, KC_ESC), KC_TILD), - - [1] = LAYOUT( - KC_F23, KC_F24, - KC_TRNS, TO(2)), - - [2] = LAYOUT( - RGB_TOG, RGB_MOD, - TO(3), TO(0)), - - [3] = LAYOUT( - RGB_HUD, RGB_HUI, - TO(4), TO(2)), - - [4] = LAYOUT( - RGB_SAD, RGB_SAI, - TO(5), TO(3)), - - [5] = LAYOUT( - RGB_VAD, RGB_VAI, - TO(6), TO(4)), - - [6] = LAYOUT( - KC_TRNS, KC_TRNS, - RESET, TO(5)) -}; diff --git a/keyboards/frooastboard/keymaps/safe_mode/keymap.c b/keyboards/frooastboard/keymaps/safe_mode/keymap.c deleted file mode 100644 index dc040070ed..0000000000 --- a/keyboards/frooastboard/keymaps/safe_mode/keymap.c +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_Z, KC_X, - TO(1), KC_TILD), - - [1] = LAYOUT( - RGB_TOG, RGB_MOD, - TO(2), TO(0)), - - [2] = LAYOUT( - RGB_HUD, RGB_HUI, - TO(3), TO(1)), - - [3] = LAYOUT( - RGB_SAD, RGB_SAI, - TO(4), TO(2)), - - [4] = LAYOUT( - RGB_VAD, RGB_VAI, - TO(5), TO(3)), - - [5] = LAYOUT( - KC_TRNS, KC_TRNS, - RESET, TO(4)) -}; diff --git a/keyboards/frooastboard/keymaps/via/config.h b/keyboards/frooastboard/keymaps/via/config.h deleted file mode 100644 index 6bd3c6ea37..0000000000 --- a/keyboards/frooastboard/keymaps/via/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - -#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/frooastboard/keymaps/via/keymap.c b/keyboards/frooastboard/keymaps/via/keymap.c deleted file mode 100644 index 028462cded..0000000000 --- a/keyboards/frooastboard/keymaps/via/keymap.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_Z, KC_X, - LT(1, KC_ESC), KC_TILD), - - [1] = LAYOUT( - KC_F23, KC_F24, - KC_TRNS, RGB_TOG) -}; diff --git a/keyboards/frooastboard/keymaps/via/rules.mk b/keyboards/frooastboard/keymaps/via/rules.mk deleted file mode 100644 index 36b7ba9cbc..0000000000 --- a/keyboards/frooastboard/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h new file mode 100644 index 0000000000..48af8e7e9c --- /dev/null +++ b/keyboards/frooastboard/nano/config.h @@ -0,0 +1,52 @@ +/* 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define MANUFACTURER frooastside +#define PRODUCT Frooastboard Nano + +/* key matrix size */ +#define MATRIX_ROWS 2 +#define MATRIX_COLS 2 + +#define BOOTMAGIC_LITE_ROW 1 +#define BOOTMAGIC_LITE_COLUMN 1 + +#define RGB_DI_PIN B4 +#define RGBLED_NUM 8 + +#define RGBLIGHT_SLEEP + +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 + +#define RGBLIGHT_DEFAULT_HUE 234 + +#define RGBLIGHT_LIMIT_VAL 255 +#define RGBLIGHT_DEFAULT_VAL 190 + +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_TWINKLE +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_SNAKE + +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD + 2 diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json new file mode 100644 index 0000000000..7c594187eb --- /dev/null +++ b/keyboards/frooastboard/nano/info.json @@ -0,0 +1,42 @@ +{ + "keyboard_name": "Frooastboard Nano", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/nano", + "maintainer": "frooastside", + "debounce": 5, + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + { + "label": "Z", + "x": 0, + "y": 0 + }, + { + "label": "X", + "x": 1, + "y": 0 + }, + { + "label": "Esc", + "x": 0, + "y": 1 + }, + { + "label": "~", + "x": 1, + "y": 1 + } + ] + } + }, + "matrix_pins": { + "rows": ["B0", "B1"], + "cols": ["B2", "B3"] + }, + "usb": { + "vid": "0x4642", + "pid": "0x6F21", + "device_ver": "0x0001" + } +} diff --git a/keyboards/frooastboard/nano/keymaps/default/keymap.c b/keyboards/frooastboard/nano/keymaps/default/keymap.c new file mode 100644 index 0000000000..aa3ed88da2 --- /dev/null +++ b/keyboards/frooastboard/nano/keymaps/default/keymap.c @@ -0,0 +1,47 @@ +/* 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Z, KC_X, + LT(1, KC_ESC), KC_TILD), + + [1] = LAYOUT( + KC_F23, KC_F24, + KC_TRNS, TO(2)), + + [2] = LAYOUT( + RGB_TOG, RGB_MOD, + TO(3), TO(0)), + + [3] = LAYOUT( + RGB_HUD, RGB_HUI, + TO(4), TO(2)), + + [4] = LAYOUT( + RGB_SAD, RGB_SAI, + TO(5), TO(3)), + + [5] = LAYOUT( + RGB_VAD, RGB_VAI, + TO(6), TO(4)), + + [6] = LAYOUT( + KC_TRNS, KC_TRNS, + RESET, TO(5)) +}; diff --git a/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c new file mode 100644 index 0000000000..d237438da3 --- /dev/null +++ b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c @@ -0,0 +1,43 @@ +/* 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Z, KC_X, + TO(1), KC_TILD), + + [1] = LAYOUT( + RGB_TOG, RGB_MOD, + TO(2), TO(0)), + + [2] = LAYOUT( + RGB_HUD, RGB_HUI, + TO(3), TO(1)), + + [3] = LAYOUT( + RGB_SAD, RGB_SAI, + TO(4), TO(2)), + + [4] = LAYOUT( + RGB_VAD, RGB_VAI, + TO(5), TO(3)), + + [5] = LAYOUT( + KC_TRNS, KC_TRNS, + RESET, TO(4)) +}; diff --git a/keyboards/frooastboard/nano/keymaps/via/config.h b/keyboards/frooastboard/nano/keymaps/via/config.h new file mode 100644 index 0000000000..8c39695693 --- /dev/null +++ b/keyboards/frooastboard/nano/keymaps/via/config.h @@ -0,0 +1,30 @@ +/* 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE + +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/frooastboard/nano/keymaps/via/keymap.c b/keyboards/frooastboard/nano/keymaps/via/keymap.c new file mode 100644 index 0000000000..bddd16bae5 --- /dev/null +++ b/keyboards/frooastboard/nano/keymaps/via/keymap.c @@ -0,0 +1,27 @@ +/* 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Z, KC_X, + LT(1, KC_ESC), KC_TILD), + + [1] = LAYOUT( + KC_F23, KC_F24, + KC_TRNS, RGB_TOG) +}; diff --git a/keyboards/frooastboard/nano/keymaps/via/rules.mk b/keyboards/frooastboard/nano/keymaps/via/rules.mk new file mode 100644 index 0000000000..36b7ba9cbc --- /dev/null +++ b/keyboards/frooastboard/nano/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/frooastboard/nano/nano.c b/keyboards/frooastboard/nano/nano.c new file mode 100644 index 0000000000..584176a4e9 --- /dev/null +++ b/keyboards/frooastboard/nano/nano.c @@ -0,0 +1,17 @@ +/* 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "nano.h" diff --git a/keyboards/frooastboard/nano/nano.h b/keyboards/frooastboard/nano/nano.h new file mode 100644 index 0000000000..76d1a42eac --- /dev/null +++ b/keyboards/frooastboard/nano/nano.h @@ -0,0 +1,27 @@ +/* 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include "quantum.h" + +#define LAYOUT( \ + K00, K01, \ + K10, K11 \ +) { \ + { K00, K01 }, \ + { K10, K11 } \ +} diff --git a/keyboards/frooastboard/nano/readme.md b/keyboards/frooastboard/nano/readme.md new file mode 100644 index 0000000000..d67f17483f --- /dev/null +++ b/keyboards/frooastboard/nano/readme.md @@ -0,0 +1,19 @@ +# Frooastboard Nano + +![Frooastboard Nano](https://i.imgur.com/f26O8JLh.jpg) + +* Keyboard Maintainer: [Frooastside](https://github.com/frooastside) +* 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/nano:default + +Flashing example for this keyboard: + + 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/nano/rules.mk b/keyboards/frooastboard/nano/rules.mk new file mode 100644 index 0000000000..bef90c50ac --- /dev/null +++ b/keyboards/frooastboard/nano/rules.mk @@ -0,0 +1,18 @@ +# MCU name +MCU = atmega32u2 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/frooastboard/readme.md b/keyboards/frooastboard/readme.md deleted file mode 100644 index d465c3f4b7..0000000000 --- a/keyboards/frooastboard/readme.md +++ /dev/null @@ -1,19 +0,0 @@ -# Frooastboard - -![Frooastboard](https://i.imgur.com/f26O8JLh.jpg) - -* Keyboard Maintainer: [Frooastside](https://github.com/frooastside) -* Hardware Supported: 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`.) - -Make example for this keyboard (after setting up your build environment): - - make frooastboard:default - -Flashing example for this keyboard: - - make frooastboard: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/rules.mk deleted file mode 100644 index bef90c50ac..0000000000 --- a/keyboards/frooastboard/rules.mk +++ /dev/null @@ -1,18 +0,0 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -- cgit v1.2.3 From 4666d2600801ecca959cc13911e69379978a0436 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 19 Feb 2022 02:53:36 +1100 Subject: 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 -- cgit v1.2.3